Commit Graph

14177 Commits

Author SHA1 Message Date
drigato 6f09ef4af1 Change usability hint wording 2015-07-21 07:27:26 -04:00
drigato 3e60713590 SAAS-962: "Now" option should not be available for linked shows
Also added fix for SAAS-957
2015-07-20 15:20:50 -04:00
drigato a6854ea507 SAAS-957: Error on "update show" 2015-07-17 16:28:33 -04:00
drigato 7f4fbf65e1 SAAS-960 Change hint for currently playing linked show 2015-07-17 12:48:57 -04:00
drigato 07f02260db Fix undefined index: nextMediaName 2015-07-17 09:57:24 -04:00
drigato ec74e17ebe Merge branch 'saas' into saas-dev-july-16 2015-07-17 07:40:15 -04:00
Duncan Sommerville 0dd2958333 SAAS-922 - urlencode content headers to ensure compatibility 2015-07-16 14:43:22 -04:00
Duncan Sommerville 452c17650c SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:05:39 -04:00
Duncan Sommerville 40d8212c13 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-07-16 11:03:53 -04:00
Duncan Sommerville c5e7d6734e SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:03:30 -04:00
drigato dd5d6342a7 Merge branch 'saas-dev-usability-hints' into saas-dev 2015-07-16 11:00:04 -04:00
Duncan Sommerville ba38618235 Merge branch 'saas' into saas-dev 2015-07-15 18:54:38 -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
drigato fd09941223 Merge branch 'saas-dev' into saas-dev-usability-hints 2015-07-15 13:59:43 -04:00
drigato 8276b1762e Updated outdated public airtime api setting message on preferences page 2015-07-15 13:47:54 -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 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
Albert Santoni 8e15dd5e99 Merge branch 'saas-dev' into saas-dev-usability-hints 2015-07-13 15:34:06 -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
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
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
Albert Santoni a9cddde877 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-07-09 22:33:10 -04:00
Duncan Sommerville e4720b5992 Remove incorrect sql in 2.5.14 upgrade 2015-07-10 10:27:28 -04:00