Duncan Sommerville
|
afa3b47e42
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-25 17:09:17 -04:00 |
|
Duncan Sommerville
|
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 |
Albert Santoni
|
700c3c4005
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-25 13:27:40 -04:00 |
|
Duncan Sommerville
|
371a26ff97
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-25 11:46:30 -04:00 |
|
Duncan Sommerville
|
afe6ca7002
|
Cosmetic updates
|
2015-08-25 11:46:20 -04:00 |
|
Albert Santoni
|
3592eceb22
|
Merge branch 'saas' into saas-dev
|
2015-08-24 17:11:52 -04:00 |
|
Albert Santoni
|
e188fcde32
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-24 16:53:32 -04:00 |
|
Albert Santoni
|
2a1d09bc08
|
Factor out default show background colour and fix some style issues
|
2015-08-12 12:55:39 -04:00 |
|
Albert Santoni
|
249d3b1d2d
|
SAAS-1011: Files stored locally with incorrect file extensions won't play out
|
2015-08-11 09:33:29 -04:00 |
|
Albert Santoni
|
75914b791c
|
Merge branch 'saas-dev' into saas
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
|
2015-08-10 09:00:54 -04:00 |
|
Albert Santoni
|
fc5d20f4d6
|
Safen up getUsingCustomStreamSettings()
|
2015-08-10 08:57:21 -04:00 |
|
Duncan Sommerville
|
133db1c6a6
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-07 16:50:28 -04:00 |
|
Albert Santoni
|
e760df0e5e
|
Added missing newline to password reset email
|
2015-08-07 14:29:10 -04:00 |
|
Albert Santoni
|
ea2a6b3f68
|
Clean up and bugfixes for password reset (SAAS-1009)
|
2015-08-07 13:57:42 -04:00 |
|
Duncan Sommerville
|
0c3d9a8af4
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-06 19:16:31 -04:00 |
drigato
|
f833ab9690
|
SAAS-838: Undefined variable previousMediaName
|
2015-08-06 17:09:54 -04:00 |
|
drigato
|
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 |
|
Duncan Sommerville
|
36f2e1844f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-05 15:32:04 -04:00 |
|
Albert Santoni
|
9c5a634754
|
Fix default Icecast hostname
|
2015-08-05 15:30:14 -04:00 |
|
Albert Santoni
|
1d39117b21
|
Merge remote-tracking branch 'origin/saas-email' into saas-dev
|
2015-08-05 14:50:58 -04:00 |
|
Albert Santoni
|
e49d337db0
|
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
|
2015-08-05 14:50:31 -04:00 |
|
Albert Santoni
|
eef61a65fc
|
Cleanup and comments for the timezone/language popup
|
2015-08-05 14:49:43 -04:00 |
|
Albert Santoni
|
2aaba99b9a
|
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
|
2015-08-05 12:32:33 -04:00 |
|
drigato
|
23fe12651f
|
SAAS-838: Undefined variable previousMediaName
|
2015-08-05 09:48:31 -04:00 |
|
Albert Santoni
|
c934866063
|
Two small code improvements
|
2015-08-04 17:42:53 -04:00 |
|
Duncan Sommerville
|
f138dc6b47
|
SAAS-948 - tab layout for right-hand pane
|
2015-07-31 18:28:16 -04:00 |
|
drigato
|
7839a712e6
|
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
|
2015-07-29 08:10:58 -04:00 |
|
Duncan Sommerville
|
5e58403c7f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-27 15:38:30 -04:00 |
|
Duncan Sommerville
|
59d89b0b9e
|
SAAS-948 - ShowBuilder redesign editors and fixes
|
2015-07-27 15:37:55 -04:00 |
|
drigato
|
ee2bfe7664
|
SAAS-945: Language + Timezone Setup Popup
|
2015-07-27 07:06:22 -04:00 |
Duncan Sommerville
|
5c4803ddf2
|
SAAS-781 - password reset
|
2015-07-22 13:48:47 -04:00 |
|
Duncan Sommerville
|
abdc94ccc3
|
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
|
2015-07-22 11:19:41 -04:00 |
|
Duncan Sommerville
|
a1a2bf9368
|
Test out existing email functionality
|
2015-07-22 11:19:37 -04:00 |
|
drigato
|
07f02260db
|
Fix undefined index: nextMediaName
|
2015-07-17 09:57:24 -04:00 |
|
Duncan Sommerville
|
8609934861
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-15 18:54:55 -04:00 |
|
Duncan Sommerville
|
ba38618235
|
Merge branch 'saas' into saas-dev
|
2015-07-15 18:54:38 -04:00 |
|
Duncan Sommerville
|
71ca2b0668
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-15 18:53:39 -04:00 |
|
Duncan Sommerville
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -04:00 |
|
Albert Santoni
|
ffaa076767
|
Second fix for SAAS-922, file extension improvements for S3
|
2015-07-15 17:51:37 -04:00 |
|
Albert Santoni
|
064e1bd4e0
|
Fix SAAS-922 for files on S3 too
|
2015-07-15 17:33:33 -04:00 |
|
Albert Santoni
|
7ecabffbe8
|
Avoid double dot in extension for SAAS-922
|
2015-07-15 13:41:03 -04:00 |
|
Albert Santoni
|
ffb55de566
|
SAAS-922 take 2
|
2015-07-15 13:12:56 -04:00 |
|
Duncan Sommerville
|
27fe32a3b4
|
Use mime-type array when checking for acceptable extensions
|
2015-07-15 12:58:05 -04:00 |
|
Duncan Sommerville
|
683c1a4641
|
SAAS-876 - use baseurl for default host value
|
2015-07-13 15:52:04 -04:00 |
|
Duncan Sommerville
|
9fdc08f88a
|
SAAS-876 - reset to default settings when using Airtime Pro streaming
|
2015-07-13 12:28:58 -04:00 |
|
Duncan Sommerville
|
37ed35f5b2
|
Merge branch 'saas-dev' into saas-stream-settings
Conflicts:
airtime_mvc/application/models/Preference.php
|
2015-07-10 10:29:38 -04:00 |
|
drigato
|
0601bd675e
|
SAAS-939: Add option to preferences to display login button on radio page
|
2015-07-09 14:38:44 -04:00 |
|
Duncan Sommerville
|
6b9d9e8063
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-08 12:47:24 -04:00 |
|
Duncan Sommerville
|
e246771af0
|
SAAS-922 - additional mime-type coverage
|
2015-07-07 15:09:06 -04:00 |
|
Duncan Sommerville
|
92c9fd30b5
|
SAAS-922 - expose mime-based file extensions from /rest/media
|
2015-07-07 13:54:19 -04:00 |