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

1369 Commits

Author SHA1 Message Date
drigato 54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
Duncan Sommerville e6cf1c7cb9 Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility 2014-10-27 15:52:14 -04:00
Duncan Sommerville e6b9a71d00 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-10-24 15:12:17 -04:00
Duncan Sommerville 598b18b65a Added live-info-v2 and station metadata api calls 2014-10-24 15:11:27 -04:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
 2014-10-08 11:46:08 -04:00
dpsommer 5cc93eac3c Merge pull request #68 from RobertElder/session 
Regenerate session ids.
 2014-10-07 10:10:41 -04:00
Robert Elder 185d84dc01 Increase the time token is valid for in case of long uploads. 2014-10-03 02:18:04 +00:00
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder 5c69eda010 Tokens for Stream Settings page. 2014-10-01 20:55:07 +00:00
Robert Elder 78cc43d33d Regenerate session ids. 2014-09-29 22:48:52 +00:00
Albert Santoni 4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -04:00
drigato 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
drigato 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
Albert Santoni 192c4e884f Bugfix in LocaleController 2014-08-25 18:19:11 -04:00
Albert Santoni 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
Albert Santoni 15013afa40 Better session handling fix 2014-06-25 11:15:14 -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
Albert Santoni a12ebf2cb1 CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
Albert Santoni e3c2ae03b3 Fixed upload file count being wrong in Add Media page (lemma to CC-5863) 2014-06-04 14:15:36 -04:00
Albert Santoni 2e6d3821ae CC-5863: Deleted files still shown in Recent Uploads view 
* Fixed
 2014-06-02 14:14:09 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato e4e5590b9f CC-5802: Upgrade application.ini file 
Remove this upgrade step from the upgrade controller
 2014-05-05 11:19:14 -04:00
drigato 42806b1cbf CC-5802: Upgrade application.ini file 2014-04-28 09:43:21 -04:00
drigato 8d9b9c1fb7 Moved deleting the maintenace temporary file flag to very end of upgrade task 2014-04-25 15:00:13 -04:00
drigato 66000a2847 CC-5802: Upgrade application.ini file 
Changed where we insert new application.ini file lines
 2014-04-25 14:53:58 -04:00
drigato 61df7c1a44 Moved some comments around 2014-04-25 14:20:04 -04:00
drigato f432ea9f75 CC-5802: Upgrade application.ini file 
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
 2014-04-25 14:16:18 -04:00
drigato 1009719e1c Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-25 11:05:51 -04:00
drigato 6890dcc3bc CC-5802: Upgrade application.ini file 
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
 2014-04-25 11:05:33 -04:00
Albert Santoni d9adba117a One more time... 2014-04-25 01:08:08 -04:00
Albert Santoni cdc88d25e1 Argh, fixed typo... it's late 2014-04-25 01:02:47 -04:00
Albert Santoni e7ea5e5301 Try fixing UpgradeController version check again... 2014-04-25 00:48:13 -04:00
Albert Santoni 54db74f622 Allow upgrades from Airtime 2.5.1 because the version wasn't bumped 
internally to 2.5.2
 2014-04-25 00:40:51 -04:00
drigato 42f3bb17e1 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:23:57 -04:00
drigato f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
drigato 069ebd3991 CC-5802: Upgrade application.ini file 2014-04-24 10:12:24 -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 3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni 41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
drigato a3be55fd60 CC-5781: Upgrade script for new storage quota implementation 
Changed airtime conf file path so it works for saas or self-hosted users
 2014-04-16 17:24:02 -04:00
drigato 63e2eda64b CC-5786: Quota Enforcement in the File Upload API 
Tweaked this so it will work on self-hosted instances
 2014-04-14 12:09:15 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
drigato 7fbd285dd0 Fix typo 2014-04-10 15:55:21 -04:00
drigato 819862c37b CC-5781: Upgrade script for new storage quota implementation 
cleaned up upgrade controller
 2014-04-10 10:55:47 -04:00
drigato b9b3e95caa CC-5781: Upgrade script for new storage quota implementation 
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
 2014-04-10 09:28:23 -04:00
drigato bae0c564d0 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-10 07:12:52 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation 
First draft of an upgrade controller
 2014-04-10 07:12:31 -04:00
Albert Santoni 4fe9fc189a CC-5709: Airtime Analyzer 
* CC-5772: Recent Upload table times should be shown in local time
 2014-04-09 14:57:30 -04:00
Albert Santoni 64a95c7c59 CC-5709: Airtime Analyzer 
* Nuked another unused function
 2014-04-03 16:36:42 -04:00