Albert Santoni
|
0752e78b2c
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-25 13:27:48 -04:00 |
Albert Santoni
|
700c3c4005
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-25 13:27:40 -04:00 |
drigato
|
2ec715d814
|
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
|
2015-08-25 13:19:40 -04:00 |
drigato
|
c921aabfd4
|
Small css fix on recent uploads table
|
2015-08-25 13:19:18 -04:00 |
Albert Santoni
|
161746fbae
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-25 13:16:11 -04:00 |
Albert Santoni
|
d4527a0460
|
CC-6091: Settings->General doesn't highlight when you click Settings
|
2015-08-25 13:15:57 -04:00 |
drigato
|
0c50247909
|
SAAS-1022: Re-implement disk quota status on side nav bar
Small css fix
|
2015-08-25 13:09:07 -04:00 |
drigato
|
bb2757127d
|
SAAS-1022: Re-implement disk quota status on side nav bar
Small css tweak
|
2015-08-25 12:56:02 -04:00 |
drigato
|
a41793666d
|
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
|
2015-08-25 12:43:15 -04:00 |
drigato
|
2da431895f
|
SAAS-1022: Re-implement disk quota status on side nav bar
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
|
2015-08-25 12:43:08 -04:00 |
Duncan Sommerville
|
371a26ff97
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-25 11:46:30 -04:00 |
Duncan Sommerville
|
afe6ca7002
|
Cosmetic updates
|
2015-08-25 11:46:20 -04:00 |
Albert Santoni
|
3592eceb22
|
Merge branch 'saas' into saas-dev
|
2015-08-24 17:11:52 -04:00 |
Albert Santoni
|
e188fcde32
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-24 16:53:32 -04:00 |
Albert Santoni
|
f21fcb3dcc
|
SAAS-1011 - Fixed one mimetype problem and fixed installer
|
2015-08-24 16:25:09 -04:00 |
Duncan Sommerville
|
e6761b54da
|
CC-6066 - more work on add/remove content screen
|
2015-08-24 12:05:57 -04:00 |
Albert Santoni
|
fdb2d4fae2
|
SAAS-1011: Files on NFS with incorrect file extensions won't play out
* Simplified the mime type detection code in pypo and made it actually work
|
2015-08-24 11:29:45 -04:00 |
Duncan Sommerville
|
b15160d0fb
|
Fix more selection bugs
|
2015-08-21 14:39:30 -04:00 |
Duncan Sommerville
|
6cfc2db0ca
|
CC-6086 - fix logout button redirecting to a 404 from certain pages when no baseurl is set
|
2015-08-21 14:29:00 -04:00 |
Duncan Sommerville
|
812dca9409
|
CC-6066 - initial work on add/remove content dialog; some selection fixes
|
2015-08-21 14:19:28 -04:00 |
Albert Santoni
|
f7733757f6
|
Fixed select menu styling and eliminated ColVis fade time
|
2015-08-21 13:14:20 -04:00 |
Duncan Sommerville
|
604b81071c
|
CC-6084 - fix calendar drag and drop
|
2015-08-21 11:09:45 -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
|
6f0b7f6d32
|
SAAS-1022: Re-implement disk quota status on side nav bar
Layout tweak
|
2015-08-21 10:06:40 -04:00 |
drigato
|
38d9963a8d
|
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
|
2015-08-21 09:25:01 -04:00 |
drigato
|
f48c7186ca
|
SAAS-1022: Re-implement disk quota status on side nav bar
|
2015-08-21 09:08:36 -04:00 |
drigato
|
d9455f86ea
|
Change menu item order and change trial box position
|
2015-08-20 10:56:11 -04:00 |
Albert Santoni
|
b718171729
|
Fixed aspect ratio of logo
|
2015-08-19 18:26:05 -04:00 |
Duncan Sommerville
|
beb0eed1c8
|
Make muses 'pixel' invisible, remove scrollbar from player widget page
|
2015-08-19 17:33:55 -04:00 |
Duncan Sommerville
|
a8955e2ea1
|
Fix side-menu position
|
2015-08-19 17:18:42 -04:00 |
Albert Santoni
|
cfa543e835
|
Small adjustment to logo
|
2015-08-19 16:59:04 -04:00 |
Albert Santoni
|
a71752f5c4
|
Lightened up sidebar icons and fixed context menu arrow alignment
|
2015-08-19 16:21:10 -04:00 |
Albert Santoni
|
93d2d8ad67
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
|
2015-08-19 15:00:35 -04:00 |
Albert Santoni
|
f82558a5c0
|
Navigation sidebar finalization
|
2015-08-19 14:59:33 -04:00 |
Duncan Sommerville
|
8dab79da1c
|
Restyle top panel to account for larger nav panel width
|
2015-08-19 14:29:54 -04:00 |
Duncan Sommerville
|
42bbfc3834
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-19 13:02:16 -04:00 |
Duncan Sommerville
|
ae66b2272b
|
Fix editor styling and layout issues
|
2015-08-19 13:02:14 -04:00 |
drigato
|
f9cc8b41df
|
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
|
2015-08-19 12:58:49 -04:00 |
drigato
|
8dcd0a2595
|
CC-6071: Icons for navigation bar
|
2015-08-19 12:58:31 -04:00 |
Albert Santoni
|
a3e9a7355c
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-19 11:47:20 -04:00 |
Albert Santoni
|
0471d4bbdb
|
Tweaked text shadow on usability hints
|
2015-08-19 11:47:13 -04:00 |
Duncan Sommerville
|
ff930549db
|
Fix broken sortable placeholders
|
2015-08-19 11:32:41 -04:00 |
drigato
|
59a9862ba3
|
CC-6072: Wrapper has weird positioning during page load
|
2015-08-19 10:56:41 -04:00 |
Duncan Sommerville
|
11652da40b
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-18 18:45:58 -04:00 |
Duncan Sommerville
|
63f9403b11
|
Fix more selection bugs, implement new selection on schedule table
|
2015-08-18 18:45:55 -04:00 |
Albert Santoni
|
95cfe463d5
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-18 18:40:52 -04:00 |
Albert Santoni
|
8afc652ff1
|
Submenu and body background color tweaks
|
2015-08-18 18:40:09 -04:00 |
Duncan Sommerville
|
e7367c3374
|
Fix more selection bugs
|
2015-08-18 18:01:12 -04:00 |
Albert Santoni
|
504a720ff2
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-18 17:52:26 -04:00 |