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

664 Commits

Author SHA1 Message Date
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Duncan Sommerville 4adb9cc55a CC-6070 - standardize editor buttons 2015-08-17 18:34:39 -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 1957c7827f SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes 2015-08-12 14:35:27 -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 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 b5e5fcfc98 More tweaks for password reset 2015-08-07 14:22: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 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 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
Duncan Sommerville 33d2fe0900 SAAS-989 - Move file metadata editor to right-hand showbuilder pane 2015-08-04 19:56:12 -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
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
drigato ee2bfe7664 SAAS-945: Language + Timezone Setup Popup 2015-07-27 07:06:22 -04:00
Duncan Sommerville 5c4803ddf2 SAAS-781 - password reset 2015-07-22 13:48:47 -04:00
drigato fd09941223 Merge branch 'saas-dev' into saas-dev-usability-hints 2015-07-15 13:59:43 -04:00
drigato 8276b1762e Updated outdated public airtime api setting message on preferences page 2015-07-15 13:47:54 -04:00
Albert Santoni 66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -04:00
Duncan Sommerville 9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
Duncan Sommerville c99165a8dd SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options 2015-07-10 13:17:20 -04:00
Duncan Sommerville 37ed35f5b2 Merge branch 'saas-dev' into saas-stream-settings 
Conflicts:
	airtime_mvc/application/models/Preference.php
 2015-07-10 10:29:38 -04:00
drigato 670395bb2e SAAS-939: Add option to preferences to display login button on radio page 
Change option to ON by default
 2015-07-09 15:16:54 -04:00
drigato 0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Albert Santoni d2ca10294f Two Add Show form bugfixes 
* Fixed the Show Source mount name not showing up in Add Show form
* Use Airtime Authenticaiton by default
 2015-07-09 10:18:21 -04:00
Duncan Sommerville ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville 6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville e12494ef5f Fix show source mount error 2015-07-07 15:55:35 -04:00
Duncan Sommerville 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Duncan Sommerville f87fe11a24 SAAS-908 - Break source URL strings into host/port/mount fields 2015-06-30 12:14:33 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-29 10:02:58 -04:00
Duncan Sommerville 881471c6b8 SAAS-793 - Prevent show image upload when editing single instance of a repeating show 2015-06-26 14:23:45 -04:00
Duncan Sommerville 6b9899d11c SAAS-882 - Switch edit user page to use new-style csrf generation 2015-06-26 10:45:26 -04:00
Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2015-06-26 10:37:30 -04:00
Duncan Sommerville 87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-06-25 14:13:25 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -04:00
Albert Santoni 19adb062cf SAAS-879 and add FAQ to Help menu 
* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
 2015-06-19 14:22:58 -04:00
Duncan Sommerville afb02301c1 SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115 2015-06-17 17:16:21 -04:00
Duncan Sommerville f031d13867 Merge branch 'saas-dev' into soundcloud 2015-06-09 14:03:03 -04:00
Duncan Sommerville b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
drigato 450300ddd8 Small TuneIn validation fix 
Was not setting error message when station id is invalid
 2015-05-28 12:00:20 -04:00
drigato 532bd1ea85 SAAS-772: Send metadata to Tunein 
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
 2015-05-25 15:37:45 -04:00
drigato 94b949adaa SAAS-772: Send metadata to Tunein 
Removed unused code
 2015-05-22 10:35:36 -04:00
Duncan Sommerville 3052e1f23b Changed Preferences and Stream Settings pages to use new-style csrf token generation 2015-05-21 10:17:05 -04:00
drigato a2a9e54553 Merge branch 'saas-dev' into saas-tunein 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
 2015-05-19 15:50:16 -04:00
drigato c3457ae03f tunein testing 2015-05-19 15:19:09 -04:00
drigato 4451c49c06 SAAS-772: Send metadata to Tunein 
This is pretty much working except with master source metadata
 2015-05-19 14:39:05 -04:00
drigato b023f191e3 SAAS-772: Send metadata to Tunein 
Added form validation by making a test request to the TuneIn API with
the user-entered values
 2015-05-14 13:13:33 -04:00
drigato cf24c141fd SAAS-772: Send metadata to Tunein 
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
 2015-05-13 16:05:37 -04:00
Duncan Sommerville 15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
Albert Santoni 3695049a6c Added Admin_Only decorator and greyed out read-only text-areas 2015-04-14 14:35:37 -04:00
drigato 4d7d48d6fb Player - fix height 2015-04-10 10:55:39 -04:00
drigato f238faa937 SAAS-712: UI Improvements 2015-04-09 14:22:50 -04:00
drigato 84231f811a SAAS-720: Player can't be accessed unless a user has a valid session 2015-04-09 12:25:27 -04:00
drigato 4429117f6a SAAS-712: UI Improvements 2015-04-09 09:43:15 -04:00
drigato 23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato f6d5b34cca Embed player - code review fixes 2015-04-07 17:49:21 -04:00
drigato 369a59c564 Changed mobile option text on streams page 2015-04-02 15:13:34 -04:00
drigato 17358a761f SAAS-663: Integrate player design 2015-03-25 11:44:28 -04:00
drigato e32744668f SAAS-661: Add mobile stream identifier on Stream Settings page 2015-03-23 16:06:35 -04:00
drigato 2ae4d6c1c3 Embed Player 
Added stream modes
Unhardcoded some values
Disabled opus streams
 2015-03-23 12:37:22 -04:00
drigato ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -04:00
drigato 1f2f8a27a5 SAAS-650: Fix up player page UI in Airtime 2015-03-16 13:24:58 -04:00
drigato dc0855de18 SAAS-643: Embed Player -> Restrict the setting of an OPUS stream 2015-03-16 11:29:24 -04:00
drigato 694430f542 SAAS-637: Un-hardcode all player variables 2015-03-12 15:45:53 -04:00
drigato ac2181a52d Merge branch 'saas' into saas-embed-player 2015-03-11 17:13:04 -04:00
drigato 8198d89095 small change to player form 2015-03-10 16:47:08 -04:00
drigato 6c46f0a156 Added player preview to view 
Everything is hardcoded right now
 2015-03-10 16:32:35 -04:00
Duncan Sommerville 6082738439 Merge branch 'saas' into saas-media-refactor 2015-03-02 16:02:34 -05:00
Duncan Sommerville 17d51eb0f9 Added csrf verification to show image upload and deletion 2015-03-02 16:00:11 -05:00
Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville 78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
drigato 2272451e08 Added placeholders for player embed code and preview 2015-02-25 17:10:41 -05:00
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
drigato 6dcc7ee2fc SAAS-587: Add stream urls to station-metadata API 2015-02-20 15:50:40 -05:00
drigato a931e282e1 SAAS-585: Create Embeddable Player form 
Fixed up the stream urls options
 2015-02-20 15:44:25 -05:00
drigato 40d6249229 Merge branch 'saas' into saas-embed-player 2015-02-20 14:47:57 -05:00
Albert Santoni 964d7d1326 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-18 16:42:04 -05:00
drigato c1086842d3 Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db 
Conflicts:
	airtime_mvc/application/Bootstrap.php

airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-17 16:19:58 -05:00
drigato 4fd7b4c622 SAAS-585: Create Embeddable Player form 
Added stream urls - hardcoded for now
 2015-02-17 11:48:43 -05:00
Duncan Sommerville eb40379152 SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata 2015-02-17 11:44:31 -05:00
drigato c261182c8f Skeleton player form/view/controller 2015-02-12 14:08:06 -05:00
Duncan Sommerville 8d4f94a41f Merge branch '2.5.x' into saas 2015-01-26 17:50:18 -05:00
Duncan Sommerville e3165a12c3 Regex tweak 2015-01-26 17:49:58 -05:00
Duncan Sommerville b569e9a294 Merge branch '2.5.x' into saas 2015-01-26 17:44:41 -05:00
Duncan Sommerville 322d85931b CC-5988 - Better error message & regex for Transition Fade field on stream settings page 2015-01-26 17:41:10 -05:00
Albert Santoni dbba5a7427 Decouple Billing and S3 cloud storage stuff from Zend 2015-01-26 13:10:10 -05:00
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
Albert Santoni fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
drigato 2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
drigato 6ac5a2950f SAAS-551: Cannot schedule shows due to overlapping show check bug 2015-01-20 11:32:15 -05:00
Albert Santoni 0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -05:00
Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00