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

2046 Commits

Author SHA1 Message Date
Albert Santoni 4157c21b28 Merge branch '2.5.x' into saas 2014-06-25 11:25:50 -04:00
Albert Santoni 6c11ef2769 Even better fix, fixes unit tests too 2014-06-25 11:24:19 -04:00
Albert Santoni bb21f08d87 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Auth.php
 2014-06-25 11:18:56 -04:00
Albert Santoni 15013afa40 Better session handling fix 2014-06-25 11:15:14 -04:00
Albert Santoni 8a5a796858 Undo session fix temporarily until issues resolved 2014-06-24 16:46:10 -04:00
Albert Santoni 72ef576f03 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-23 15:28:50 -04:00
Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-06-23 15:26:53 -04:00
Albert Santoni a2bef67d33 Fix user session storage in multi-tenancy mode 2014-06-23 15:22:44 -04:00
drigato 9c4b254bab CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents 2014-06-09 15:35:50 -04:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni 560d1a9b14 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
 2014-06-09 11:36:51 -04:00
Albert Santoni 345c782eb9 Fixed the unit tests and changed ops->zu 2014-06-09 11:34:25 -04:00
Albert Santoni cc19b18d7f CC-5588: Specific user can't see Library because ColReorder is null for 
their account
 2014-06-05 18:04:42 -04:00
Albert Santoni 1624aa4007 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-30 17:13:00 -04:00
Albert Santoni 9f9c32aec3 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-05-30 17:12:42 -04:00
Albert Santoni 61be4875fb CC-5343: Missing files can be scheduled via playlists 
* Fixed it by adding a check for this.
 2014-05-30 17:11:12 -04:00
Albert Santoni 1db308330b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 18:47:21 -04:00
drigato 8432799b9a CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page 2014-05-22 14:47:14 -04:00
drigato fb12ee7e54 CC-5855: Output to zendlog when files are deleted from library 
Added host name to log message
 2014-05-20 14:21:41 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
Albert Santoni e963157a22 Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:49 -04:00
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
drigato a8c428bfb0 Fix disk quota message 2014-05-05 11:52:13 -04:00
drigato e11afd4e71 Fix for new saas instances getting created with a 'disk quota reached' message 2014-05-05 11:41:43 -04:00
Albert Santoni 250d5d083e Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-02 16:06:15 -04:00
Albert Santoni 2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
drigato b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -04:00
drigato d081ff10b2 CC-5807: Disk Space will be updated when file is not actually deleted 2014-04-28 10:25:36 -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 43483dc112 Added dev env to RabbitMQ stuff for Analyzer (fixed) 2014-04-22 12:28:20 -04:00
Albert Santoni a79f53758f Fixed the RabbitMQ thingy 2014-04-22 11:40:35 -04:00
Albert Santoni f106bf8fad Separate RabbitMQ settings by development environment 2014-04-22 11:13:15 -04:00
drigato 411af6838b Remove logging statement 2014-04-17 17:02:14 -04:00
drigato 64ebd9e720 Logging statement 2014-04-17 16:15:04 -04:00
drigato 8979e4e5a9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-17 16:09:03 -04:00
drigato df9482f2ff CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path 
Media monitor was still being used to delete the file from stor
 2014-04-17 16:08:02 -04:00
drigato edeb4b052a Remove logging statements 2014-04-16 16:53:17 -04:00
drigato f33317ebee Logging for testing 2014-04-16 16:44:31 -04:00
drigato 7c39ab294d Logging for testing 2014-04-16 16:37:38 -04:00
drigato 837decb5c3 Logging for testing 2014-04-16 16:36:19 -04:00
drigato 284a1b8895 Upgrade logging test 2014-04-16 16:29:36 -04:00
drigato db62ffff90 Log statment for testing upgrades 2014-04-16 16:01:48 -04:00
drigato 634b429391 Logging statment for testing upgrades - will be removed 2014-04-16 15:56:45 -04:00
drigato d05eae629a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 12:16:08 -04:00
drigato f5a2e59b6d Removed disk space check from StoredFile. This is now done in the Media controller 2014-04-16 12:15:34 -04:00