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

253 commits

Author SHA1 Message Date
Duncan Sommerville
f3548ff893 Moved functionality for uploading to RESTful ShowController class 2014-09-16 18:18:26 -04:00
Duncan Sommerville
5434311f7d More work on show image uploads 2014-09-16 18:03:14 -04:00
Duncan Sommerville
cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
drigato
f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni
0eab0c609b Permissions fixes for Super Admin users 2014-06-20 17:43:20 -04:00
drigato
d81afca7e3 Adding detailed log statements for actions involving show scheduling 2014-06-17 14:17:28 -04:00
Naomi Aro
49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.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
 2013-12-17 17:20:38 -05:00
drigato
1dfcfd3e34 CC-5639: Repeating show's instances will vanish when editing single instance with overlapping warning 
The wrong action was getting set when there were errors in the show form
 2013-12-13 14:20:43 -05:00
drigato
d0474f4247 Changed function title when editing a repeating instance 
Removed a function call we don't need when editing a repeating instance
 2013-12-12 16:47:55 -05:00
Albert Santoni
1577b7c41e CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Use the user timezone in eventFeedAction(), will fix a bug where
  shows at the edge of a week can disappear from the calendar if
  the user timezone is not the same as the station timezone.
 2013-12-12 16:39:20 -05:00
Albert Santoni
a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
 2013-12-12 13:28:51 -05:00
Naomi
b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
Naomi
3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
working on getting widgets to work properly returning station local time.
 2013-12-10 16:45:05 -05:00
Naomi
39063aaadb CC-5594 : Remove all date_default_timezone_get() 
using the user selected timezone in the form to calculate duration.
 2013-12-05 15:12:01 -05:00
Naomi
8f1e73edf5 CC-5594 : Remove all date_default_timezone_get() 
fixing up controllers
 2013-12-04 16:26:11 -05:00
drigato
a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Create a new cc_show_day rule instead of a new cc_show
 2013-12-04 09:00:43 -05:00
Naomi
2ef95db747 CC-5371 : Fail to extend/shrink show by drag 
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
 2013-10-10 17:38:49 -04:00
denise
256ec9292d CC-5388: Calendar won't load 2013-10-09 16:20:43 -04:00
denise
7c2e92f6e5 CC-5293: Calendar page cannot be loaded sometimes 2013-10-07 17:16:52 -04:00
Naomi
faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi
4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise
6aa6d576cd CC-5323: User's Timezone Can Improperly Edit Show 
-made localizeDate a static function in ShowFormService
 2013-09-25 16:22:30 -04:00
denise
8ddb2974f1 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise
107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Naomi Aro
682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro
60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro
7230b3ef58 removing tabletools from schedule page. 2013-08-16 12:57:04 -04:00
denise
5f588afdd5 CC-5293: Calendar page cannot be loaded sometimes 2013-08-14 13:07:06 -04:00
Naomi Aro
f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Martin Konecny
50ece038c2 fix errors reported by Facebook's scheck 
-controller dir
 2013-05-28 17:45:09 -04:00
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