Commit graph

4779 commits

Author SHA1 Message Date
Duncan Sommerville
15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
drigato
10ca987a51 SAAS-762: Implement schedule widget design 2015-05-12 11:56:35 -04:00
drigato
24ebc8c8e4 Merge branch 'saas' into saas-landing-page 2015-05-11 15:54:02 -04:00
drigato
77241bb6fc Merge branch '2.5.x' into saas 2015-05-11 14:57:58 -04:00
drigato
2953576921 CC-5997: Tracks get scheduled outside of the show start and end time 2015-05-11 14:57:20 -04:00
Albert Santoni
aee5615cd3 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-05-11 14:34:40 -04:00
Albert Santoni
689a431867 Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon() 2015-05-11 14:34:21 -04:00
drigato
21886a509d Merge branch '2.5.x' into saas 2015-05-11 12:18:09 -04:00
drigato
56e5e959ec Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-05-11 12:16:55 -04:00
drigato
28997344fc CC-5997: Tracks get scheduled outside of the show start and end time 2015-05-11 12:16:32 -04:00
Albert Santoni
3d99c423a9 Merge branch '2.5.x' into saas 2015-05-11 11:08:52 -04:00
Albert Santoni
efad7be91a CC-5120: Can't add PLS webstreams 2015-05-11 11:08:43 -04:00
drigato
4941ae1a6d Separated weekly schedule widget css into separate file 2015-05-07 14:27:59 -04:00
drigato
9ad0628efa SAAS-732: Clean up weekly program widget 2015-05-05 15:07:12 -04:00
Duncan Sommerville
8b380086c3 Merge branch 'saas-dev' into saas-speedy 2015-05-04 13:09:51 -04:00
drigato
f375115825 Merge branch 'saas' into saas-landing-page 2015-05-04 09:40:26 -04:00
Duncan Sommerville
fc36ff5797 Updated user manual constant to new manual url 2015-04-30 14:51:35 -04:00
Duncan Sommerville
272bb11fcf Fixed player displaying nothing (instead of Offline) when no show is scheduled 2015-04-30 14:36:33 -04:00
Duncan Sommerville
e78bd82c8c SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour 2015-04-30 14:14:56 -04:00
Duncan Sommerville
59b90360a1 SAAS-755 - Updated User Manual link 2015-04-30 11:52:23 -04:00
Albert Santoni
0418cdbc04 Nerf a player console.log call 2015-04-29 17:26:51 -04:00
Albert Santoni
85cc373328 Embedded player: Display the show name during master/show source 2015-04-29 16:03:36 -04:00
Duncan Sommerville
e73a6df796 Fix for invalid date format issue in Firefox 2015-04-29 15:23:29 -04:00
Albert Santoni
1215eb1895 Prevent NaN from causing problems with player timeout 2015-04-29 12:58:32 -04:00
Albert Santoni
c72cdbc19d More preventative coding for the player and fixed the live-info-v2 API 2015-04-29 12:17:44 -04:00
Albert Santoni
c0bd28f6d5 Prevent negative timeouts in player 2015-04-29 11:59:17 -04:00
Albert Santoni
9019377d0e Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-04-29 11:48:15 -04:00
Albert Santoni
b3a19ae49e Bugfix for embedded player sending too many requests on load, quieter logging for boto 2015-04-29 11:46:44 -04:00
Duncan Sommerville
4e37788d92 Fix for SAAS-747 2015-04-28 11:42:18 -04:00
Duncan Sommerville
94fc2131ff SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade 2015-04-27 16:19:15 -04:00
Duncan Sommerville
574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
Duncan Sommerville
4b307d6b47 Fix for vertical scrollbar issue 2015-04-27 13:52:55 -04:00
drigato
9b7acb24c6 SAAS-728: Make schedule widgets embeddable 2015-04-22 12:46:41 -04:00
drigato
7d1b112db9 Stopped redirecting to /login if no valid session 2015-04-21 11:26:48 -04:00
drigato
de8edf982a SAAS-723: Add compatibility chart to player page 2015-04-20 10:52:49 -04:00
drigato
9cee7bcc86 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-20 10:05:55 -04:00
drigato
926d1704bf SAAS-723: Add compatibility chart to player page 2015-04-20 09:59:17 -04:00
Albert Santoni
074ad31228 Squash warnings in ProvisioningController 2015-04-17 12:40:52 -04:00
Albert Santoni
1964cbb75e Merge branch 'saas' into saas-suspend 2015-04-17 12:18:56 -04:00
Albert Santoni
bd7c0be514 Whoops, invert the suspension logic 2015-04-17 12:18:49 -04:00
Albert Santoni
3ca16db524 Comments 2015-04-17 12:09:05 -04:00
Albert Santoni
6dc8837aff Removed unused status page stuff for Pro and cleanup for code review 2015-04-17 11:17:35 -04:00
Albert Santoni
02dff34328 Fixed last day of month calendar view bug 2015-04-16 16:45:20 -04:00
Albert Santoni
acbaac0bc5 Fixed month view not displaying a full 42 days 2015-04-16 16:30:12 -04:00
Albert Santoni
d20c8e8df4 Merge branch 'saas' into saas-speedy 2015-04-16 15:59:08 -04:00
Albert Santoni
56716e9af6 Fixed preferences not saving in some cases 2015-04-16 15:11:46 -04:00
Albert Santoni
dc20b5c252 Bugfixes for my optimizations
* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
  response correctly if you started on the month view.
2015-04-16 14:58:28 -04:00
Albert Santoni
b61df4d681 Merge branch '2.5.x' into saas 2015-04-16 12:11:49 -04:00
Albert Santoni
aa0d0f959a Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances 2015-04-16 12:10:56 -04:00
Albert Santoni
8449194ca1 Merge branch 'saas' into saas-speedy 2015-04-15 16:44:43 -04:00