Albert Santoni
|
e5f70e7ec3
|
Re-enable the task manager, it made no difference
|
2015-08-11 17:32:40 -04:00 |
|
Albert Santoni
|
60a02cfdee
|
Temporarily disable the task manager to test lock contention
|
2015-08-11 16:34:28 -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
|
dab0f00736
|
Fixed m4a file extension mapping in pypo
|
2015-08-11 08:59:44 -04:00 |
Duncan Sommerville
|
c9f9bed2d6
|
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
|
2015-08-10 18:46:12 -04:00 |
|
Albert Santoni
|
849b8038ce
|
Mostly new graphics for the calendar page
|
2015-08-10 17:11:40 -04:00 |
|
Albert Santoni
|
a28df91c56
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 14:17:24 -04:00 |
|
Albert Santoni
|
2af5eb3314
|
Add Media page visual refresh, and use dropzone
|
2015-08-10 14:17:16 -04:00 |
|
Duncan Sommerville
|
641486e852
|
SAAS-948 - Showbuilder fixes
|
2015-08-10 13:44:57 -04:00 |
|
Duncan Sommerville
|
c2d1556cfd
|
Showbuilder css changes
|
2015-08-10 12:37:21 -04:00 |
|
Albert Santoni
|
3bb1dccd65
|
Ditched hiding overflow, more styling changes
|
2015-08-10 12:32:39 -04:00 |
|
Albert Santoni
|
974f979bef
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 12:23:30 -04:00 |
|
Albert Santoni
|
fc7a700654
|
Consolidated some CSS
|
2015-08-10 12:23:22 -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
|
bf6244c835
|
SAAS-948
|
2015-08-07 19:20:29 -04:00 |
|
Albert Santoni
|
cdc9f88c1c
|
Big style update for the new show builder screen
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
|
2015-08-07 19:08:17 -04:00 |
|
Duncan Sommerville
|
133db1c6a6
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-07 16:50:28 -04:00 |
|
Duncan Sommerville
|
e6609896a5
|
SAAS-948 - showbuilder styling
|
2015-08-07 16:49:05 -04:00 |
|
Albert Santoni
|
a82b75743f
|
Fix error messages being swapped on the password reset page
|
2015-08-07 14:41:10 -04:00 |
|
Albert Santoni
|
e760df0e5e
|
Added missing newline to password reset email
|
2015-08-07 14:29:10 -04:00 |
|
Albert Santoni
|
b5e5fcfc98
|
More tweaks for password reset
|
2015-08-07 14:22:01 -04:00 |
|
Albert Santoni
|
bd83eefefe
|
Cleanup for password reset post-email screen
|
2015-08-07 14:09:01 -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 |
|
Duncan Sommerville
|
02d96d7bd0
|
SAAS-991 - initial playlist editor redesign
|
2015-08-06 19:16:04 -04:00 |
drigato
|
f833ab9690
|
SAAS-838: Undefined variable previousMediaName
|
2015-08-06 17:09:54 -04:00 |
|
Duncan Sommerville
|
cc36fcd37b
|
Showbuilder checkboxes and style fixes
|
2015-08-06 16:01:44 -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
|
83902ebbbe
|
Fix small showbuilder bugs
|
2015-08-06 10:40:50 -04:00 |
|
Duncan Sommerville
|
4cbc49391b
|
Reintroduce checkboxes
|
2015-08-05 18:14:56 -04:00 |
|
Duncan Sommerville
|
36f2e1844f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-05 15:32:04 -04:00 |
|
Duncan Sommerville
|
07d8a0de04
|
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
|
2015-08-05 15:29:47 -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 |
|
Albert Santoni
|
c934866063
|
Two small code improvements
|
2015-08-04 17:42:53 -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 |
|
Albert Santoni
|
d0d6efd508
|
Fix m4a uploads in Airtime
|
2015-07-31 15:02:53 -04:00 |
Denise Rigato
|
f19b6b4bf2
|
Merge pull request #123 from sourcefabric/saas-aug-promo
Airtime Billing page - Add support for August promotion plans
|
2015-07-31 13:55:20 -04:00 |
|
drigato
|
8a52178765
|
Fix for billing downgrade with no new invoice created
|
2015-07-31 13:42:47 -04:00 |
|
drigato
|
5530142174
|
Un-doing last 2 committs about invoices
|
2015-07-31 12:01:26 -04:00 |
|
drigato
|
aab4b634bf
|
Show form on billing page if no invoice was generated after downgrade
|
2015-07-31 11:56:00 -04:00 |