Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13992 commits 3 branches 0 tags 405 MiB
Commit graph

272 commits

Author SHA1 Message Date
Martin Konecny
3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
denise
5a86bd9ac4 CC-5149: Linked show: Regular show will be treat as linked show in some case 
A new form was not getting sent to the user properly after a show creation
 2013-05-15 15:47:45 -04:00
denise
2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
denise
0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -04:00
denise
71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
denise
0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Martin Konecny
fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
denise
cfee74693b CC-4961: Show linking 
moved move-show to calendar service
 2013-04-05 17:44:30 -04:00
denise
81dbb17922 CC-4961: Show linking 
-moved show deletion into show service
 2013-04-03 11:46:46 -04:00
denise
ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise
731b86b36c Added back editing a repeating show instance feature 2013-03-27 16:25:39 -04:00
denise
e259639d1a Removed scheduleController private variable, currentUser 
Removed showService private variable, currentUser
 2013-03-27 09:02:49 -04:00
denise
418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
denise
6766d208aa CC-4961: Show linking 
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
 2013-03-21 16:31:05 -04:00
denise
a7601d290f CC-4961: Show linking 
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
 2013-03-21 10:05:11 -04:00
denise
bae9f1202a CC-4961: Show linking 
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
 2013-03-19 10:09:28 -04:00
denise
896e03d76b CC-4961: Show linking 
Refactoring all services thus far
 2013-03-15 16:56:22 -04:00
denise
c721b81a13 CC-4961: Show linking 
Refactoring
 2013-03-12 10:30:31 -04:00
denise
7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -04:00
denise
1cc823ef0e Inital edit show reconfiguration changes 2013-03-08 17:10:35 -05:00
denise
116d98a81b Removed comment 2013-03-08 16:10:07 -05:00
denise
d8ced29dd0 Refactored adding show forms to the view 2013-03-08 16:08:43 -05:00
denise
99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
drigato
bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise
d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny
8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise
ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise
76cb04e296 CC-4538: Cannot edit title or change time of repeating show if first instance has ended 
- fixed by populating the edit show form with the next repeating show that is not in the past
 2013-02-13 11:55:27 -05:00
denise
4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action 
-fixed
 2013-02-13 11:29:43 -05:00
denise
525b2dcb33 CC-4895: Remove all json die() statements from code 
- removed json_encode
 2013-02-07 15:41:47 -05:00
denise
ba4cb16171 CC-4925: Changing User permissions to a higher level ends up with show editing problems 
-typo
 2013-02-06 14:35:39 -05:00
denise
55970a4b20 CC-4925: Changing User permissions to a higher level ends up with show editing problems 
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
 2013-02-06 14:32:13 -05:00
Martin Konecny
c398ce930b Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-02-04 16:22:35 -05:00
denise
20a3f674b4 CC-4897: XSS exploit on library page 
-fixed where this was happening on Calendar - show content
 2013-02-04 12:12:57 -05:00
Martin Konecny
93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise
8309593a0f CC-4904: Library -> Sort by status doesn't work 
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
 2013-02-01 17:47:07 -05:00
denise
d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
Martin Konecny
6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny
c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-further optimization by looking at the preferred time scale
 2013-01-24 14:02:50 -05:00
Martin Konecny
2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
 2013-01-24 12:52:24 -05:00
Martin Konecny
091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
 2013-01-24 12:13:55 -05:00
Martin Konecny
548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-remove an unnecessary roundtrip to server
 2013-01-23 18:31:45 -05:00
Martin Konecny
8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
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