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

2624 Commits

Author SHA1 Message Date
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
Martin Konecny 442c156458 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed context menu for webstreams
 2012-08-22 16:08:51 -04:00
Rudi Grinberg d1e7341046 cc-3936: Refactored php code to upload files 2012-08-22 16:08:46 -04:00
denise 6fec9b0301 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:02:02 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values 
-fixed
 2012-08-22 16:01:50 -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 8573dcb870 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:35:09 -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
denise 9b3890ad19 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:22:13 -04:00
denise 0071caf94d CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before 
-fixed
 2012-08-22 15:22:01 -04:00
Rudi Grinberg 6a16cf0084 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 14:39:45 -04:00
Rudi Grinberg e9bc0074c0 cleaned up ApiController.php a little bit. 2012-08-22 14:38:48 -04:00
denise ef5427d0bc CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view 
-fixed
 2012-08-22 14:18:48 -04:00
Martin Konecny c8c257a330 CC-1665: Scheduled stream rebroadcasting and recording 
-change behaviour so that the webstream is not saved as soon as it it created.
 2012-08-22 14:04:01 -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 cef3ffb07b CC-4265: Keep track of how much memory each request is taking and log if over a threshold 
-fixed
 2012-08-22 14:01:44 -04:00
Martin Konecny ea4567f373 Make user functions work more consistently 
isHost didn't work similar to isPM or isAdmin
 2012-08-22 13:59:37 -04:00
denise 462e73d93b CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once 
-fixed
 2012-08-22 13:58:13 -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 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny 9b7413dafa CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
-forgot to check in these files
 2012-08-21 16:55:10 -04:00
Martin Konecny ecfc27431a CC-1665: Scheduled stream rebroadcasting and recording 
-verify user that is deleting has current permissions
 2012-08-21 16:54:41 -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
denise 316afaf2a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:37:41 -04:00