7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -04:00
859445c766
CC-3301: Add ability to switch stereo/mono stream in stream settings
...
-fixed
2012-08-29 17:39:24 -04:00
6067cc221f
CC-4279: Library: Searching by criteria "Uploaded from" does not work
...
-fixed
2012-08-29 17:37:02 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
4848717d4d
CC-4090: Make code style PSR compliant - part 4
...
-models dir
2012-08-29 10:58:03 -04:00
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
3d20ded170
CC-4307: Add "Never show again" to the pop-up registration prompt
...
-done
2012-08-28 17:30:34 -04:00
c67ad44699
Merge branch 'cc-4274' into devel
2012-08-28 17:25:11 -04:00
6487072a4e
cc-4274: added stub
2012-08-28 17:24:55 -04:00
481616a0d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 17:22:57 -04:00
a0ad9a91ea
CC-1665: Scheduled stream rebroadcasting and recording
...
-Better error logging
-convert minutes > 59 into hours
2012-08-28 17:22:48 -04:00
b7107fb948
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed uninitialized variable
2012-08-28 17:03:20 -04:00
5b5ac3e38f
cc-4274: Added scaffolding to implement this feature.
2012-08-28 16:23:16 -04:00
05908d121f
cc-4274: Fixed bad table name.
2012-08-28 16:23:16 -04:00
33bb4e600c
cc-4274: implemented james' hack to fix this issue.
2012-08-28 16:23:16 -04:00
7ee68c55e0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 16:17:46 -04:00
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
8cf048d459
CC-1665: Scheduled stream rebroadcasting and recording
...
-parse m3u playlists to get actual stream
2012-08-28 13:14:13 -04:00
219fba9bee
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 12:30:45 -04:00
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
f84f611ab2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 11:22:49 -04:00
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
7f66bdbb66
cc-4301: Fixed bug where owner_id would be null whenever show is recorded.
2012-08-27 17:58:09 -04:00
c28025ecfb
hotfix for bad class name
2012-08-27 16:49:45 -04:00
8d7f3817ec
cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names.
2012-08-27 15:11:28 -04:00
7aba1dcebd
Added warning method. Changed some code to use it.
2012-08-27 14:51:35 -04:00
1a13731216
Merge branch 'cc-3936-3' into devel
2012-08-27 14:46:31 -04:00
cab7a6c930
cc-3936: added comment documenting metadata translation
2012-08-27 14:07:05 -04:00
dea764b8fd
cc-3936: added warning for metadata attributes that are not defined in constants.php
2012-08-27 14:03:22 -04:00
0edfb10f19
Smart Blocks: extra criteria field was undefined sometimes
2012-08-27 12:43:46 -04:00
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
687a6d3c5a
cc-3936: removed intrusive logging
2012-08-27 11:49:36 -04:00
fcc853b732
cc-3936: Renamed metadata key for owner id.
2012-08-27 11:06:06 -04:00
3fb0fbd73f
CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls
...
-fixed
2012-08-24 19:25:19 -04:00
bc660c4cdf
-removing type column from cc_playlist
2012-08-24 17:12:52 -04:00
4406d26c95
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 17:10:50 -04:00
2ca4a369b2
CC-4264: Smart Block: Fail to generate block with some unavailable files
...
- fixed
2012-08-24 17:02:37 -04:00
5443c1931a
CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view
...
-fixed
2012-08-24 15:27:04 -04:00
54db68bb26
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 12:40:39 -04:00
dc8e3da6db
CC-4283: Password Reset: Please let user input username they want to reset
...
-done
2012-08-24 12:40:30 -04:00
bc078b790d
Merge branch 'cc-3936-2' into devel
2012-08-24 12:39:05 -04:00
7284770226
cc-3936: Changed setting of owner when modifying/inserting metadata.
2012-08-24 12:38:33 -04:00
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
e53c20bbcd
cc-3936: added method to make it easier to get users of a certain type.
2012-08-24 12:36:20 -04:00
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
4efdf71aea
cc-3936: Made phpName of foreign key conform to Fk prefix convention.
2012-08-24 11:10:05 -04:00
857be6b702
cc-3936: Removed manual path concatenation. Fixed setting owner of file.
2012-08-24 11:09:38 -04:00
1f7a6fdc63
CC-4262: Smart Block: Characters do not get escaped properly
...
-fixed
2012-08-24 10:29:28 -04:00
19a5a8f992
cc-3936: fixed wrong argument order bug.
2012-08-24 10:20:59 -04:00
4ad983f63c
cc-3936: applied schema changes
2012-08-24 10:20:59 -04:00
c83fad2546
cc-3936: added owner to every file insert
2012-08-24 10:20:59 -04:00
b0a61fc291
cc-3936: Added setting default owner_id for inserted files.
2012-08-24 10:20:59 -04:00
43ca0d21e6
cc-3936: removed unnecessary object creation
2012-08-24 10:20:59 -04:00
dcc9c58577
cc-3936: Sexified equal signs.
2012-08-24 10:20:59 -04:00
50de229258
cc-3936:
...
Refactored getUsers not to take multiple types of arguments.
2012-08-24 10:20:59 -04:00
996dcfd35f
cc-3936: Ran propgen to generate schema changes
2012-08-24 10:20:59 -04:00
dcfa865f7d
cc-3936:
...
Ran propel-gen to commit schema changes.
2012-08-24 10:20:58 -04:00
f940c20701
cc-3936:
...
Added success logging when identifier file has been written.
2012-08-24 10:20:58 -04:00
23e3f6137d
cc-3936:
...
Sexified code. Added section for user handling.
2012-08-24 10:20:58 -04:00
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
7cbe037c7e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 21:58:39 -04:00
d06fda0329
fix indentation
2012-08-23 21:43:55 -04:00
0a851f3c96
CC-4263: Calendar: Can create one show contains another show (overlapping)
...
-fixed
2012-08-23 17:41:05 -04:00
2f9ea4dc0b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 11:53:56 -04:00
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
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
de0aeee594
CC-4254: Library: advanced search on library
...
- initial commit
2012-08-23 10:41:40 -04:00
e987f7a0aa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:29:53 -04:00
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
a3b6d0259c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:09:14 -04:00
e7689e5355
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:09:03 -04:00
b506c37341
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:08:58 -04:00
d1e7341046
cc-3936: Refactored php code to upload files
2012-08-22 16:08:46 -04:00
6fec9b0301
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 16:02:02 -04:00
7e50a11195
CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
...
-fixed
2012-08-22 16:01:50 -04:00
fe1aa7a169
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed syntax error
2012-08-22 15:56:18 -04:00
8573dcb870
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 15:35:09 -04:00
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
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
ea4567f373
Make user functions work more consistently
...
isHost didn't work similar to isPM or isAdmin
2012-08-22 13:59:37 -04:00
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
462542bf68
change Logging::log to Logging::info
2012-08-21 18:41:56 -04:00
15eae0698b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 16:55:17 -04:00
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
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
316afaf2a1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 16:37:41 -04:00
ffbdba6f6b
CC-4260: Add-user: Undefined index: ftype
...
-fixed
2012-08-21 16:37:33 -04:00
64a36ea21a
cc-4240: fixed
2012-08-21 16:33:37 -04:00
2cdaa186e3
CC-4257: Smart Block: Admin cannot delete DJ user's block
...
-fixed
2012-08-21 15:42:44 -04:00
d06f02f1f5
CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
...
-fixed
2012-08-21 14:08:30 -04:00
167881c903
CC-4253: Smart Playlist: Please support filter tracks by date
...
-code refactor
2012-08-21 12:01:48 -04:00
d23bd2d85b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 11:58:46 -04:00
0c381d4692
CC-4253: Smart Playlist: Please support filter tracks by date
...
-fixed
2012-08-21 11:58:39 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
69f150ac7f
more detailed error message
2012-08-20 14:41:43 -04:00
2a1ea33362
CC-1665: Scheduled stream rebroadcasting and recording
...
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
2012-08-17 15:07:58 -04:00
1e1398739f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-16 18:17:54 -04:00
e57885c934
CC-4191: Password Reset: Reset link should be updated after default port is changed
...
-done
2012-08-16 18:17:43 -04:00
e511f7cd37
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed clicking save multiple times creates multiple smart playlists
2012-08-16 17:49:07 -04:00
0d21d9a9af
Smart Playlists: code cleanup
2012-08-16 15:40:36 -04:00
ae0d5d8598
CC-4238: Playlists: Fade in/out is in wrong format
...
-added comment
2012-08-16 14:45:51 -04:00
5e6a94edb9
CC-4238: Playlists: Fade in/out is in wrong format
...
-fixed
2012-08-16 14:37:10 -04:00
6b54440b7e
CC-4238: Playlists: Fade in/out is in wrong format
...
-fixed
2012-08-16 14:35:24 -04:00
1b7d174509
CC-4233: Smart Playlist: Cannot save the change of Fade in/out
...
-fixed
2012-08-16 12:33:25 -04:00
45a4c8d896
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 18:31:07 -04:00
4ee0c368ac
CC-1665: Scheduled stream rebroadcasting and recording
...
-pre buffer streams part 2
2012-08-15 17:03:14 -04:00
1e57c12ce7
CC-1665: Scheduled stream rebroadcasting and recording
...
-pre buffer streams part 1
2012-08-15 16:43:01 -04:00
ea621fd9dc
CC-4223: Smart playlists: BPM criteria should have numeric modifiers
...
-done
2012-08-15 16:40:04 -04:00
c58e2e7ff9
Revert "Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0""
...
This reverts commit 340e5deb51c11c2dd3445cc1483b21c533d5bdef.
2012-08-15 15:56:24 -04:00
a2dfcd6bc2
Revert "cc-4232: changed bit formatter to give empty string when bitrate is set to 0"
...
This reverts commit 4e25a5ff442258c13f366a4557ca22181cdfac02.
2012-08-15 15:56:24 -04:00
7fe45a5bbc
cc-4232: changed bit formatter to give empty string when bitrate is set to 0
2012-08-15 15:56:24 -04:00
ceba380127
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 15:13:15 -04:00
3947b6d033
CC-4113: Smart Playlist: Filename contains '\' cannot be searched
...
-fixed
2012-08-15 15:13:07 -04:00
d773dcd112
CC-1665: Scheduled stream rebroadcasting and recording
...
-send stream name back to Airtime: [("url","http://idobiradio.com/ "), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
7225345541
CC-4231: Library: Prevent audio preview popup for dynamic blocks
...
- done
2012-08-15 12:51:53 -04:00
9fc5411895
CC-4229: Smart Playlist: refactor code
...
- done
2012-08-15 11:36:41 -04:00
e98eda144a
cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files
2012-08-14 14:50:41 -04:00
7abe882455
cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor
2012-08-14 14:50:39 -04:00
c62d89d5da
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed indexing on UI
2012-08-14 10:02:36 -04:00
0a05db1230
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-14 09:26:59 -04:00
83085220e2
CC-4220: Smart Playlists: Change indexing of criteria elements
...
-changed Block model to reflect index changes
2012-08-14 09:26:49 -04:00
7a5d9a0f91
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't require 2 digits for minutes or hours
2012-08-13 15:26:32 -04:00
c3862d69e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-13 14:58:20 -04:00
b8ea08c065
CC-1665: Scheduled stream rebroadcasting and recording
...
-analyze stream mime type and report error as needed.
2012-08-13 12:59:26 -04:00
db3a9357f9
CC-4211: Smart Playlist: length of dynamic block wont be convert to hh:mm:ss if set limit as float number, such as 23.999
...
- fixed
2012-08-13 11:59:28 -04:00
19c90e6688
CC-4204: Dynamic Smart Playlist: Set limit to 500 minutes and click Save will froze the Browser
...
- fixed
2012-08-13 11:42:48 -04:00
1bd94a0757
CC-4212: Smart Playlist: The formats of 'Bit Rate' are not matched between Media Library and Criteria
...
- fixed
2012-08-13 11:32:06 -04:00
8055a9c80b
CC-4214: Smart Playlist -> Criteria about datetime: Please convert the searched value from local time to UTC
...
- fixed
2012-08-13 11:18:15 -04:00
09897064c6
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-08-13 10:59:21 -04:00
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
27025c8ca2
CC-1665: Scheduled stream rebroadcasting and recording
...
-relax domain validator so we can use names like "localhost"
2012-08-10 12:42:56 -04:00
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
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
4009ae741f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:39:45 -04:00
7acd4b362f
bug fix
...
- Length display was wrong
2012-08-10 12:39:33 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
037e78730b
CC-4203: Smart Playlist: Please support limit as 0.5 hour
...
-fixed
2012-08-09 18:27:46 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
4129900858
CC-1665: Scheduled stream rebroadcasting and recording
...
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -04:00
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
1367bde728
CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours
...
- fixed
2012-08-09 14:18:15 -04:00
ef0e800c92
CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
...
- fixed
2012-08-09 14:12:30 -04:00
685354e000
CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks
...
- fixed
2012-08-09 11:44:27 -04:00
ae5b6e58d7
CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
...
- fixed
2012-08-09 11:03:57 -04:00
8f3037c3e4
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove incorrect "no items" warning when a show only contained a webstream
2012-08-08 23:02:08 -04:00
fd1628f971
CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
...
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
61e38381af
CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit
...
- done
2012-08-08 11:46:48 -04:00
f33485f8ea
Merge branch '2.1.x' into devel
2012-08-08 00:09:13 -04:00
18ca6b22cb
CC-1665: Scheduled stream rebroadcasting and recording
...
-add placeholder icons for smart playlists/webstreams
2012-08-07 23:44:21 -04:00
db36870aec
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix creator id on another SQL query
2012-08-07 20:38:36 -04:00
8876b312fb
CC-4167: Create new playlist doesn't work
...
-fixed
2012-08-07 19:49:59 -04:00
47ae223a1c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix SQL error
2012-08-07 19:23:42 -04:00
97943a6af8
CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
...
-fixed
2012-08-07 16:17:24 -04:00
550c97a2dc
CC-4154L: Indicate whether a show has scheduled content on the calendar page
...
-done
2012-08-07 14:57:04 -04:00
2f8d0b77fa
CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items
...
- set the items limit to 500
2012-08-07 14:53:07 -04:00
e20289e5cf
Merge branch '2.1.x' into devel
2012-08-06 17:17:05 -04:00
975abbaf10
Remove unecessary information being sent from API
2012-08-06 17:16:43 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
f901e13a84
CC-1665: Scheduled stream rebroadcasting and recording
...
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
b23b9a0cbd
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
183937b8e9
CC-1665: Scheduled stream rebroadcasting and recording
...
-when editing string should hav 00h 00m format.
2012-08-03 16:18:45 -04:00
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
997b5c31c3
CC-84: Smart Playlists
...
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
6e71a6bb92
CC-84: Smart Playlists
...
- dynamic block length display
2012-08-02 11:17:10 -04:00
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
483ffdf6af
CC-84: Smart Playlists
...
- increased size of criteria column
- it was too smallf for some fields
2012-08-01 16:25:59 -04:00
e6a3877c1e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 14:52:29 -04:00
63b89043b6
CC-1665: Scheduled stream rebroadcasting and recording
...
on-air light works with streams now
2012-08-01 14:51:56 -04:00
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
9d51222dae
CC-84: Smart Playlists
...
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
1b0cd6b01b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 11:01:34 -04:00
b312b2bd45
CC-84: Smart Playlists
...
- fixed db query part for static smart playlist generate
2012-07-31 11:01:19 -04:00
b83be1a922
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 11:00:01 -04:00
527b43e8ba
CC-1665: Scheduled stream rebroadcasting and recording
...
-fix incorrectly named column
2012-07-31 10:13:41 -04:00
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
27017c7903
CC-84: Smart Playlists
...
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
b9739b022d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 17:55:39 -04:00
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -04:00
142aa214b3
CC-84: Smart Playlists
...
-dos2unix
2012-07-30 17:31:54 -04:00
d169f4aa31
CC-84: Smart Playlists
...
- improved validation to not allow multiple criteria fields
2012-07-30 17:03:01 -04:00
f91be9468f
CC-84: Smart Playlists
...
-UI cleanup
2012-07-30 16:42:37 -04:00
e04273c335
CC-84: Smart Playlists
...
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
c2aea7490f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 17:30:35 -04:00
55b8b08508
CC-84: Smart Playlists
...
-fixed how the modifier rows are parsed when saving to db
2012-07-27 17:30:21 -04:00
648b8ae296
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:47:26 -04:00
f0f9e8e215
CC-1665: Scheduled stream rebroadcasting and recording
...
-minor fixes
2012-07-27 14:47:15 -04:00
2083d04107
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:32:39 -04:00
d7cf50b2f4
CC-84: Smart Playlists
...
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
4e022c407d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 11:52:08 -04:00
5becd70ab1
CC-84: Smart Playlists
...
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
Martin Konecny
denise
denise
Rudi Grinberg
James