Commit Graph

177 Commits

Author SHA1 Message Date
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-14 16:16:14 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead
-Make '/' the default root
2013-01-14 16:00:38 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks
-done
2012-11-06 17:10:47 -05:00
denise 3b5ec6fbe0 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:46:18 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
denise 9d3271c03d CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show
-fixed
2012-10-15 15:36:38 -04:00
James eecc90547d CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
- fixed
2012-09-18 15:47:37 -04:00
Rudi Grinberg 0a83b33a5a Removed extra logging statements 2012-09-18 11:10:54 -04:00
Rudi Grinberg 49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00
Rudi Grinberg 9c5ebdc4c0 Removed old commented code 2012-09-17 17:02:59 -04:00
Rudi Grinberg 4f576afc00 cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script. 2012-09-17 15:24:02 -04:00
Rudi Grinberg 048da282fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:36:57 -04:00
Rudi Grinberg 2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny 5d0592c729 CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
-fixed
2012-09-17 12:32:39 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
James dfb1ffed79 CC-4319: Calendar: Remove all contents doesn't work
- fixed
2012-09-10 15:42:05 -04:00
Rudi Grinberg 744577a8b5 Removed bad line break 2012-09-06 12:38:55 -04:00
Rudi Grinberg 3f898bfc3a Fixed wrong function name 2012-09-06 12:33:04 -04:00
Rudi Grinberg 56527e727c extra debuggin 2012-09-06 12:17:18 -04:00
Rudi Grinberg bed360cd3e Formatting 2012-09-06 11:15:01 -04:00
Martin Konecny a731fc147b CC-4348: Prepared statements - part 4
-fixed Show.php
2012-09-04 13:34:05 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4
-controllers dir
2012-08-29 10:54:36 -04:00
James a4c579f36e CC-4254: Library: advanced search on library
- bug fix
2012-08-23 10:59:34 -04:00
Martin Konecny ea4567f373 Make user functions work more consistently
isHost didn't work similar to isPM or isAdmin
2012-08-22 13:59:37 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 3f41835e12 re-add getCurrentShowAction 2012-07-26 14:36:21 -04:00
Martin Konecny 255866d240 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
Martin Konecny aaa0c01e01 CC-4120: memory optimizations for calendar page.
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-10 10:36:53 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
-done
2012-07-06 15:26:51 -04:00
denise 1fa3da5bd0 CC-4069: Edit Show -> cannot edit show
-fixed
2012-07-04 18:58:22 -04:00
James 2bf6408d90 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
- fixed
2012-06-06 18:23:27 -04:00
denise c1976162cb CC-3793: "Star time" check will block updating shows when error found in colour settings
-fixed
2012-06-05 11:19:59 -04:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00
Naomi Aro df4cdfb07e CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 17:48:56 +02:00
James 8a2b9e7221 CC-3746: Calendar: Duration of 24hrs show is 00h 00m
- fixed
2012-05-01 17:05:18 -04:00
James 0fe4478bb5 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
switching to Daylight Saving Time)

- added exception handling
2012-04-26 10:56:08 -04:00
James 28d27b8932 CC-3719: "Start time" check will block editing ON AIR show
- fixed
2012-04-25 18:01:37 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
switching to Daylight Saving Time)

- fixed
2012-04-25 17:21:25 -04:00
Martin Konecny 63a5f45e9b CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
-fixed
2012-04-24 18:22:39 -04:00