Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,462 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

6822 Commits

Author SHA1 Message Date
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
Albert Santoni 2c443bd27a Some navbar and page title fixes 2015-08-18 17:52:23 -04:00
Duncan Sommerville 5f4935481a Fix selection bug 2015-08-18 17:51:41 -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
Albert Santoni a84c33f0ed Cleanup and fix media type selector highlight in calendar page 2015-08-18 17:29:23 -04:00
Albert Santoni b3371c2a2f Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-18 17:13:35 -04:00
Albert Santoni a04f5afcbd More navbar and submenu layout fixes 2015-08-18 17:13:17 -04:00
Duncan Sommerville a9d30fec15 Fix error when trying to preview playlists/smart blocks 2015-08-18 16:22:14 -04:00
Duncan Sommerville 1f8e8f85b9 Fix bug where success banner for saving playlist can appear for other open playlists 2015-08-18 15:58:09 -04:00
Albert Santoni 20a810fc52 Fixed one more navbar highlight inconsistency 2015-08-18 15:50:10 -04:00
Albert Santoni 49a6b6ab71 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-18 15:48:37 -04:00
Albert Santoni 5a4bf6bb80 Fixed main navigation sidebar highlight inconsistencies 2015-08-18 15:48:33 -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 884e51291c CC-6083 - ctrl clicking a selected item deselects 2015-08-18 15:30:24 -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 5ab0850d9a Partially revert datatables strings 2015-08-18 15:00:25 -04:00
Albert Santoni a271b53c2e CC-6077: Implement actions menu for library view 2015-08-18 14:55:32 -04:00
Albert Santoni b645f1c2ed Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus 2015-08-18 13:11:17 -04:00
Duncan Sommerville cee2fe5a63 CC-6082 - add y-scrollbar to file metadata editor at small resolutions 2015-08-18 12:58:34 -04:00
Duncan Sommerville 263c2709bf CC-6067 - implement hybrid selection 2015-08-18 12:20:06 -04:00
Duncan Sommerville 4bfb8fa0cb CC-6067 - deselect when adding library items 2015-08-18 12:01:23 -04:00
Albert Santoni a3a3d0a635 Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus 2015-08-18 09:53:47 -04:00
drigato d30e32c2d3 Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-18 07:46:39 -04:00
Duncan Sommerville 4adb9cc55a CC-6070 - standardize editor buttons 2015-08-17 18:34:39 -04:00
Albert Santoni 07752dd9a5 Break the context menus 2015-08-17 18:13:37 -04:00
Duncan Sommerville 096c96b1b6 CC-6075 - fix error 2015-08-17 17:39:16 -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
Albert Santoni 74a1e0929d Fixed styling on Listener Stats page 2015-08-17 16:08:58 -04:00
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 7ce9dfa1b3 SAAS-948 - add title to library pane 2015-08-14 15:33:45 -04:00
Duncan Sommerville 536bbfb678 SAAS-948 - css tweaks to top panel 2015-08-14 15:11:46 -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 6c7a6aaad3 Expand user management height 2015-08-13 10:11:25 -04:00
Albert Santoni 8dd580e623 Applied context menu restyling globally 2015-08-12 17:47:55 -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 21250e91c4 More calendar tweaks 2015-08-12 14:33:34 -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
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
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
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
drigato 278ca264eb Fix for bringing customer to view invoice that doesn't exist after downgrade 2015-07-31 11:48:20 -04:00
Albert Santoni 78327c4f68 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-07-31 11:44:29 -04:00
Albert Santoni 84c21de578 Fix error logic if no API key passed to provisioning/create API 2015-07-31 11:43:58 -04:00
drigato 7de507c99a Forgot to commit promo banner 2015-07-31 10:49:24 -04:00
drigato ff61fab62a SAAS-973: Airtime Billing page - Add support for August promotion plans 
Fix to not allow current promo plans to downgrade to another promo plan
Added promo banner to billing page
 2015-07-31 10:46:02 -04:00
drigato 48d745bf77 Hide Awesome August 2015 promo plans from billing page 2015-07-30 13:37:15 -04:00
drigato b2fbb27801 SAAS-973: Airtime Billing page - Add support for August promotion plans 
Made WHMCS Airtime group id a constant
Check for CSRF token on promo eligibilty ajax check
 2015-07-30 13:27:32 -04:00
drigato bccba2f9d5 SAAS-973: Airtime Billing page - Add support for August promotion plans 
Front-end changes to price grid, and plan title
 2015-07-30 12:53:37 -04:00
drigato d9e2ba0ed3 SAAS-973: Airtime Billing page - Add support for August promotion plans 
Un-hardcode product ids
 2015-07-30 09:39:50 -04:00
drigato 4ed87de183 SAAS-973: Airtime Billing page - Add support for August promotion plans 
Backend side pretty much done
 2015-07-29 22:24:17 -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
drigato 4d9fb27554 SAAS-973: Airtime Billing page - Add support for August promotion plans 
created promo-eligibility-check endpoint
 2015-07-29 08:10:05 -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