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
|
1093e7085a
|
Re-enable hiding the first run popup after first run
|
2015-08-05 15:00:28 -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 |
|
Duncan Sommerville
|
33d2fe0900
|
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
|
2015-08-04 19:56:12 -04:00 |
|
Duncan Sommerville
|
57c1d74286
|
SAAS-985 - Port sandwich menu to showbuilder branch
|
2015-08-04 16:37:45 -04:00 |
|
Duncan Sommerville
|
4200f56265
|
SAAS-999 - Change Advanced Search Options to dropdown
|
2015-08-04 15:38:48 -04:00 |
|
Duncan Sommerville
|
f138dc6b47
|
SAAS-948 - tab layout for right-hand pane
|
2015-07-31 18:28:16 -04:00 |
|
Duncan Sommerville
|
8f5f0eb5fe
|
SAAS-948 - CSS overhaul for new show builder page
|
2015-07-29 20:28:54 -04:00 |
|
Duncan Sommerville
|
661a87dfbc
|
SAAS-948 - Frontend tweaks and fixes
|
2015-07-29 13:35:01 -04:00 |
|
drigato
|
7839a712e6
|
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
|
2015-07-29 08:10:58 -04:00 |
|
Duncan Sommerville
|
75aef986ea
|
SAAS-781 - Code review fixes
|
2015-07-28 11:47:53 -04:00 |
|
Duncan Sommerville
|
fcbc37977f
|
SAAS-948 - Frontend tweaks
|
2015-07-28 11:42:04 -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
|
989b4994aa
|
SAAS-945: Language + Timezone Setup Popup
forgot to auto detect user's timezone
|
2015-07-27 14:38:42 -04:00 |
|
drigato
|
ee2bfe7664
|
SAAS-945: Language + Timezone Setup Popup
|
2015-07-27 07:06:22 -04:00 |
Duncan Sommerville
|
ce0cc946ab
|
Disable password reset in saas-dev (moved to saas-email branch)
|
2015-07-23 13:00:34 -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
|
ce7765a8cb
|
Merge branch 'saas' into saas-dev
|
2015-07-21 11:03:31 -04:00 |
|
drigato
|
6f09ef4af1
|
Change usability hint wording
|
2015-07-21 07:27:26 -04:00 |
|
Duncan Sommerville
|
ba90b1f1eb
|
Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
airtime_mvc/public/css/styles.css
|
2015-07-20 12:23:11 -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
|
1816be156f
|
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
|
2015-07-16 16:26:52 -04:00 |
|
Duncan Sommerville
|
0dd2958333
|
SAAS-922 - urlencode content headers to ensure compatibility
|
2015-07-16 14:43:22 -04:00 |
|
Duncan Sommerville
|
041053b171
|
SAAS-922 - urlencode content headers to ensure compatibility
|
2015-07-16 14:24:07 -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
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
d2ca10294f
|
Two Add Show form bugfixes
* Fixed the Show Source mount name not showing up in Add Show form
* Use Airtime Authenticaiton by default
|
2015-07-09 10:18:21 -04:00 |
|
Albert Santoni
|
4b8944f221
|
Improved explanation for live streaming form
|
2015-07-09 09:22:49 -04:00 |
|
Duncan Sommerville
|
ac2e1a2d4b
|
SAAS-876 - More work on stream settings page
|
2015-07-08 16:04:09 -04:00 |
|
Duncan Sommerville
|
6b9d9e8063
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-08 12:47:24 -04:00 |
|
Duncan Sommerville
|
3cebbaf29a
|
Add aac mime-types into audio mime map
|
2015-07-07 16:15:35 -04:00 |
|
Duncan Sommerville
|
e12494ef5f
|
Fix show source mount error
|
2015-07-07 15:55:35 -04:00 |
|
Duncan Sommerville
|
776596d5b6
|
SAAS-922 - replace large conditionals with single public mime-type map
|
2015-07-07 15:48:22 -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 |
|
drigato
|
0d27011e65
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-07-07 09:21:54 -04:00 |
|
drigato
|
b200a29f43
|
SAAS-928: Time strings on Radio Page are not localized
|
2015-07-07 09:21:44 -04:00 |
|
Duncan Sommerville
|
5cb396e512
|
SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null)
|
2015-07-06 18:03:44 -04:00 |
|
Duncan Sommerville
|
999f03ea1e
|
Merge branch 'saas' into saas-dev
|
2015-07-06 16:54:39 -04:00 |
|
drigato
|
a5a91c25e0
|
SAAS-929: Shows don't show up on schedule widget on Firefox
|
2015-07-06 12:53:15 -04:00 |
|
drigato
|
ec0fbd2d61
|
Fix for schedule widget weekdays going out of order
|
2015-07-06 10:47:04 -04:00 |
|
drigato
|
f86c50a834
|
SAAS-916: Localize schedule widget dates
Fix to use existing locale strings
|
2015-07-06 10:30:16 -04:00 |
|
drigato
|
71b2a4e946
|
Removing duplicate locale strings
|
2015-07-06 10:29:02 -04:00 |
|
drigato
|
6914e16165
|
SAAS-916: Localize schedule widget dates
Forgot to commit msg strings for this
|
2015-07-06 10:21:27 -04:00 |
|
drigato
|
e69eb9c2b1
|
SAAS-916: Localize schedule widget dates
|
2015-07-06 09:33:04 -04:00 |
|
Duncan Sommerville
|
db7e4086ba
|
Re-add favicon headlink
|
2015-07-04 01:16:58 -04:00 |
|
Duncan Sommerville
|
cb0593370a
|
Quick fix
|
2015-07-04 00:38:53 -04:00 |
|
Duncan Sommerville
|
457230ba07
|
SAAS-876 - Initial commit
|
2015-07-03 13:32:41 -04:00 |
Albert Santoni
|
00dfd64677
|
Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular
Saas dev schedule widget angular
|
2015-07-01 15:05:59 -04:00 |