Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,838 Commits 18 Branches 28 Tags 437 MiB
Commit Graph

2748 Commits

Author SHA1 Message Date
Rudi Grinberg 89dcc18724 general cleanups 2012-09-04 14:55:23 -04:00
Martin Konecny 18dd0f232a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:54:44 -04:00
Martin Konecny 0bdfe3986c CC-4348: Prepared statements - part 4 
-fixed some incorrect usage of PDO.
 2012-09-04 14:54:34 -04:00
Rudi Grinberg ed7d233ca2 Changed execute( array(...) ) to multiple bindParam calls. 2012-09-04 14:45:16 -04:00
Rudi Grinberg c840de0a71 Fix to the fix 2012-09-04 14:05:26 -04:00
Rudi Grinberg 330828fbdd Refactored sql substition into pdo 2012-09-04 13:52:33 -04:00
Rudi Grinberg 27ea00f5d4 Refactored sql substition into pdo 2012-09-04 13:50:13 -04:00
Martin Konecny a731fc147b CC-4348: Prepared statements - part 4 
-fixed Show.php
 2012-09-04 13:34:05 -04:00
denise 8e40137b7d CC-4316: Missing image file 
-fixed
 2012-09-04 11:58:54 -04:00
denise 15f750eca5 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist 
-included webstreams in the allowance type list in the error message
 2012-09-04 11:29:23 -04:00
denise 0755933ccd CC-4279: Library: Searching by criteria "Uploaded from" does not work 
-fixed
 2012-09-04 10:03:24 -04:00
Martin Konecny 886888a958 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 17:21:48 -04:00
Rudi Grinberg 3eac8c8531 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 13:34:39 -04:00
Rudi Grinberg d7aad93e4f cc-4288. Added owner to query. 2012-08-31 13:34:21 -04:00
Rudi Grinberg 2e8ed352b8 cc-4288:Sexification of =>. 2012-08-31 13:33:55 -04:00
Rudi Grinberg 59f527c14c cc-4288: added owner column. 2012-08-31 13:31:14 -04:00
Martin Konecny cad0a8fbd7 CC-1665: Scheduled stream rebroadcasting and recording 
-make sure webstream length is properly updated in browser view after editing
 2012-08-31 13:01:22 -04:00
Martin Konecny 0ceb0167fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 12:18:48 -04:00
Martin Konecny c043053407 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-fixed
 2012-08-31 12:18:37 -04:00
Martin Konecny 79b6d13c16 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-set DbEnds to 1 second in the past when cancelling stream
 2012-08-30 17:53:28 -04:00
Rudi Grinberg 3571e2c691 cc-1710: switched bwf to wav 2012-08-30 16:50:10 -04:00
Rudi Grinberg 3911662cff Remove unused function 2012-08-30 16:30:49 -04:00
Rudi Grinberg a0a4094332 cc-4304: Small refactoring 2012-08-30 16:00:14 -04:00
Rudi Grinberg 417997e617 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 15:23:24 -04:00
Rudi Grinberg a11ec08154 cc-4304: Implemented default behaviour to cascade delete all the files 2012-08-30 15:23:12 -04:00
Martin Konecny 010ba63d59 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 14:37:08 -04:00
Martin Konecny 7eefbf3e24 CC-4311: On Air button gets greyed out few seconds after show starts 
-additional debug info
 2012-08-30 14:36:55 -04:00
Martin Konecny 1884bebf15 CC-4281: Webstream: Nothing appears in the timeline if dr... 
-fixed
 2012-08-30 14:36:23 -04:00
Rudi Grinberg ea2595d70f Documeneted funny quirk related to creating a password 2012-08-30 12:26:36 -04:00
Rudi Grinberg 6a6f6c2ee7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 11:48:02 -04:00
Rudi Grinberg c09ebce1f0 cc-1710: Removed verbosity 2012-08-30 11:43:11 -04:00
Rudi Grinberg bed9989d2a cc-1710: Added more supported extensions to the allowed upload list 2012-08-30 11:40:05 -04:00
Rudi Grinberg 2b8bd2ffe9 cc-1710 removed ^M 2012-08-30 11:37:22 -04:00
Martin Konecny cd49f99f4b CC-3412: Icecast stream name not defined 
-ensure upgrade
 2012-08-30 11:29:23 -04:00
Martin Konecny 89d8ac701b CC-3301: Add ability to switch stereo/mono stream in stream settings 
-refactor code and use Propel
 2012-08-29 17:51:47 -04:00
Martin Konecny 7f8b5ab92e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 17:40:07 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
denise 6067cc221f CC-4279: Library: Searching by criteria "Uploaded from" does not work 
-fixed
 2012-08-29 17:37:02 -04:00
denise a7427645d5 CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception 
-fixed
 2012-08-29 17:01:55 -04:00
denise 3ff80fae14 CC-4314: Library: Add playlist to playlist shows wrong error message 
-fixed
 2012-08-29 16:47:20 -04:00
denise b75f2ab9c7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 16:13:30 -04:00
denise 80258f1fb7 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-fixed for dragging tracks into deleted blocks
 2012-08-29 16:13:18 -04:00
denise 7c79aad5f4 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-removed unnecessary exception catch
 2012-08-29 16:04:40 -04:00
denise fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up 
-fixed
 2012-08-29 16:00:58 -04:00
Rudi Grinberg f483e271f6 formatting 2012-08-29 14:50:10 -04:00
Rudi Grinberg af3cea464b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 12:58:06 -04:00
Rudi Grinberg 5e180f0ce2 sexified code 2012-08-29 12:57:56 -04:00
Rudi Grinberg ca66073fb5 did some reformatting. 2012-08-29 12:31:59 -04:00
denise 46a6a5fc30 CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' 
-added in saving behaviour for regular playlists
 2012-08-29 12:05:41 -04:00
Rudi Grinberg e796d4c03d MM2: equal signs sexified 2012-08-29 11:39:42 -04:00
denise 5effb253bf CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save' 
-done
 2012-08-29 11:38:47 -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 f188cfbba2 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-small fix
 2012-08-29 10:56:47 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4 
-controllers dir
 2012-08-29 10:54:36 -04:00
Martin Konecny b2327472e8 CC-4090: Make code style PSR compliant - part 4 
-forms directory
 2012-08-28 23:04:55 -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
Rudi Grinberg c67ad44699 Merge branch 'cc-4274' into devel 2012-08-28 17:25:11 -04:00
Rudi Grinberg 6487072a4e cc-4274: added stub 2012-08-28 17:24:55 -04:00
Martin Konecny 481616a0d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 17:22:57 -04:00
Martin Konecny a0ad9a91ea CC-1665: Scheduled stream rebroadcasting and recording 
-Better error logging
-convert minutes > 59 into hours
 2012-08-28 17:22:48 -04:00
Martin Konecny b7107fb948 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed uninitialized variable
 2012-08-28 17:03:20 -04:00
Rudi Grinberg 5b5ac3e38f cc-4274: Added scaffolding to implement this feature. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 05908d121f cc-4274: Fixed bad table name. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 33bb4e600c cc-4274: implemented james' hack to fix this issue. 2012-08-28 16:23:16 -04:00
denise 7ee68c55e0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 16:17:46 -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
Martin Konecny 8cf048d459 CC-1665: Scheduled stream rebroadcasting and recording 
-parse m3u playlists to get actual stream
 2012-08-28 13:14:13 -04:00
Martin Konecny 8249ea8816 CC-1665: Scheduled stream rebroadcasting and recording 
-small optimization for user auth
 2012-08-28 12:38:13 -04:00
Martin Konecny 219fba9bee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 12:30:45 -04:00
Martin Konecny fc67d7f08d CC-1665: Scheduled stream rebroadcasting and recording 
-allow user more flexibility for entering length interval (require hours OR minutes)
 2012-08-28 12:30:33 -04:00
denise 69b61c4cfe CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified 
-fixed
 2012-08-28 12:13:58 -04:00
denise f84f611ab2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 11:22:49 -04:00
denise 98ab38ff54 CC-4295: Smart Block: Please deal with the float value when criteria likes 'length is' 
-fixed
 2012-08-28 11:22:41 -04:00
Rudi Grinberg 7f66bdbb66 cc-4301: Fixed bug where owner_id would be null whenever show is recorded. 2012-08-27 17:58:09 -04:00
Rudi Grinberg 583d3837be cc-3936: formattingk 2012-08-27 17:15:38 -04:00
Rudi Grinberg 57020b6e3b cc-3936: Added warning whenever files that don't exist in db are requested to be deleted. 2012-08-27 16:50:22 -04:00
Rudi Grinberg 3f0df6d101 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-27 16:50:03 -04:00
Rudi Grinberg c28025ecfb hotfix for bad class name 2012-08-27 16:49:45 -04:00
denise 3823a566ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-27 16:46:25 -04:00
denise 7c5765ccb9 CC-4298: Smart Block: Sometimes criteria value text box doesn't resize properly 
-fixed
 2012-08-27 16:46:05 -04:00
Rudi Grinberg 8d7f3817ec cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names. 2012-08-27 15:11:28 -04:00
Rudi Grinberg 7aba1dcebd Added warning method. Changed some code to use it. 2012-08-27 14:51:35 -04:00
Rudi Grinberg 1a13731216 Merge branch 'cc-3936-3' into devel 2012-08-27 14:46:31 -04:00
Rudi Grinberg cab7a6c930 cc-3936: added comment documenting metadata translation 2012-08-27 14:07:05 -04:00
Rudi Grinberg dea764b8fd cc-3936: added warning for metadata attributes that are not defined in constants.php 2012-08-27 14:03:22 -04:00
denise 0edfb10f19 Smart Blocks: extra criteria field was undefined sometimes 2012-08-27 12:43:46 -04:00
denise d4dbca5de3 CC-4296: Media Library: Dragging Smart Block gives wrong item number 
-fixed
 2012-08-27 12:33:57 -04:00
denise b92ff1de89 CC-4290: Playlists -> Dynamic Smart Block-> "in the range" criteria seems to be not working 
-fixed
 2012-08-27 12:04:04 -04:00
Rudi Grinberg 687a6d3c5a cc-3936: removed intrusive logging 2012-08-27 11:49:36 -04:00
Rudi Grinberg fcc853b732 cc-3936: Renamed metadata key for owner id. 2012-08-27 11:06:06 -04:00
Martin Konecny 3fb0fbd73f CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls 
-fixed
 2012-08-24 19:25:19 -04:00
denise 53418e475d CC-4286: Library: Alert pops up when double clicking any item in Library when nothing is opened in right side 
-fixed
 2012-08-24 17:37:13 -04:00
James bc660c4cdf -removing type column from cc_playlist 2012-08-24 17:12:52 -04:00
James 4406d26c95 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 17:10:50 -04:00
James 2ca4a369b2 CC-4264: Smart Block: Fail to generate block with some unavailable files 
- fixed
 2012-08-24 17:02:37 -04:00
denise 01849c08bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 15:27:12 -04:00
denise 5443c1931a CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view 
-fixed
 2012-08-24 15:27:04 -04:00
James c561f36aa1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 15:26:27 -04:00
James baf5460e14 CC-4284: Calendar: AddContentToShow -> "Processing..." message pops up and never goes away 
- fixed
 2012-08-24 15:26:12 -04:00
denise 54db68bb26 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 12:40:39 -04:00
denise dc8e3da6db CC-4283: Password Reset: Please let user input username they want to reset 
-done
 2012-08-24 12:40:30 -04:00
Rudi Grinberg bc078b790d Merge branch 'cc-3936-2' into devel 2012-08-24 12:39:05 -04:00
Rudi Grinberg 7284770226 cc-3936: Changed setting of owner when modifying/inserting metadata. 2012-08-24 12:38:33 -04:00
Rudi Grinberg 5841cb7066 cc-3936: 
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
 2012-08-24 12:37:16 -04:00
Rudi Grinberg e53c20bbcd cc-3936: added method to make it easier to get users of a certain type. 2012-08-24 12:36:20 -04:00
denise ffa4c131ee CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-code refactor
 2012-08-24 11:50:02 -04:00
denise 2e505ee970 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-small code fix
 2012-08-24 11:47:32 -04:00
denise b8571be827 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
- small code fix
 2012-08-24 11:45:56 -04:00
denise 5f1c6453a5 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-fixed
-disabled shuffle button
 2012-08-24 11:44:18 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-24 11:12:31 -04:00
Rudi Grinberg 4efdf71aea cc-3936: Made phpName of foreign key conform to Fk prefix convention. 2012-08-24 11:10:05 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly 
-fixed
 2012-08-24 10:29:28 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg 60803e5146 cc-3936: 
Name of foreign key was given for easier access through propel. Also renamed phpName for ownerId
to fit the existing convention.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 50de229258 cc-3936: 
Refactored getUsers not to take multiple types of arguments.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg e2d9f220f8 cc-3936: 
Changed schema so that owner_id is not required for every file.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 36b344a910 cc-3936: remove unneeded garbage. 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcfa865f7d cc-3936: 
Ran propel-gen to commit schema changes.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 4f88543de2 cc-3936: 
Updated schema so that every file has an owner.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg f940c20701 cc-3936: 
Added success logging when identifier file has been written.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936: 
Sexified code. Added section for user handling.
 2012-08-24 10:20:58 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-add enablePropelLogging and disablePropelLogging functions
 2012-08-23 22:27:24 -04:00
Martin Konecny 7cbe037c7e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 21:58:39 -04:00
Martin Konecny 628bb6de1f CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-done
 2012-08-23 21:58:21 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise 17d030a3f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 17:41:20 -04:00
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping) 
-fixed
 2012-08-23 17:41:05 -04:00
Martin Konecny a9cf597f14 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 15:04:38 -04:00
Martin Konecny ea58ae9cc8 -remove unecessary logging 2012-08-23 15:03:59 -04:00
denise 9dfbd90e0f CC-4270: Media Library: Sample Rate is broken to 2 lines in context view 
-fixed
 2012-08-23 13:50:46 -04:00
denise 2f9ea4dc0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 11:53:56 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-23 11:53:44 -04:00
James a94039a0c6 CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more 
- fixed
 2012-08-23 11:32:37 -04:00
James a4c579f36e CC-4254: Library: advanced search on library 
- bug fix
 2012-08-23 10:59:34 -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
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
denise e987f7a0aa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:29:53 -04:00
denise f47e32d9de CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000 
-fixed
 2012-08-22 16:29:17 -04:00
Rudi Grinberg a3b6d0259c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:14 -04:00
Rudi Grinberg e7689e5355 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:03 -04:00
Martin Konecny b506c37341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:08:58 -04:00