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
localizer
ef3fc14b50
updated translation resources
2015-04-17 20:43:07 +00:00
localizer
4bf234d108
updated translation resources
2015-04-17 20:35:08 +00:00
Albert Santoni
53def5af8d
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:56:20 -04:00
Albert Santoni
319b949c5b
Invert suspend logic (forgot to push?)
2015-04-17 15:55:41 -04:00
Albert Santoni
82a129285c
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-17 15:23:56 -04:00
Albert Santoni
1515984664
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:23:40 -04:00
Albert Santoni
5d25fcea2d
Style tweaks to the suspension notice.
2015-04-17 12:58:05 -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
localizer
a286597826
updated translation resources
2015-04-17 13:03:07 +00:00
localizer
f7d9363fff
updated translation resources
2015-04-17 12:51:13 +00: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
Albert Santoni
f0bcc1e42b
Merge branch '2.5.x' into saas
2015-04-15 16:44:26 -04:00
Albert Santoni
4267c4e86d
CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen
2015-04-15 16:44:04 -04:00
drigato
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
drigato
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
drigato
838f7e84bf
Merge branch 'saas-player-testing' into saas
2015-04-15 13:22:32 -04:00
drigato
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
drigato
d5a29398c6
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-15 10:50:57 -04:00
drigato
1c2a307d34
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:50:16 -04:00
drigato
3b33f55652
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:48:31 -04:00
Albert Santoni
f3c8f40183
Tweaks to fix up my optimizatinos
...
* Fixed a rendering glitch with empty shows in the Now Playing screen
* Changed drag and drop placeholder to show the track name. Reverted it
from the default DataTables placeholder, which unfortunately gets the
column widths wrong.
2015-04-14 17:39:52 -04:00
Albert Santoni
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
Albert Santoni
a48ae75907
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-14 11:36:22 -04:00
Albert Santoni
a606fef5af
Gracefully handle bad ColReorder deserialization
2015-04-14 11:36:13 -04:00
Albert Santoni
b1ea1f27a3
Fixed empty show Showbuilder bug and started making checkboxes work like cursors used to
2015-04-14 11:30:18 -04:00
drigato
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
localizer
87b6f0db48
updated translation resources
2015-04-13 19:40:08 +00:00
localizer
5d3ec4ab13
updated translation resources
2015-04-13 19:27:07 +00:00
localizer
90b03a06a2
updated translation resources
2015-04-13 19:12:15 +00:00
drigato
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
Denise Rigato
10a5596ace
Merge pull request #108 from sourcefabric/saas-embed-player
...
Saas embed player
2015-04-13 11:46:57 -04:00
drigato
24b6751eeb
Remove unused code from player
2015-04-13 09:18:36 -04:00
drigato
b48d10a45e
Merge branch 'saas' into saas-embed-player
2015-04-13 09:03:59 -04:00
Albert Santoni
1194a0f959
Some big performance optimizations to Now Playing JavaScript.
...
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
Albert Santoni
b11e98ea24
Reduced the Now Playing screen AJAX on load from 9 to 2.
2015-04-10 19:52:06 -04:00
drigato
988fcae989
Remove console.log
2015-04-10 18:17:22 -04:00
drigato
63c3236e7a
Player metadata fix
2015-04-10 17:38:39 -04:00