Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,022 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

4926 Commits

Author SHA1 Message Date
drigato 8485e136fe CC-5651: Unit Test the Schedule 
Remove Zend library from tests folder
 2014-01-13 11:43:16 -05:00
Albert Santoni ae6efc8fc8 CC-5651: Unit Test the Scheduler 
* Unit test bootstrapping work.
* Added a README.txt for the unit testing environment
 2014-01-13 11:43:16 -05:00
drigato 0f107dbad3 Initial unit test configuration 2014-01-13 11:43:16 -05:00
drigato 9e5cfe0d39 CC-5666: Deleting a show instance can revert the 'no end' option 2014-01-13 11:41:44 -05:00
drigato 0f4099e481 CC-5651: Unit Test the Scheduler 
Added test for deleting a show instance
 2014-01-09 16:58:56 -05:00
drigato 4e668b9d77 CC-5651: Unit Test the Scheduler 
Added new test for creating a weekly repeating show
Renamed xml files to better reflect which test it belongs to
 2014-01-09 14:38:03 -05:00
drigato a648f7fa2d CC-5665: Timeout can occur when scheduling large playlists into linked shows 
Added a temporary fix by extending the php time limit
 2014-01-09 11:57:32 -05:00
drigato 71022b1413 CC-5651: Unit Test the Scheduler 
Removed unused code
 2014-01-08 15:52:46 -05:00
drigato ef13d5966f CC-5651: Unit Test the Scheduler 
Added test for a non-repeat and non-record show
Added a helper class
 2014-01-08 15:51:11 -05:00
drigato 3baf7929ce Added missing ShowData.php thingy for unit testing 2014-01-07 13:03:34 -05:00
drigato 94912ed445 CC-5651: Unit Test the Scheduler 
Created file that returns test data
Added a non-repeating, non-record&rebroadcast show creation test (not working yet)
Updated the cc_show_seed.xml file to include all 5 show tables
 2014-01-06 18:09:13 -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
Albert Santoni fea3f4073a CC-5651: Unit Test the Scheduler 
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
 2013-12-19 16:58:11 -05:00
drigato 298a9e6b7c CC-5651: Unit Test the Scheduler 
First test passes!
 2013-12-19 16:03:16 -05:00
drigato 3b27e74ca0 CC-5651: Unit Test the Scheduler 
Got test to run!
 2013-12-19 15:31:12 -05:00
Albert Santoni c4adbab04e CC-5651: Unit Test the Scheduler 
* Fixed the test airtime.conf a bit
* Create the database tables and db properly
 2013-12-19 12:01:32 -05:00
Albert Santoni b95fb38164 CC-5651: Unit Test the Scheduler 
* Mock config for database connections
 2013-12-19 11:40:35 -05:00
drigato 6512f033d1 CC-5651: Unit Test the Scheduler 
Remove zend session stuff
Add services, install scripts to include path
 2013-12-19 11:16:06 -05:00
Albert Santoni 585d62bfef CC-5651: Unit Test the Scheduler 
* Comments
 2013-12-19 11:11:26 -05:00
Albert Santoni a7353ba6ca CC-5651: Unit Test the Scheduler 
* Improved bootstrapping, fixed a bunch of errors
* Start a session, got Zend_Application working
 2013-12-19 11:09:49 -05:00
Albert Santoni 813043f52a CC-5651: Unit Test the Scheduler 
* More database connection stuff
 2013-12-18 18:59:42 -05:00
Albert Santoni 1cf5d3489e CC-5651: Unit Test the Scheduler 
* Got the database connection working in our unit test
 2013-12-18 17:40:13 -05:00
Albert Santoni 083ca601c9 CC-5651: Unit Test the Scheduler 
* README.txt update for unit tests
 2013-12-18 16:42:32 -05:00
Albert Santoni dbc83d37d6 Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests 2013-12-18 16:26:42 -05:00
Albert Santoni bc7f83c9ff CC-5651: Unit Test the Scheduler 
* Updated README
 2013-12-18 16:26:22 -05:00
drigato 73130f02e5 CC-5651: Unit Test the Scheduler 
Added xml cc_show seed file and cc_show creation test file
 2013-12-18 16:11:03 -05:00
drigato 6aaa2c83aa CC-5651: Unit Test the Schedule 
Remove Zend library from tests folder
 2013-12-18 16:07:01 -05:00
Albert Santoni 84c7e21bea CC-5651: Unit Test the Scheduler 
* Unit test bootstrapping work.
* Added a README.txt for the unit testing environment
 2013-12-18 16:05:31 -05:00
drigato e638101a97 Initial unit test configuration 2013-12-18 15:48:32 -05:00
drigato dc05d9ddaf CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange 2013-12-17 17:09:59 -05:00
Albert Santoni 653f0e02a4 CC-5648: Events are shifted down in the month view 
* Fixed it.
 2013-12-17 15:25:43 -05:00
Naomi 8daca16fac Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-16 17:14:55 -05:00
Naomi 424de61a11 CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window. 
upgrading to jPlayer 2.5.0
 2013-12-16 17:14:00 -05:00
drigato 27c3637591 CC-5640: End time does not get updated when editing the current playing show 
Was checking if the start time was in the past, but we should check if the
end time is in the past. This way you can extend or shrink shows that are currently playing.
 2013-12-16 15:27:51 -05:00
Albert Santoni 0afaeadb15 CC-5641: Can Create Zero or Negative Length Shows 
* Fixed two underlying causes of zero or negative length shows
  that could be created over DST time changes:
    - Fixed incorrect end time arithmetic which did not preserve the
      show duration.
    - Fixed a desynchronization issue due to FullCalendar handling
      events over DST differently from Airtime.
 2013-12-14 22:38:33 -05:00
Albert Santoni f16d8ca2ea Fixed a bunch of annoying/major graphical issues with the calendar 
* Fixed a bug where the calendar would keep shrinking smaller and
  smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
  which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
  to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
  part).
 2013-12-14 00:05:13 -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
Albert Santoni 6a468ff549 Fix a rendering problem if a zero length show happens 2013-12-13 18:27:14 -05:00
Albert Santoni 346036a9ca Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 
Conflicts:
	airtime_mvc/application/models/Show.php
 2013-12-13 16:12:26 -05:00
Albert Santoni fa0a190277 Prevent division by zero if show lengths end up being zero 2013-12-13 16:10:36 -05:00
Naomi 99902bc10c CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:16:51 -05:00
Naomi 445f1ebe4f CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
removing old crappy method.
 2013-12-13 15:14:38 -05:00
Naomi 7a51b8d2ad CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:06:52 -05:00
Naomi a45235d39b CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-13 15:03:02 -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 d841f11de3 CC-5638: Shows become unlinked when moving the end time back 
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
 2013-12-13 13:06:14 -05:00
drigato e8a8aeaf00 CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated 
Made all show fields readonly when editing a repeating instance
 2013-12-13 12:13:58 -05:00
Naomi bbccc2e7d3 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 17:18:17 -05:00
Naomi 87ac5dc294 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-12 17:18:03 -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 27f0fa27e9 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 13:32:25 -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
drigato f37b9a3796 CC-5634: Can add/remove content to a linked show while one instance is currently playing 
small logic fix
 2013-12-12 13:23:20 -05:00
drigato fb793ff3e1 CC-5634: Can add/remove content to a linked show while one instance is currently playing 
Fixed by removing option from context menu
 2013-12-12 13:01:33 -05:00
drigato 974be86691 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:48:11 -05:00
drigato 9bbc3cf713 CC-5633: Can schedule overlapping shows 
The overlapping show check was returning false too early
 2013-12-12 11:48:00 -05:00
Albert Santoni f2fe04ba1d Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:33:28 -05:00
Albert Santoni 8986f1bc4f CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Changed getRangeStartAndEnd() to use UTC explictly
 2013-12-12 11:32:40 -05:00
Naomi 37ea29380b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:56:29 -05:00
Naomi 67031a75fe CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 18:56:19 -05:00
Albert Santoni abf3a50694 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:22:08 -05:00
Albert Santoni a9bd34fbcb CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Eliminate more strtotime usage, could fix on air light weirdness in
  some circumstances.
 2013-12-11 18:20:40 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
drigato 3a50f7a6dc Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 16:55:47 -05:00
drigato cfb6195523 CC-5632: System preferences don't get saved 2013-12-11 16:55:35 -05:00
Albert Santoni d575a478b5 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 15:56:03 -05:00
Albert Santoni 4d77d14d33 CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Removed strtotime usage from AddShowRepeats.php
 2013-12-11 15:54:13 -05:00
Naomi c5f30c2b54 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 15:20:40 -05:00
Naomi b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
drigato 8aa838bb34 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 14:45:28 -05:00
drigato 9237692782 CC-5630: Shows created on a DST border get scheduled an extra hour longer 
The show start and end time need to be in the show's local timezone when adding
or subtracting time to the start and end time (in case of DST crossings). In this
case the end time was already converted to UTC when we tried to change the time.
 2013-12-11 14:45:16 -05:00
Naomi 3d1f0b0d0e CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-10 17:41:59 -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
Albert Santoni 0919915c6b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-09 16:27:06 -05:00
drigato 310cfddd3a CC-5626: Context menu -> Edit -> Doesn't populate show forms properly 2013-12-09 14:53:58 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -05:00
Naomi a1a9ec34cc CC-5594 : Remove all date_default_timezone_get() 
moving var serverTimezoneOffset to bootstrap,
also creating a var for userTimezoneOffset.
Utilities.js uses the userTimezoneOffset to calculate time in forms.
 2013-12-06 18:17:30 -05:00
Albert Santoni d056ee8c2e Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-06 17:14:35 -05:00
Albert Santoni 2c7db0e83c CC-5555: Fix user preferences logic in preferences cache 
* Fixes stream settings not dislaying
 2013-12-06 17:11:07 -05:00
drigato cdfdbc4da2 Removed unused code 2013-12-06 16:51:13 -05:00
Naomi 7e9ca3e950 CC-5594 : Remove all date_default_timezone_get() 
updating move show code to work with the user's timezone.
unified method signature for updateScheduleStartTime to always use the $diff param.
 2013-12-06 12:33:36 -05:00
Naomi 061897a58b CC-5594 : Remove all date_default_timezone_get() 
never rely on this method.
 2013-12-05 16:00:52 -05:00
Naomi ec6a991090 CC-5594 : Remove all date_default_timezone_get() 
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
 2013-12-05 15:57:00 -05:00
Naomi b1842fff34 Merge branch '2.5.x' into cc-5594-date_default 2013-12-05 15:13:54 -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 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
Naomi ed74470803 CC-5594 : Remove all date_default_timezone_get() 
updating dashbaord information for timezone.
 2013-12-04 17:54:28 -05:00
Naomi 8f1e73edf5 CC-5594 : Remove all date_default_timezone_get() 
fixing up controllers
 2013-12-04 16:26:11 -05:00
Naomi 20b32bab80 CC-5594 : Remove all date_default_timezone_get() 
simplifying code, removing unnecessary calculations.
 2013-12-04 16:05:18 -05:00
Naomi e508d141ed CC-5594 : Remove all date_default_timezone_get() 
resizing must calculate from displayed calendar settings.
 2013-12-04 15:48:32 -05:00
Naomi e71f306c7d CC-5594 : Remove all date_default_timezone_get() 
setting display time using user timezone.
last played was never converted properly for display previously.
 2013-12-04 15:24:27 -05:00
Naomi 10d8351f93 CC-5594 : Remove all date_default_timezone_get() 
setting display timezone to be user's timezone for library utime and mtime.
 2013-12-04 15:16:07 -05:00
Naomi aafeeb6aed CC-5594 : Remove all date_default_timezone_get() 
replacing timezone with the user timezone pref.
 2013-12-04 15:11:40 -05:00
Naomi c8cfdadb90 CC-5594 : Remove all date_default_timezone_get() 
removing unused old methods, changing listener stats to use the user timezone for display.
 2013-12-04 15:06:07 -05:00
drigato 86ed77a106 CC-5599: Can drag and drop an edited repeating instance on calendar 
Fixed by properly checking if a show is repeating or not
 2013-12-04 15:02:14 -05:00
drigato ab435ce3ec CC-5598: Deleting an edited, repeated instance deletes the entire show 
Fixed by setting the correct url action
 2013-12-04 14:50:22 -05:00
Naomi 82b40f52e7 Merge branch '2.5.x' into cc-5594-date_default 2013-12-04 14:42:30 -05:00
Naomi 447ad4e3c6 CC-5594 : Remove all date_default_timezone_get() 
correcting show contents timezone.
 2013-12-04 14:39:56 -05:00
drigato 320cecd339 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-04 14:36:30 -05:00
Albert Santoni 79af606418 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-12-04 14:33:53 -05:00
Naomi e6808b0c12 CC-5594 : Remove all date_default_timezone_get() 
removing now unused old methods
 2013-12-04 14:31:23 -05:00
drigato 49ed0cf0f1 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Removed redundant function call to update last_scheduled column on a cc_show_instance
 2013-12-04 14:28:16 -05:00
drigato 7f8f084c98 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show_day->getLocalEndDateAndTime() function
 2013-12-04 14:17:19 -05:00
Naomi c9773d2a0e CC-5594 : Remove all date_default_timezone_get() 2013-12-04 14:13:19 -05:00
drigato 463d286ac5 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Refactored cc_show->isRepeating() function
 2013-12-04 14:00:31 -05:00
drigato b78fa994f7 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
Removed redundant timestamp var
Removed redundant DateTime object creation
 2013-12-04 12:20:16 -05:00
drigato 22595c1098 CC-5596: Can Recreate an Instance in a Location that has been modified 
Fixed by updating the modified instance's start/end time and leaving as a placeholder
for future show updates
 2013-12-04 11:36:38 -05:00
drigato 6c71b17024 CC-5595: Improper day of week comparison 
Need to convert show instance start time to the show's local timezone before getting
the repeat day of week
 2013-12-04 10:05:32 -05:00
drigato 02453c52ee Copy/paste error 
Was setting cc_show_days twice
 2013-12-04 09:00:43 -05:00
drigato a164416c84 Fixed minor bugs 2013-12-04 09:00:43 -05:00
drigato ef8af1b724 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show 
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
 2013-12-04 09:00:43 -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
drigato 4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato c18d53f403 CC-5593: Overlapping Show Bug 
Get instance depending on whether instance id is provided or not
 2013-12-03 15:07:40 -05:00
drigato d49131db48 CC-5593: Overlapping Show Bug 
Need to check if the show instance has been deleted
 2013-12-03 14:39:53 -05:00
drigato eae93008b4 CC-5589: SQL error when adding/moving a scheduled item 
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.

Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
 2013-12-02 16:40:15 -05:00
drigato f571000657 Fixed updating single show instance problem where it wasn't fetching 
the current instance
 2013-11-26 12:32:05 -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
drigato 89feb3d0fb Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-11-22 09:39:37 -05:00
drigato 52f0d5a13b CC-5570: Tracks get scheduled ahead of their show start time 2013-11-22 09:39:19 -05:00
Daniel James e9362e6429 Corrections to Hungarian localization 2013-11-20 10:55:34 +00:00
Daniel James d30ee4ecc5 Refined Hungarian translation, thanks Zsolt! 2013-11-12 15:06:26 +00:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences 
comment out logging to not flood logs.
 2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences 
cache key creation change.
 2013-11-11 17:08:15 -05:00
Naomi 0bae60138f CC-5555 : Implement simple caching for preferences 
forgot to get rid of user id here.
 2013-11-11 16:50:35 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences 
better to include the key in the error message
 2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences 
making sure locale/timezone is returned properly in generic calls.
 2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences 
fixing up code so user id is never passed in manually to a preference getter.
 2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences 
using apc to save/fetch preferences to/from a cache.
 2013-11-11 15:07:13 -05:00
Albert Santoni 050d984882 CC-5487 : Calendar won't load under certain situation with linked shows 2013-10-30 18:09:57 -04:00
drigato c9549c6a1d Delete unused code 2013-10-28 10:34:18 -04:00
Daniel James 0392ce1971 Update Czech translation binary 2013-10-24 11:01:29 +01:00
xheii01 4cc3b1cbfc Update airtime.po 2013-10-17 12:18:21 +02:00
Naomi ecf363ccfe CC-5430 : sorting settings not saved on library datatable 
default sorting set in incorrect place, overriding saved settings.
 2013-10-16 18:14:07 -04:00
Naomi 24663d9851 Merge branch '24hourfileimport' into 2.5.x 2013-10-16 17:29:22 -04:00
Naomi 02dbde82ec CC-5429 : importing file > 24 hours doesn't work 2013-10-16 17:27:40 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
Daniel James cbd2d72d60 Improved Austrian localization, thanks Erich! 2013-10-16 15:39:09 +01:00
denise 787ecdc3fa CC-5384: Drag & drop show sets wrong time 
Was not setting new start time on cc_show_day object
 2013-10-15 16:01:42 -04:00
denise b62fde46e7 CC-5407: Scheduling problem with global crossfade 
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
 2013-10-15 15:20:58 -04:00
denise bc30e13b44 Changed calendar js to only start fetching events after all files have been loaded 2013-10-15 12:53:43 -04:00
Daniel James 9ee29d77f5 Updated German localization, thanks again to Erich! 2013-10-14 12:28:06 +01:00
Daniel James 49d2d8f0ef Updated Greek localization, thanks Kat! 2013-10-14 12:16:59 +01:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
Naomi f2a794168d CRLF 2013-10-11 16:31:34 -04:00
Naomi 470f0b2a7f CC-5408 : Can't add content to now playing show on calendar page 
can schedule the now playing show from the calendar page.
 2013-10-11 16:30:49 -04:00
Naomi c765438b95 CRLF 2013-10-11 15:13:49 -04:00
Naomi 35df0c1511 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 15:13:23 -04:00
Naomi 7f5e2bdefa CC-5404 : colorpickers littering DOM 2013-10-11 15:12:58 -04:00
denise 9fa2f010b4 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 13:22:12 -04:00
denise 4abdbfae1f CC-5401: Stream settings -> Can't save show source info 
Typo in sprintf formatting
 2013-10-11 13:22:02 -04:00
Naomi 22d5df866c CC-5404 : colorpickers littering DOM 2013-10-11 13:13:30 -04:00
Naomi 5defb12430 CC-5398 : "Add Show" does not update calender "orange" progress bar immediately showing content is added until refresh page or different view. 2013-10-11 11:53:53 -04:00
Naomi 4c331aa955 CRLF 2013-10-11 11:08:49 -04:00
Naomi 61bab553ff CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log 2013-10-11 11:07:59 -04:00
Daniel James 678282ef90 Updated Hungarian translation for 2.5.0, thanks Zsolt! 2013-10-11 15:35:03 +01:00
Daniel James 1203c9924e Updated Austrian localization, thanks Erich! 2013-10-11 10:36:45 +01:00
Naomi 916d85ca57 CRLF 2013-10-10 17:41:05 -04:00
Naomi 66a82bb39c Merge branch 'calendar-resize-problem' into 2.5.x 2013-10-10 17:39:42 -04: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
cliff.wang 0309e96933 Update Chinese translation 2013-10-10 16:58:00 -04:00
Naomi 0c4dcda508 CC-5394 : File Summary Fix 
need to check if length is set.
 2013-10-10 16:01:53 -04:00
Daniel James 9808a21c25 Updated Czech localization header 2013-10-10 17:19:49 +01:00
denise c85833239c CC-5379: adding a file after a gap in now playing - starts too early 
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
 2013-10-10 12:11:23 -04:00
Daniel James 6db5535631 Updated Czech localization, thanks to Pavla Holcova! 2013-10-10 17:10:24 +01:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -04:00
Daniel James bd36b13d23 Updated French localization for 2.5.0, thanks Albert! 2013-10-10 14:30:01 +01:00
Daniel James f58dafbc1d Updated US English localization 2013-10-10 11:28:17 +01:00
Daniel James 81fe322c91 Updated British localization 2013-10-10 10:47:01 +01:00
Daniel James febadd08b9 Updated comment to explain newer repeat types 2013-10-10 10:43:45 +01:00
Daniel James 036df34f06 These files should not be chmod executable 2013-10-10 10:37:42 +01:00
denise 3261bd6307 Small formatting change 2013-10-09 17:38:06 -04:00
denise 05e4195165 CC-5390: Cannot drag & drop record show that has a rebroadcast 
Was using wrong method to query for the rebroadcast show's
original recorded show
 2013-10-09 17:24:16 -04:00
denise 4daa34d14b CC-5364: Problem with drag & drop recording show on calendar 2013-10-09 17:11:39 -04:00
denise aadbf0b200 CC-5384: Drag & drop show sets wrong time 
Start time was getting stored in UTC in cc_show_days when it
should be stored in the show's local timezone
 2013-10-09 16:55:56 -04:00
denise 256ec9292d CC-5388: Calendar won't load 2013-10-09 16:20:43 -04:00
denise b923a45ac6 Addming minified FullCalendar-1.5.4 2013-10-09 15:45:42 -04:00
denise 807833e3f3 CC-5361: Create show from repeating instance could have wrong time 2013-10-08 17:38:03 -04:00
denise 0f2848be22 Delete old full calendar files not in use 
Update fullcalendar from 1.5.3 to 1.5.4
Apply custom timezone changes to fullcalendar 1.5.4
 2013-10-08 17:09:19 -04:00
denise 2165000f82 Update airtime version in po files 2013-10-08 12:06:50 -04:00
denise 1b3adcd375 i18n - Update mo files 2013-10-08 11:56:25 -04:00
denise 38634810a3 Update .po files 2013-10-08 11:48:24 -04:00
denise 9be2ec2e99 Fixed small typo 2013-10-08 11:24:42 -04:00
denise 56db6e9386 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-08 11:19:05 -04: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
denise d248f0ca14 Merge branch '2.5.x' 2013-10-08 11:13:39 -04:00
denise 11e4f5a124 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-10-08 11:13:15 -04:00
Daniel James 3fdadf5b66 SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3 2013-10-08 15:55:49 +01:00
denise 7c2e92f6e5 CC-5293: Calendar page cannot be loaded sometimes 2013-10-07 17:16:52 -04:00
denise ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations 
Formatting error
 2013-10-07 16:58:57 -04:00
denise 8a25d9cd2e CC-5376: Sometimes schedule times don't get updated 2013-10-07 15:53:33 -04:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
denise ac8f1d73f3 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-07 14:16:36 -04:00
denise ff46883c1b CC-5360: Updating a Show over a timezone change period has problems 
Need to apply the old timezone to show start time when attempting to
fetch current instance
 2013-10-07 14:16:20 -04:00
Albert Santoni 7cca01ab08 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-04 14:15:32 -04:00
Albert Santoni 7b1cd5c908 CC-5354: Remove PHP short open tags for better compatibility 2013-10-04 14:15:23 -04:00
Naomi 548d3eef0e Merge branch 'all-record-icons' into 2.5.x 2013-10-04 11:06:46 -04:00
Naomi 4ca2554999 CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show 
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
 2013-10-04 11:05:35 -04:00
denise 60b4eb5c8a Removed unnecessary formating when comparing DateTime objects 2013-10-04 09:49:23 -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
Naomi c707967567 CRLF 2013-10-02 11:25:40 -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 632b11c0ab CC-5331: Now Playing keeps refreshing sometimes 
- typo in GET request parameters causing overriding of data
 2013-10-01 16:49:08 -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 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Albert Santoni 11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode. 
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
 2013-09-26 16:23:22 -04:00
Albert Santoni 28a032388b Start of bugfixing for SAAS-349. 
* Also identity verification for erry on Freenode.
 2013-09-26 15:18:41 -04:00
Albert Santoni 52b7dbb226 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-09-26 08:36:11 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
denise 34e2344100 CC-5323: User's Timezone Can Improperly Edit Show 
Sometimes show form would populate the start/end time with wrong timezone
 2013-09-25 17:18:23 -04:00
Albert Santoni a1f3309cf7 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-25 16:41:35 -04:00
denise 3e5a6b2a3d CC-5323: User's Timezone Can Improperly Edit Show 
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
 2013-09-25 16:40:55 -04:00
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise e8dc1c5729 CC-5323: User's Timezone Can Improperly Edit Show 
- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
 2013-09-25 16:22:30 -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 af03502592 CC-5323: User's Timezone Can Improperly Edit Show 
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
 2013-09-25 16:22:30 -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
denise 2ab5e6b26a CC-5344: Edit Recorded Show -> Rebroadcasts get deleted 
When editing a show the record option was getting posted with a false value
even if the value was true. This was caused because on show-edit action the
record form field is disabled
 2013-09-25 16:17:20 -04:00
Daniel James 8dc100126a Alert icon for missing file in Now Playing should be orange, to match Media Builder 2013-09-25 17:36:50 +01:00
Naomi Aro e47b446804 CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction 
creating a single global audio context to avoid resource problems.
 2013-09-24 18:50:41 +02:00
Naomi Aro 24861545ce crlf fix 2013-09-24 12:24:13 +02:00
Naomi Aro 7e96828cdd CC-5317 : Guest user can't see Now playing page 
removed the library module completely from page if the user does not have permission to view it.
 2013-09-24 12:21:04 +02:00
Naomi Aro 71001480d2 CC-5335 : I18N: Calendar picker strings are not translated. 
loading the same strings as the jquery calendar.
 2013-09-24 11:47:20 +02:00
Naomi Aro 59f6578e2e CC-5334 : Localize Ryerson History Feature 
adding string "New log sheet template"
 2013-09-24 09:58:53 +02:00
Naomi Aro 53341d40f7 CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
Naomi Aro 86c570744a Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-23 17:58:58 +02:00
cliff.wang 68f715587c Update Chinese translation 
Update Chinese translation after CC-5334
 2013-09-23 11:58:40 -04:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro 9de8b6634c CC-5334 : Localize Ryerson History Feature 
crlf
 2013-09-23 14:58:56 +02:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro 4c6d96e062 CC-5333 : Rebroadcast Shows are not created 2013-09-20 16:35:46 +02:00
Jamie Connor 1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Naomi Aro 0e20e5b50b Merge branch '2.4.x' into ryerson-history 2013-09-07 16:51:22 +02:00
Naomi Aro 0d089b787d Merge branch '2.4.x' into ryerson-history 2013-09-07 16:41:57 +02:00
Jamie Connor f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00