Commit graph

1734 commits

Author SHA1 Message Date
drigato
3aee9a49bc SAAS-1019: Re-work Navigation Menu 2015-08-17 12:46:32 -04:00
Albert Santoni
68523d9e02 Specialize the datatables string for playout history, users, and recent uploads tables 2015-08-14 20:20:30 -04:00
Albert Santoni
31982a7238 Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-14 20:00:17 -04:00
Albert Santoni
8aa39ae28d Moved datatables translation stuff to PHP for consistency 2015-08-14 20:00:05 -04:00
Duncan Sommerville
cb2d0bd444 SAAS-948 - js fixes for dashboard nav, change logo image in master panel 2015-08-14 16:42:39 -04:00
Duncan Sommerville
fb1f22b913 SAAS-948 - css tweaks 2015-08-14 13:29:26 -04:00
Duncan Sommerville
12c4e4a374 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
Conflicts:
	airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
Duncan Sommerville
809b743785 SAAS-948 - Add livechat event listeners 2015-08-14 10:24:49 -04:00
drigato
3e66363cdd SAAS-1017: Move top nav bar to side
Reload datatable if user clicks the browser's back button
2015-08-14 08:43:47 -04:00
drigato
e90fe728a2 SAAS-1017: Move top nav bar to side 2015-08-14 08:30:52 -04:00
Albert Santoni
0c83b62545 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 17:37:01 -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
32100e2d9b SAAS-948 - frontend tweaks 2015-08-12 16:54:45 -04:00
Albert Santoni
61d1e6bb50 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 16:45:07 -04:00
Albert Santoni
409e9e2a78 Stream settings, Add Show form CSS revamp, etc. 2015-08-12 16:44:45 -04:00
Duncan Sommerville
32e1e70418 SAAS-948 - update tab functionality 2015-08-12 15:50:32 -04:00
Duncan Sommerville
c931b81b35 SAAS-948 - library datatable header tweaks 2015-08-12 15:10:56 -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
0cfc55116d Colour tweaks 2015-08-12 13:50:42 -04:00
Albert Santoni
2a1d09bc08 Factor out default show background colour and fix some style issues 2015-08-12 12:55:39 -04:00
Albert Santoni
f63ce23c9f Flatten datatable headers and restyled Manage Users screen 2015-08-12 10:53:14 -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
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
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
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
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
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
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