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

1990 commits

Author SHA1 Message Date
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
Albert Santoni
3a1141d4c8 Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
 2015-02-25 13:02:11 -05:00
Albert Santoni
562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni
e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Duncan Sommerville
69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Albert Santoni
3c064b13a9 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
 2015-02-18 16:03:14 -05:00
Albert Santoni
68cd5b027a CC-5998: Prevent users from spamming the delete button in the library 2015-02-18 15:56:28 -05:00
Albert Santoni
d46f4a52eb Installer tweaks and a pypo bugfix 
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
 2015-02-10 18:06:46 -05:00
Albert Santoni
a20f90cd2d Marginally better error handling for 401 in REST controller 2015-02-06 15:20:01 -05:00
Duncan Sommerville
826ae17552 SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful 2015-02-04 15:09:27 -05:00
Albert Santoni
7717692b41 Merge branch '2.5.x' into saas 2015-02-02 18:03:39 -05:00
Albert Santoni
df4bc01ff8 Log all PHP errors (including parse errors) to our zend log 2015-02-02 18:03:13 -05:00
Albert Santoni
163227439c Raise exception again in index.php as alternative to die() 
* Backport from saas
 2015-01-27 18:27:03 -05:00
Albert Santoni
1ddc27bb77 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/public/index.php
 2015-01-27 18:26:39 -05:00
Albert Santoni
e83c86a0ff Refactored the logging class to reduce code, use error levels correctly, and improve performance. 2015-01-27 18:24:13 -05:00
drigato
ac8fadfc80 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	CREDITS
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-23 16:36:31 -05:00
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
6e43505379 Merge branch '2.5.x' into 2.5.x-installer 2015-01-22 17:36:12 -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
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
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
2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
Albert Santoni
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
Duncan Sommerville
75306936c0 Workaround for comment character conflict between python ConfigObj and PHP 2015-01-16 10:22:43 -05:00
Albert Santoni
620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -05:00
Duncan Sommerville
791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -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
Duncan Sommerville
a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -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
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
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville
d07195f048 Rework redirect to config page at the end of the web install 2015-01-12 14:40:22 -05:00
Duncan Sommerville
23f33cd8da Reorder final setup steps 2015-01-12 13:41:39 -05:00
Duncan Sommerville
2b882cc313 Reorder final setup steps 2015-01-12 12:45:52 -05:00
Duncan Sommerville
0fcac545e6 For now, just prompt users to start background services at the end of the install process 2015-01-12 10:53:31 -05:00
Duncan Sommerville
f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville
fc68dfa256 Fixed service execution calls 2015-01-05 11:16:58 -05:00
drigato
b094e59df3 SAAS-526: Change prefix from station name to station id 
Just seeing if we can get the hosting id from a function in the Billing Controller
 2014-12-17 15:39:18 -05:00
Duncan Sommerville
4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00