365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -04:00
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
ac60a927d4
Merge branch '2.5.x' into saas
2014-09-12 16:31:58 -04:00
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00
2a96c6ec5b
Merge branch '2.5.x' into saas
2014-09-08 20:49:55 -04:00
f7b6e3379e
Enable Japanese locale
2014-09-08 20:49:08 -04:00
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
716cc5a754
Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways.
2014-08-27 18:51:06 -04:00
77ff4ffc3a
Merge branch '2.5.x' into saas
2014-08-26 13:34:09 -04:00
d1971b6d2b
Remove cc_locale table and add Selenium running script
...
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
10cb5484fe
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
57c1e76dc7
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-25 18:31:58 -04:00
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
d438587ddc
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/airtime/CcShow.php
airtime_mvc/application/services/SchedulerService.php
airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
6249deb1ac
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
a5704eac6e
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-20 16:35:59 -04:00
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -04:00
60f4d112e7
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
f072d60ff1
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
33f397f577
remove memory usage log statements
2014-08-15 16:25:37 -04:00
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -04:00
f2929d02f6
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 15:41:55 -04:00
22218079af
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 15:35:58 -04:00
7bd443f668
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 11:09:05 -04:00
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
520387fcad
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
4b4554476a
Error checking if a locale isn't installed
2014-07-28 11:35:19 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
1aa99e2896
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.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-07-15 16:41:29 -04:00
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
35e98e468d
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
2014-07-02 13:43:09 -04:00
54fdb34fc4
Disable APC cache clearing on SaaS
2014-07-02 12:49:37 -04:00
f068d5bd9a
Fixed cache merge
2014-07-02 12:36:03 -04:00
2794ca1355
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
728fccc2fe
Fixed Upgrade caching bugs
2014-07-02 12:30:52 -04:00
4157c21b28
Merge branch '2.5.x' into saas
2014-06-25 11:25:50 -04:00
6c11ef2769
Even better fix, fixes unit tests too
2014-06-25 11:24:19 -04:00
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
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
8a5a796858
Undo session fix temporarily until issues resolved
2014-06-24 16:46:10 -04:00
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
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
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
9a84bdfda1
Fixed syntax error
2014-06-20 17:44:30 -04:00
0eab0c609b
Permissions fixes for Super Admin users
2014-06-20 17:43:20 -04:00
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04:00
fa3c7bd67a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-09 11:37:06 -04:00
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
345c782eb9
Fixed the unit tests and changed ops->zu
2014-06-09 11:34:25 -04:00
cc19b18d7f
CC-5588: Specific user can't see Library because ColReorder is null for
...
their account
2014-06-05 18:04:42 -04:00
1624aa4007
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 17:13:00 -04:00
9f9c32aec3
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-05-30 17:12:42 -04:00
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
1db308330b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-22 18:47:21 -04:00
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
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
f684ce4ab9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-20 14:16:24 -04:00
4cdd855a21
CC-5855: Output to zendlog when files are deleted from library
2014-05-20 14:15:51 -04:00
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
f89c66922b
Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas
2014-05-05 12:42:42 -04:00
5762bb9df5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 12:26:01 -04:00
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
a8c428bfb0
Fix disk quota message
2014-05-05 11:52:13 -04:00
e11afd4e71
Fix for new saas instances getting created with a 'disk quota reached' message
2014-05-05 11:41:43 -04:00
250d5d083e
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-02 16:06:15 -04:00
2d6748457c
Remove database credentials from application.ini
2014-05-02 15:50:37 -04:00
b4a9882e9c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 10:27:07 -04:00
d081ff10b2
CC-5807: Disk Space will be updated when file is not actually deleted
2014-04-28 10:25:36 -04:00
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
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
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
43483dc112
Added dev env to RabbitMQ stuff for Analyzer (fixed)
2014-04-22 12:28:20 -04:00
a79f53758f
Fixed the RabbitMQ thingy
2014-04-22 11:40:35 -04:00
f106bf8fad
Separate RabbitMQ settings by development environment
2014-04-22 11:13:15 -04:00
411af6838b
Remove logging statement
2014-04-17 17:02:14 -04:00
64ebd9e720
Logging statement
2014-04-17 16:15:04 -04:00
8979e4e5a9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-17 16:09:03 -04:00
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
edeb4b052a
Remove logging statements
2014-04-16 16:53:17 -04:00
f33317ebee
Logging for testing
2014-04-16 16:44:31 -04:00
7c39ab294d
Logging for testing
2014-04-16 16:37:38 -04:00
837decb5c3
Logging for testing
2014-04-16 16:36:19 -04:00
284a1b8895
Upgrade logging test
2014-04-16 16:29:36 -04:00
db62ffff90
Log statment for testing upgrades
2014-04-16 16:01:48 -04:00
634b429391
Logging statment for testing upgrades - will be removed
2014-04-16 15:56:45 -04:00
d05eae629a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 12:16:08 -04:00
f5a2e59b6d
Removed disk space check from StoredFile. This is now done in the Media controller
2014-04-16 12:15:34 -04:00
10cf16f53a
Logging statments
2014-04-16 12:04:18 -04:00
Duncan Sommerville
drigato
Albert Santoni
Naomi