Albert Santoni
b6f33f6083
Completed smart block, playlist, and webstream editor form overhauls
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
playlist contents back rather than the entire HTML fragment for the
editor.
* Keep more of the playlist/smartblock editor view persistent across
saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
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
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
Duncan Sommerville
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
Duncan Sommerville
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
drigato
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
Albert Santoni
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
Duncan Sommerville
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
Duncan Sommerville
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
Duncan Sommerville
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
Albert Santoni
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
Albert Santoni
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
Duncan Sommerville
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
drigato
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
drigato
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
drigato
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
Albert Santoni
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
drigato
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
Albert Santoni
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
Duncan Sommerville
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
Albert Santoni
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -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
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -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
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
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Duncan Sommerville
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
Duncan Sommerville
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -04:00
Duncan Sommerville
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -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
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
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
drigato
278ca264eb
Fix for bringing customer to view invoice that doesn't exist after downgrade
2015-07-31 11:48:20 -04:00