Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13270 commits 3 branches 0 tags 405 MiB
Commit graph

5845 commits

Author SHA1 Message Date
drigato
ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
 2015-01-23 11:32:45 -05:00
Albert Santoni
239aae029e Added image_path to unit tests. 2015-01-22 17:30:29 -05:00
drigato
134ade877c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	airtime_mvc/build/sql/schema.sql
 2015-01-22 15:48:34 -05:00
Albert Santoni
d5ee710f89 Fixed CSRF token checking in MediaController (broken by last 2 commits) 
* Also fixed getOwnerId(), no longer calls a non-existent function
 2015-01-22 12:20:13 -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
drigato
bade613e80 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-01-22 11:19:25 -05:00
Albert Santoni
fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
Duncan Sommerville
a40067ca55 Moved REST authorization boilerplate to Zend Acl_plugin 2015-01-21 17:20:04 -05:00
Duncan Sommerville
2c2f7ebc5f Initial commit for update to ACL for REST module; NEEDS TESTING 2015-01-21 15:34:15 -05:00
Duncan Sommerville
7e2cc65f32 Merge branch '2.5.x' into saas 2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Duncan Sommerville
345b2b5d26 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-21 15:14:34 -05:00
drigato
62f2a0babf CC-5981: Admin users can't delete webstreams created by other users 2015-01-21 11:31:28 -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
localizer
974d419951 updated translation resources 2015-01-19 13:52:08 +00:00
localizer
5980f599e7 updated translation resources 2015-01-19 13:02:11 +00:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
drigato
19626ed4f5 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 13:26:55 -05:00
drigato
775008b274 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 12:13:04 -05:00
drigato
57a7218a79 SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix 2015-01-16 11:09:13 -05:00
Albert Santoni
620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -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
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Duncan Sommerville
a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
localizer
c614f4d711 updated translation resources 2015-01-15 11:12:14 +00:00
drigato
754c7bfc64 Removed code that was deleting the cloud_file database records in the case of 
station termination. The database will remain as is in case we have to restore
the files.
 2015-01-14 15:15:23 -05:00
Albert Santoni
609a46dfa3 Comment Airtime_Decorator_SuperAdmin_Only 2015-01-14 15:12:20 -05:00
Albert Santoni
c24a040689 Fixed my SuperAdmin_Only decorator 2015-01-14 14:34:14 -05:00
Albert Santoni
d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05:00
Albert Santoni
3247f6992a Merge branch 'saas-pullreq77' into saas 2015-01-13 20:59:02 -05:00
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
Duncan Sommerville
9e90e8af63 Added cc_show image_path and cc_show_instances description fields to schema 2015-01-13 17:07:23 -05:00
Duncan Sommerville
a0e5c975dd Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-01-13 15:50:38 -05:00
drigato
a4461dc79a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 15:50:20 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
drigato
c264747a54 Removed silly logging statement 2015-01-13 15:25:36 -05:00
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Albert Santoni
caf37e1b87 CC-5975: Default fade-in/out, and crossfade time validators don't work 
* Fixed the number formatting and validation in the preferences and streaming preferences
  (the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
  crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
 2015-01-13 12:18:57 -05:00
Albert Santoni
9cfcaf2ffd SAAS-537: Fixed the week view of the schedule widgets 
* Also improved the instructions inline for how to use them...
  (this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
  misleading before)
 2015-01-12 22:29:21 -05:00
drigato
e17b330186 Remove just previously added logging statements 2015-01-12 16:26:27 -05:00
drigato
c7c683966d Logging 2015-01-12 16:21:53 -05:00
drigato
7bdf34fcd1 Logging 2015-01-12 15:58:50 -05:00
drigato
8f0f69abd9 More logging 2015-01-12 15:45:33 -05:00
drigato
44b82fdd8a More logging statements 2015-01-12 15:37:48 -05:00
drigato
85557d4886 Logging statements 2015-01-12 15:29:41 -05:00
drigato
02e4c18931 SAAS-531: Finalize S3 folder hierarchy 2015-01-12 14:50:42 -05:00