Changeset: Changeset [7484885b79e357a8532ec43c0526f57bb743914e] by Phillip Ball - Exponent CMS

Type	To find
responsible:me	tickets assigned to you
tagged:"@high"	tickets tagged @high
milestone:next	tickets in the upcoming milestone
state:invalid	tickets with the state invalid
created:"last week"	tickets created last week
sort:number, importance, updated	tickets sorted by #, importance or updated
Combine keywords for powerful searching.
Use advanced searching »

Changeset [7484885b79e357a8532ec43c0526f57bb743914e] by Phillip Ball

January 25th, 2014 @ 01:22 AM

Merge remote-tracking branch 'origin/develop' into newui

origin/develop: Fixes error on the 'pull' configure tabs with the new code and a warning when pulling ical feeds Fixes bug in manage all pages when error reporting is turned on (breaks json) https://github.com/exponentcms/exponent-cms/commit/7484885b79e357a8...

Committed by Phillip Ball

M external/ExtPrograms.csv
M framework/modules/events/controllers/eventController.php
M framework/modules/events/views/event/configure/pull_google.bootstrap.tpl
M framework/modules/events/views/event/configure/pull_google.tpl
M framework/modules/events/views/event/configure/pull_ical.bootstrap.tpl
M framework/modules/events/views/event/configure/pull_ical.tpl
M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.bootstrap.tpl
M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.tpl
M framework/modules/navigation/controllers/navigationController.php
M framework/modules/news/views/news/configure/rss_pull.bootstrap.tpl
M framework/modules/news/views/news/configure/rss_pull.tpl

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Bug Tracker for Exponent CMS