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

256 Commits

Author SHA1 Message Date
drigato 10db978a2b Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-11 16:30:50 -05:00
drigato 5cf5ff4fa1 code cleanup 2014-11-11 16:29:54 -05:00
drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
 2014-11-03 12:29:58 -05:00
drigato a10e287368 Fixed a fresh install bug that wasn't using composer installs. 
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
 2014-10-14 16:54:58 -04:00
drigato dd37ffbdd7 CC-5888: Handle file deletion if the file is stored in the cloud 
Execute a python script that deletes a file from the cloud
 2014-07-31 23:11:49 -04:00
drigato ecb072b84c CC-5896: Store cloud files in separate table, inherited from cc_files 
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
 2014-07-28 15:17:46 -04:00
Albert Santoni 0eab0c609b Permissions fixes for Super Admin users 2014-06-20 17:43:20 -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 db2b52a1bf CC-5709: Airtime Analyzer 
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
 2014-03-24 17:14:04 -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
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Martin Konecny 6498f43dad CC-5211: 
Php Exception: Set large number as year in tracks Metadata

fixed
 2013-06-06 17:02:01 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise 9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise c0c6ac5d75 CC-4954: Please make Library page remember the status per user 
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
 2013-02-19 11:37:22 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -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
denise 595429e6e5 CC-4897: XSS exploit on library page 
-fixed
 2013-01-30 11:51:27 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
denise 94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise 796099b413 CC-4860: Library -> Context Menu -> Can't download files 
-fixed
 2013-01-17 13:37:32 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
denise 83be01d0d0 CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated 
-fixed
 2013-01-14 13:42:17 -05:00
James 0542e713ed CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu 
- fixed
 2013-01-07 12:20:07 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly 
- fixed
 2013-01-02 11:41:33 -05:00
James f26778ee72 CC-4757: Duplicate playlist 
- done
- we still need a icon for context menu
 2012-12-28 16:17:58 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-20 11:33:37 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33: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
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -04:00
denise 106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
denise 5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own 
-fixed
 2012-10-31 17:19:27 -04:00
denise 2507e0f8a4 CC-4655: DJ's can delete files that they do not own 
-fixed
 2012-10-31 16:51:29 -04:00
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
denise 92b40bea0c CC-4484: Some js files do not have the airtime version appended 
-fixed
 2012-09-18 17:43:13 -04:00
Rudi Grinberg 4f576afc00 cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script. 2012-09-17 15:24:02 -04:00
Rudi Grinberg 92a5bf51a6 Added warning for uploading unknown file types 2012-09-17 12:45:33 -04:00
Rudi Grinberg 05916a4d26 Code cleanup 2012-09-14 15:13:08 -04:00
Rudi Grinberg 79ce7b572c cc-4202: Fixed 2012-09-14 14:51:50 -04:00
Rudi Grinberg 8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Rudi Grinberg 2b9e6081a4 Added log for exception 2012-09-13 12:27:04 -04:00
Rudi Grinberg 3fb7526fbb Shortened logging 2012-09-13 12:15:51 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed. 
-done
 2012-09-13 10:32:33 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-disable preview icon
 2012-09-12 17:32:19 -04:00
Martin Konecny 8db4c94af1 CC-4389: Convert all PHP errors to throw exceptions instead 
-echo to stdout as well
 2012-09-11 00:50:56 -04:00
Rudi Grinberg f483e271f6 formatting 2012-08-29 14:50:10 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4 
-controllers dir
 2012-08-29 10:54:36 -04:00
James a4c579f36e CC-4254: Library: advanced search on library 
- bug fix
 2012-08-23 10:59:34 -04:00
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
Martin Konecny 442c156458 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed context menu for webstreams
 2012-08-22 16:08:51 -04:00
Martin Konecny fe1aa7a169 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed syntax error
 2012-08-22 15:56:18 -04:00
Martin Konecny 91f13a6279 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 15:34:59 -04:00
Martin Konecny 24988616b3 CC-1665: Scheduled stream rebroadcasting and recording 
-current Library session object should not be stored as a property of the Controller class.
-fixed
 2012-08-22 14:03:11 -04:00
Martin Konecny 9885374d34 CC-1665: Scheduled stream rebroadcasting and recording 
-more work to make webstreams behave like playlist creator
 2012-08-21 18:55:38 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
 2012-08-21 16:54:14 -04:00
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
Martin Konecny c3862d69e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-13 14:58:20 -04:00
Martin Konecny 51e242ec7f CC-1665: Scheduled stream rebroadcasting and recording 
-remove edit menu from show builder
 2012-08-13 14:58:11 -04:00
James dad8762f4f CC-4209: Smart Playlist: 'Processing' wont disappear after clicking Generate during 'File import in progress' 
- fixed
 2012-08-13 12:31:49 -04:00
Martin Konecny 028f6636dd CC-1665: Scheduled stream rebroadcasting and recording 
-fix right clicking in playlist builder to view metadata causing exception
 2012-08-10 14:37:32 -04:00
Martin Konecny fa749c58f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:40:45 -04:00
Martin Konecny 35e3b3bc02 CC-1665: Scheduled stream rebroadcasting and recording 
-use mime type so that webstreams can play with invalid filenames
 2012-08-10 12:40:28 -04:00
James 63a51081c1 CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ 
- fixed
 2012-08-09 17:50:43 -04:00
James 6c721cd68d CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist 
- fixed
- extra fix: context menu for webstream
 2012-08-09 16:59:18 -04:00
denise 361e681a59 CC-84: Smart Playlists 
- remove 'add to playlist' option on showbuilder screen
 2012-08-02 16:50:35 -04:00
James 0d2d8218bf CC-84: Smart Playlists 
- audio preview on playlist
- cleaning up some code
 2012-08-02 16:36:12 -04:00
denise c9afac239a CC-84: Smart Playlists 
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
 2012-08-01 12:04:48 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording 
-improve working with "webstreams"
 2012-07-30 21:48:04 -04:00
James 8755500d30 CC-84: Smart Playlists 
- some minor fix
 2012-07-26 15:30:49 -04:00
denise a828c46d32 CC-84: Smart Playlists 
- changed name of 'block' to 'smart playlist' on UI only
 2012-07-26 13:16:29 -04:00
denise 3df0f2d26e CC-84: Smart Playlists 
- added 'add' option to smart playlist context menu
 2012-07-26 12:45:31 -04:00
denise bef9ba1eea CC-84: Smart Playlists 
- added 'Smart Block' filter in datatable
- added block files to library datatable
 2012-07-25 17:08:22 -04:00
denise 722e470f6f CC-84: Smart Playlists 
- changed playlist controller to also handle Blocks
- created new view for smart blocks
 2012-07-25 11:00:46 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -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 d9cde230cd CC-4090: Make code style PSR compliant 
-removed all trailing whitespace
 2012-07-10 18:53:06 -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
James 24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.
 2012-07-10 17:24:57 -04:00
James 39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.

- fixed
 2012-07-10 17:09:21 -04:00
James 6c83633933 CC-4008: Inconsistent button labels for Play/Preview in Now Playing page 
- changed everyting to "Preview"
 2012-06-28 13:33:01 -04:00
James e5d5f44813 CC-3905: Playlist Library -> the delete tracks button is enabled for DJ 
users and PM's

- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
 2012-06-06 17:31:51 -04:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00