Commit Graph

2576 Commits

Author SHA1 Message Date
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