drigato
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
drigato
6ac5a2950f
SAAS-551: Cannot schedule shows due to overlapping show check bug
2015-01-20 11:32:15 -05:00
Albert Santoni
ed78625fce
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 12:01:11 -05:00
drigato
2cdad4932a
CC-5660: Unable to create shows with a rebroadcast
...
Used wrong formating for minutes
2014-01-06 14:04:18 -05:00
drigato
11284d0d41
CC-5660: Unable to create shows with a rebroadcast
...
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
2014-01-06 13:51:06 -05: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
Albert Santoni
15370702a4
Use the user timezone, not the station timezone in the Add Show form (by
...
default)
* Fixes really annoying problem where you click on the calendar, and it
adds your show in the wrong spot.
2013-12-13 18:27:36 -05:00
Naomi
c732b44903
CC-5594 : Remove all date_default_timezone_get()
...
must allow 24 hours, but nothing greater to match old usage.
2013-12-05 13:11:36 -05:00
Naomi
eb4cefa3ff
CC-5594 : Remove all date_default_timezone_get()
...
DateTime here was relying on a timezone that wasn't what the user selects in the timezone drop down on the form.
2013-12-05 13:04:02 -05:00
drigato
6ea0cb5918
CC-5571: Overlapping show check in wrong sometimes
...
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
2013-11-22 10:51:16 -05:00
denise
c687b6ad24
Merge branch 'master' of https://github.com/jamieconnor/Airtime
...
Conflicts:
airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
drigato
37a0c271f6
CC-5359: Update show fails sometimes with overlapping check
...
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
2013-10-03 18:02:15 -04:00
denise
1e59ab836d
CC-5277: Selecting weekly repeat without selecting days fails silently
...
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00
denise
2114383519
CC-5323: User's Timezone Can Improperly Edit Show
...
-overlapping show check was using the user's local timezone to compare new
shows instead of the show's timezone
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
Jamie Connor
f7f2cdc51c
Follow up changes relating to adding in new show repeat options
2013-09-07 14:54:03 +12: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
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
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
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
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
Martin Konecny
858f03c9ad
-remove rebroadcast code
2012-11-29 15:58:29 -05:00
denise
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
denise
e5f67c8b05
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
denise
3b58ee1f48
CC-4651: Apache log errors part 1
...
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
2012-11-05 17:08:41 -05:00
denise
a51c3174e0
SAAS-282: Overlap detection prevents creation of a repeating show
...
-fixed
2012-10-19 12:33:12 -04:00
denise
887a86c6a1
CC-4591: Calendar: Cannot change start time for repeating show
...
-fixed
2012-10-18 10:51:24 -04:00
denise
846af50543
CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
...
-fixed
2012-10-16 14:33:45 -04:00
denise
5ff89eeba2
CC-4561: Can create overlapping shows when rebroadcasting a repeating show
...
-fixed
2012-10-15 14:19:52 -04:00
denise
b79e190d3c
-small comment change
2012-10-12 15:42:51 -04:00
denise
e60a23aab4
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
...
-fixed
2012-10-12 15:34:42 -04:00
denise
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
denise
2fbd8e868b
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
...
-fixed
2012-10-10 14:22:09 -04:00
denise
9c8f4fe404
CC-4414: Unused local variables in forms
...
-done
2012-09-12 17:09:00 -04:00
denise
54d18b7bcd
CC-4382: Editing the color of a repeating show gives error message
...
-fixed
2012-09-12 14:27:17 -04:00
Martin Konecny
b2327472e8
CC-4090: Make code style PSR compliant - part 4
...
-forms directory
2012-08-28 23:04:55 -04:00
Martin Konecny
7ce4934cdc
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
denise
c6c0a70152
CC-4075: Calendar -> Can create overlapping show by repeating show
...
-fixed
2012-07-09 14:50:35 -04:00
denise
1cbb0345b3
improved error message for overlapping shows
2012-07-05 11:33:03 -04:00
denise
1fa3da5bd0
CC-4069: Edit Show -> cannot edit show
...
-fixed
2012-07-04 18:58:22 -04:00
denise
cbf026412c
CC-4056: Add Show -> Prevent shows from overlapping
...
-done
2012-07-04 11:34:18 -04:00
denise
b586d69d09
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed
2012-06-08 11:39:04 -04:00
James
fb48184629
CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past
...
- fixed
2012-06-07 12:25:21 -04:00
James
3c7f3d52e1
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- bug fix. In case of this error, we should maintain the original start time.
2012-06-07 12:14: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
226ef262ba
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-retreived hours and minutes via preg_match()
2012-06-06 10:31:49 -04:00
denise
19d5655779
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed to only allow 24h or less
2012-06-05 11:19:59 -04:00
James
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
Martin Konecny
06455c65e3
CC-3714: Create show with start time as 0xx:xx will freeze the browser
...
-fixed
2012-04-25 12:07:58 -04:00
Martin Konecny
a291f42112
CC-3716: cannot create show start before 10:00
...
-fixed
2012-04-25 12:02:06 -04:00