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

268 Commits

Author SHA1 Message Date
Albert Santoni f89c66922b Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:42 -04:00
drigato 5762bb9df5 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-05 12:26:01 -04:00
drigato 16fb9d75d3 Changed GetDiskUsage so it will always return 0 if the value has not been set yet 2014-05-05 12:25:42 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
 2014-04-23 15:58:39 -04:00
Naomi 578f758274 CC-5810 : Installation can have race conditions with the cache 
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
 2014-04-23 15:41:15 -04:00
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
 2014-03-27 16:38:03 -04:00
Albert Santoni efca227388 SAAS-417: Disable Live Chat for Starter Plans 
* Disable Live Chat for Starter Plans
 2014-03-21 14:30:41 -04:00
drigato 7800cb1e15 SAAS-382: Reimplement Storage Quota 
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
 2014-03-21 09:50:03 -04:00
drigato 09040dc021 Merge branch '2.5.x' into 2.5.x-saas 2014-02-03 12:33:57 -05:00
drigato 63ec20d9f1 CC-5681: I18N: Fail to switch language 
Check if Zend_Auth class exists with the autoloader
 2014-02-03 12:33:35 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
drigato cfb6195523 CC-5632: System preferences don't get saved 2013-12-11 16:55:35 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -05:00
Albert Santoni 2c7db0e83c CC-5555: Fix user preferences logic in preferences cache 
* Fixes stream settings not dislaying
 2013-12-06 17:11:07 -05:00
Naomi 061897a58b CC-5594 : Remove all date_default_timezone_get() 
never rely on this method.
 2013-12-05 16:00:52 -05:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences 
comment out logging to not flood logs.
 2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences 
cache key creation change.
 2013-11-11 17:08:15 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences 
better to include the key in the error message
 2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences 
making sure locale/timezone is returned properly in generic calls.
 2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences 
fixing up code so user id is never passed in manually to a preference getter.
 2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences 
using apc to save/fetch preferences to/from a cache.
 2013-11-11 15:07:13 -05:00
denise af03502592 CC-5323: User's Timezone Can Improperly Edit Show 
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
 2013-09-25 16:22:30 -04:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Martin Konecny 84abd78c8f CC-5109: Fix race-condition when updating cc_pref table 
-not a race condition..was a logic error.
 2013-05-27 15:58:29 -04:00
Naomi 5ba72d00bc CC-5109 : Fix race-condition when updating cc_pref table 2013-05-27 15:33:53 -04:00
Martin Konecny 63b0d4194a CC-5109: 
Fix race-condition when updating cc_pref table

-not a race condition..was a logic error.
 2013-05-27 12:30:58 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
Naomi bd2462170b CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-13 11:42:11 -04:00
Martin Konecny 9f6a1033ea CC-5109: Fix race-condition when updating cc_pref table 2013-05-07 16:21:34 -04:00
Martin Konecny ad82b4ff98 throw exception if we get unexpected numbers of results in cc_pref 2013-05-07 15:36:21 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model 
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
 2013-01-30 15:38:25 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise e4c2f43d9e CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-16 15:40:50 -05:00
denise 9cb4633823 CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref 
-fallback to default settings if user setting is not set
 2013-01-16 12:42:58 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise 690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 14:17:46 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 10:19:21 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny 9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00
Martin Konecny 38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
Rudi Grinberg e5085f0df3 Cleaned up code. 2012-09-19 16:34:46 -04:00
Rudi Grinberg ae1ae80d36 in_array -> array_key_exists 2012-09-17 16:40:22 -04:00
Rudi Grinberg ed45011b40 needle <-> haystack 2012-09-17 14:21:13 -04:00
Rudi Grinberg fef949f6ea band aided some bug 2012-09-17 12:50:04 -04:00
Martin Konecny 3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Martin Konecny 78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-done
 2012-09-14 14:53:25 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
Martin Konecny 203378e60a More exception handling 2012-09-13 14:56:03 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models. 
-done
 2012-09-12 17:26:41 -04:00
Rudi Grinberg 57b59a3290 Cleaned up preference.php 2012-09-11 14:33:50 -04:00
Rudi Grinberg 1304111682 Shortened code with if -> ? 2012-09-11 14:10:13 -04:00
Rudi Grinberg 63b1ead363 Undefined index error fixed by returning a default error if none is set in the database. 2012-09-11 13:56:48 -04:00
Martin Konecny d8b0de4ffa CC-4387: NULL is set to default Station Name 
-fixed
 2012-09-10 17:17:52 -04:00
Martin Konecny 101c28f9c3 remove unused variable (PHP 5.4 warning) 2012-09-07 16:50:52 -04:00
James 7d3ac8eb07 CC-4346: Prepared statements - part 2 
- done
 2012-09-06 16:46:22 -04:00
Martin Konecny f036c84a64 CC-4348: Prepared statements - part 4 
-StreamSetting.php
 2012-09-05 15:15:56 -04:00
Martin Konecny 8b5f94fa9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 11:05:14 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4 
-models dir
 2012-08-29 10:58:03 -04:00
denise 3d20ded170 CC-4307: Add "Never show again" to the pop-up registration prompt 
-done
 2012-08-28 17:30:34 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-done
 2012-08-28 16:17:37 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
 2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library 
- initial commit
 2012-08-23 10:41:40 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant 
StreamSetting.php
 2012-07-09 23:32:21 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-06-29 10:57:14 -04:00
Martin Konecny b8c559db58 add time to our version so cache is never used in dev branch 2012-06-25 18:30:33 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00