Duncan Sommerville
|
27fe32a3b4
|
Use mime-type array when checking for acceptable extensions
|
2015-07-15 12:58:05 -04:00 |
|
Duncan Sommerville
|
934b3fb764
|
Merge branch 'saas-dev' into saas
|
2015-07-15 11:47:21 -04:00 |
|
Duncan Sommerville
|
7ce3082fa2
|
Fix upgrade being run from unit tests
|
2015-07-15 11:46:52 -04:00 |
drigato
|
6a01205034
|
SAAS-940: Provide usability hints to user
Fixed bug where sometimes the hint would not show up
|
2015-07-15 11:35:59 -04:00 |
|
drigato
|
e07d62b020
|
Small comments fix
|
2015-07-15 10:41:01 -04:00 |
|
drigato
|
b37b574cea
|
Real fix for calendar context menu width problem
|
2015-07-15 10:30:59 -04:00 |
|
drigato
|
dddc6e6591
|
Fix for context menu on calendar being too small sometimes
|
2015-07-15 07:19:48 -04:00 |
Albert Santoni
|
e04a4e3a68
|
Merge branch 'saas-dev' into saas
|
2015-07-14 15:16:16 -04:00 |
|
drigato
|
fdef9d9f78
|
Fixed calendar context menu width
|
2015-07-14 13:45:37 -04:00 |
|
drigato
|
7b237a2e65
|
SAAS-940: Provide usability hints to user
Changed some hint wording
|
2015-07-14 12:14:00 -04:00 |
|
drigato
|
8309289356
|
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 11:52:10 -04:00 |
|
drigato
|
e5c574229f
|
SAAS-940: Provide usability hints to user
fix hint message transitions
|
2015-07-14 11:51:50 -04:00 |
|
drigato
|
2de831a37f
|
SAAS-940: Provide usability hints to user
Made hints more specific
|
2015-07-14 11:45:37 -04:00 |
|
Albert Santoni
|
2693c9f02c
|
Small bugfix for CC-6064
|
2015-07-14 11:25:11 -04:00 |
|
Albert Santoni
|
30b8ada622
|
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:56:18 -04:00 |
|
Albert Santoni
|
45b09a0d24
|
Merge branch 'saas-dev' into saas-dev-usability-hints
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
|
2015-07-14 10:56:12 -04:00 |
|
drigato
|
e24307180c
|
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:40:10 -04:00 |
|
drigato
|
794a4a21d8
|
SAAS-940: Provide usability hints to user
Update hints after library table has changed
|
2015-07-14 10:39:58 -04:00 |
|
Albert Santoni
|
5a2ef8d3db
|
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:35:47 -04:00 |
|
Albert Santoni
|
66caf2574a
|
CC-6064: Allow shows to be started "now"
|
2015-07-14 10:35:21 -04:00 |
|
drigato
|
71e8909365
|
SAAS-940: Provide usability hints to user
Fixed bug where hints were not showing up sometimes
|
2015-07-14 10:08:56 -04:00 |
|
Duncan Sommerville
|
07238260ed
|
Remove incorrect sql in 2.5.14 upgrade
|
2015-07-14 09:59:34 -04:00 |
|
drigato
|
25ef70767b
|
SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
|
2015-07-13 17:02:31 -04:00 |
|
Duncan Sommerville
|
683c1a4641
|
SAAS-876 - use baseurl for default host value
|
2015-07-13 15:52:04 -04:00 |
|
Albert Santoni
|
8e15dd5e99
|
Merge branch 'saas-dev' into saas-dev-usability-hints
|
2015-07-13 15:34:06 -04:00 |
|
Duncan Sommerville
|
755ec79e7d
|
SAAS-876 - frontend tweaks
|
2015-07-13 15:17:47 -04:00 |
|
Duncan Sommerville
|
56585fb01c
|
Add default icecast pass to settable params in ProvisioningController
|
2015-07-13 13:28:27 -04:00 |
|
Duncan Sommerville
|
c05d4bac2f
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-13 13:27:34 -04:00 |
|
Duncan Sommerville
|
d9117721b9
|
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
|
2015-07-13 13:23:39 -04:00 |
|
Duncan Sommerville
|
6d883d2fa4
|
Fix Add Show button bug and update styling
|
2015-07-13 13:23:24 -04:00 |
|
Duncan Sommerville
|
9fdc08f88a
|
SAAS-876 - reset to default settings when using Airtime Pro streaming
|
2015-07-13 12:28:58 -04:00 |
|
drigato
|
33bd1ec605
|
Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev
|
2015-07-13 11:19:42 -04:00 |
|
drigato
|
48547ee347
|
SAAS-940: Provide usability hints to user
Refactored some code
|
2015-07-13 11:19:04 -04:00 |
|
Duncan Sommerville
|
44dd969c0c
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-13 10:17:21 -04:00 |
|
drigato
|
721cd5a31b
|
SAAS-924: Cannot edit repeating show if first instance has ended
Added safeguard in case we don't find a future show instance
|
2015-07-13 09:04:49 -04:00 |
|
drigato
|
55999a07ec
|
SAAS-940: Provide usability hints to user
|
2015-07-13 08:06:41 -04:00 |
|
Duncan Sommerville
|
c99165a8dd
|
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
|
2015-07-10 13:17:20 -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 |
|
Duncan Sommerville
|
e4720b5992
|
Remove incorrect sql in 2.5.14 upgrade
|
2015-07-10 10:27:28 -04:00 |
|
drigato
|
c44035c27d
|
SAAS-938: Long track metadata messes up player bar on the radio page
|
2015-07-10 09:08:19 -04:00 |
|
Albert Santoni
|
a9cddde877
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-07-09 22:33:10 -04:00 |
|
Albert Santoni
|
238bb15793
|
SAAS-941: Liquidsoap fails to start for stations with the substrings true/false in their names
|
2015-07-09 22:32:34 -04:00 |
|
drigato
|
670395bb2e
|
SAAS-939: Add option to preferences to display login button on radio page
Change option to ON by default
|
2015-07-09 15:16:54 -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 |
|
drigato
|
9ec75f7179
|
Merge branch 'saas' into saas-dev
|
2015-07-09 14:11:27 -04:00 |
|
Albert Santoni
|
1efa591d67
|
Fixed double HTML encoding on embedded schedule widget
|
2015-07-09 12:49:49 -04:00 |
|
drigato
|
1b3a9f6e6a
|
SAAS-924: Cannot edit repeating show if first instance has ended
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
|
2015-07-09 12:18:21 -04:00 |
|
Albert Santoni
|
c35a8cc952
|
Merge branch 'saas-dev' into saas
|
2015-07-09 11:18:10 -04:00 |
|
drigato
|
7c927dcb31
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-07-09 10:35:05 -04:00 |
|
drigato
|
5ec3684ea6
|
CSS fix onradio page schedule widget
Widen width or show time and name columns on mobile phones
|
2015-07-09 10:34:48 -04:00 |