c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -04:00
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
ee70a0dbea
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:48 -04:00
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
a9eb3f737d
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-09-29 11:50:18 -04:00
6f185d094b
SAAS-1095: Unknown schedule type: array
2015-09-29 11:49:53 -04:00
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -04:00
943048dd87
Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations
2015-09-28 17:48:04 -04:00
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
6959c459cd
Scheduler transaction improvement and preferences transaction removal
...
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
to ensure two requests don't trigger duplicate repeated show instances
in the calendar.
* Removed the transaction from setValue() in Preference and opt for
a row-level lock instead.
2015-09-02 10:40:38 -04:00
37df86723d
CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user
2015-09-01 16:10:33 -04:00
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
84baef1996
CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen
2015-08-25 17:09:05 -04:00
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
0c3d9a8af4
Merge branch 'saas-dev' into saas-showbuilder
2015-08-06 19:16:31 -04:00
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
ea86675d07
SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message
...
Hid the element in the dashboard so it can never be turned off.
2015-08-06 11:14:43 -04:00
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
9c5a634754
Fix default Icecast hostname
2015-08-05 15:30:14 -04:00
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
2aaba99b9a
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
2015-08-05 12:32:33 -04:00
23fe12651f
SAAS-838: Undefined variable previousMediaName
2015-08-05 09:48:31 -04:00
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
Albert Santoni
Duncan Sommerville
Duncan Sommerville
drigato