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
36b344a910
cc-3936: remove unneeded garbage.
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
628bb6de1f
CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
...
-done
2012-08-23 21:58:21 -04:00
d06fda0329
fix indentation
2012-08-23 21:43:55 -04:00
17d030a3f9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 17:41:20 -04:00
0a851f3c96
CC-4263: Calendar: Can create one show contains another show (overlapping)
...
-fixed
2012-08-23 17:41:05 -04:00
a9cf597f14
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-23 15:04:38 -04:00
ea58ae9cc8
-remove unecessary logging
2012-08-23 15:03:59 -04:00
9dfbd90e0f
CC-4270: Media Library: Sample Rate is broken to 2 lines in context view
...
-fixed
2012-08-23 13:50:46 -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
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
a4c579f36e
CC-4254: Library: advanced search on library
...
- bug fix
2012-08-23 10:59:34 -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
38173bd3a2
- small fix
2012-08-23 10:19:00 -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
442c156458
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed context menu for webstreams
2012-08-22 16:08:51 -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
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
9b3890ad19
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 15:22:13 -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
6a16cf0084
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-22 14:39:45 -04:00
e9bc0074c0
cleaned up ApiController.php a little bit.
2012-08-22 14:38:48 -04:00
ef5427d0bc
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-22 14:18:48 -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
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
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
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
ecfc27431a
CC-1665: Scheduled stream rebroadcasting and recording
...
-verify user that is deleting has current permissions
2012-08-21 16:54:41 -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
0ce4c1000b
replace tabs with spaces
...
-also remove \r characters
2012-08-21 11:16:07 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
d2eca0faaf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-21 10:50:33 -04:00
47852bce2a
indentation fixes
2012-08-21 10:50:24 -04:00
179aa3d739
CC-1665: Scheduled stream rebroadcasting and recording
...
-Show meaningful page after webstream is deleted
2012-08-21 10:50:18 -04:00
025656be1c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed generate success msg
2012-08-21 10:46:25 -04:00
4cd5dbb926
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed save button text
2012-08-21 10:42:10 -04:00
337e5fec8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 18:36:32 -04:00
3230f14231
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed delete button on right side of library screen not working
2012-08-20 18:35:10 -04:00
d517bf6e19
fix indentation and remove \r characters
2012-08-20 18:29:57 -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
398fbb04db
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't show delete button until a stream has been saved
2012-08-17 17:29:17 -04:00
284b028521
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 16:51:45 -04:00
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -04:00
76833344d6
CC-4250: Smart Playlists: Remove save button from form
...
-done
2012-08-17 16:24:11 -04:00
817fe13533
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
...
-fixed
2012-08-17 15:56:16 -04:00
99437147dc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 15:08:10 -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
36a080ac13
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 14:30:46 -04:00
3e879f390a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 12:56:52 -04:00
e2fe6d4284
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 12:56:45 -04:00
5b134d0055
cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController
2012-08-17 12:37: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
9930ffae35
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 16:00:59 -04:00
b17cd2b3c9
CC-4178: Smart Playlist: Cannot update the block's title
...
-fixed
2012-08-16 15:58:03 -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
4783bf121a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-15 16:23:15 -04:00
2d80131351
CC-4229: Smart Playlist: refactor code
...
- bug fixes
2012-08-15 16:22:56 -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
4d9a31b3c1
CC-4219: Smart Playlist: Cannot preview static block
...
-fixed
2012-08-15 12:10:56 -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
6981a5cb49
cc-4105: added truncation of BPM to prevent crashes
2012-08-14 14:50:40 -04:00
ba03447946
cc-4105: added handling for pyinotify events and create more logical events
2012-08-14 14:50:39 -04:00
688d22e995
cc-4105: fixed metadata formatting bug
2012-08-14 14:50:39 -04:00
6e9db647c1
cc-4105: Fixed metadata handling. Added more error reporting to rmq requests
2012-08-14 14:50:39 -04:00
5f1024bb7d
cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php
2012-08-14 14:50:39 -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
3422eb3cc0
cc-4105: added event packing to event objects
2012-08-14 14:50:39 -04:00
9964c826ab
cc-4105: Added problem dir moving. Also locale config from old media monitor
2012-08-14 14:50:37 -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
51e242ec7f
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove edit menu from show builder
2012-08-13 14:58:11 -04:00
fa87393ba9
CC-4216: Playlist: 'Close' button for fade in/out is out of the border when it's empty
...
-fixed
2012-08-13 14:53:21 -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
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
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
1e36d77857
CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range'
...
- changed BPM to string type
2012-08-13 11:51:25 -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
d84ad78984
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
-play icons are now white, not orange
2012-08-10 12:53:22 -04:00
41320d0e5d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
2012-08-10 12:52:36 -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
5e1d8eabb3
Smart Playlists: moved Save button from right side to left side
2012-08-10 12:34:45 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
bd966915ee
CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
...
-fixed
2012-08-10 11:56:01 -04:00
7d73f0996c
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-done
2012-08-10 10:54:13 -04:00
c774e3b9bd
Smart Playlists: got rid of horitzontal scrolling
2012-08-10 10:42:01 -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
8eea34dc39
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:27:53 -04:00
037e78730b
CC-4203: Smart Playlist: Please support limit as 0.5 hour
...
-fixed
2012-08-09 18:27:46 -04:00
5a63a284c8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:24:32 -04:00
10ea825536
CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
...
-fixed
2012-08-09 18:24:22 -04:00
200eec37f6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 18:15:03 -04:00
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
321e6c6524
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-09 17:55:08 -04:00
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
00a484d595
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:43:22 -04:00
23683ccccb
Smart Playlists: changed positioning of error message on click 'Save'
2012-08-09 17:43:12 -04:00
bc72a6743b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:42:32 -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
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -04:00
e674654cb1
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
...
-done
2012-08-09 17:23:52 -04:00
618813ebc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 16:59:33 -04:00
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
c73328e297
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -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
825abca61b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:44:43 -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
bad418062e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 11:21:01 -04:00
677d523ef4
CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view
...
-done
2012-08-09 11:20:49 -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
d959e4ff11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 10:47:59 -04:00
cf1178522a
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- changes made on phtml were cause some errors. fixed.
2012-08-09 10:47:43 -04:00
c69dac7ab6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 23:02:39 -04:00
d0d70db391
remove useless debugging
2012-08-08 23:02:16 -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
b2d3ee0aa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:35:44 -04:00
791989faf7
Smart Playlists: changed label 'block' to 'playlist' type
2012-08-08 15:35:28 -04:00
ab19d6f511
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:29:28 -04:00
d1e6f8178b
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
50f9582b95
CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines
...
-fixed
2012-08-08 13:24:53 -04:00
83917ed894
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed
2012-08-08 12:23:07 -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
333c8ec211
slightly improved PHP logging format
2012-08-08 00:08:46 -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
4ee232944d
CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given
...
-fixed
2012-08-07 16:27:18 -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
152a97917d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-07 15:20:32 -04:00
823ab1dd41
CC-4162: Smart Playlist Builder: extra space in between limit and error message
...
-fixed
2012-08-07 15:20:12 -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
d18acfdc75
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:17:52 -04:00
2a7c5eef64
CC-84: Smart Playlists
...
- added no-wrap class to qtip
2012-08-02 17:17:44 -04:00
82970c6e73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 17:04:49 -04:00
af939469d3
CC-84: Smart Playlists
...
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -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
ddd6016b28
CC-84: Smart Playlists
...
- qtip cleanup
2012-08-01 16:36:12 -04:00
bf0dcc9035
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 16:26:14 -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
2ef4fd314c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:37:58 -04:00
b9bb87f69d
CC-1665: Scheduled stream rebroadcasting and recording
...
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
bcab41cb86
- 'New User' button text was wrapping onto two lines
2012-08-01 15:30:35 -04:00
40ebeb7fb4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:00:54 -04:00
13bb036bad
CC-84: Smart Playlists
...
-on criteria qtip limit was displaying more than once
-fixed
2012-08-01 15:00:41 -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
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
0f681d7c25
CC-84: Smart Playlists
...
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
8f063367cc
CC-84: Smart Playlists
...
- qtip cleanup for dynamic playlists
2012-08-01 13:49:16 -04:00
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
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
cbbdd5a1fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 10:05:50 -04:00
1b1b7e11d0
CC-84: Smart Playlists
...
-fixed spacing of modifier '+' button
2012-07-31 10:05:38 -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
ebed110429
CC-1665: Scheduled stream rebroadcasting and recording
...
-code cleanup
2012-07-26 17:51:47 -04:00
7cde4ba2ba
CC-84: Smart Playlists
...
- merging code
2012-07-26 16:16:07 -04:00
8755500d30
CC-84: Smart Playlists
...
- some minor fix
2012-07-26 15:30:49 -04:00
8f2339f109
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
airtime_mvc/build/schema.xml
airtime_mvc/build/sql/schema.sql
2012-07-26 14:54:47 -04:00
a51b04e422
CC-84: Smart Playlists
...
- db schema change for type column on playlistcontents
2012-07-26 14:49:42 -04:00
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
ccdc06786d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove some hardcoded webstream values
-fix some broken problems from devel
2012-07-26 14:49:32 -04:00
fbc5b72f14
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
c90495d2d3
CC-1665: Scheduled stream rebroadcasting and recording
...
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
b283b5b55e
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove unused function
2012-07-26 14:49:32 -04:00
be8262b67c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed web stream length not showing up correctly
2012-07-26 14:49:32 -04:00
8b2facaa96
CC-1665: Scheduled stream rebroadcasting and recording
...
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
ed54e882a3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 14:41:22 -04:00
3f41835e12
re-add getCurrentShowAction
2012-07-26 14:36:21 -04:00
a828c46d32
CC-84: Smart Playlists
...
- changed name of 'block' to 'smart playlist' on UI only
2012-07-26 13:16:29 -04:00
3df0f2d26e
CC-84: Smart Playlists
...
- added 'add' option to smart playlist context menu
2012-07-26 12:45:31 -04:00
40bd33df11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 10:49:38 -04:00
9bd823ee2c
CC-84: Smart Playlists
...
- fixed the issue where block length wasn't updated on spl section
2012-07-26 10:49:23 -04:00
077cc735d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-25 18:42:59 -04:00
275efb254a
fix improperly renamed functions
2012-07-25 18:42:46 -04:00
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
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
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
c79110644d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-24 12:14:02 -04:00
754187a2b7
CC-84: Smart Playlists
...
- remove subform and combined back into one form
2012-07-24 12:13:51 -04:00
c82ea30809
CC-84: Smart Playlists
...
- removed criteria subform and reverted back to original criteria options design
2012-07-24 12:12:47 -04:00
64185dac95
CC-84: Smart Playlists
...
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
32f431c584
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2012-07-23 11:03:29 -04:00
952a584f10
CC-84: Smart Playlists
...
- form cleanup
2012-07-23 10:45:17 -04:00
30b64f81fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-23 10:41:09 -04:00
c99e1b892c
CC-84: Smart Playlists
...
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
255866d240
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
aaa0c01e01
CC-4120: memory optimizations for calendar page.
...
-can now fetch over a year of data at a time
2012-07-22 19:14:29 -04:00
ef64ce2b73
CC-4112: Smart Playlist: Cannot search Long string
...
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
2012-07-20 15:32:46 -04:00
9bdb4a40e0
CC-84: Smart Playlists
...
-fixed playlist type spacing on UI
2012-07-20 12:32:18 -04:00
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
d801139a12
CC-84: Smart Playlists
...
- utime and mtime in library were displaying in UTC
2012-07-19 19:11:42 -04:00
14712d4d78
CC-84: Smart Playlists
...
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
624986e973
- removed unnecessary logging line
2012-07-19 18:11:31 -04:00
8e60aec601
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 18:07:55 -04:00
647de9ed39
CC-84: Smart Playlists
...
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
2e7cf68777
CC-4110: Smart Playlist: some search criteria don't work
...
- added bunch of validation
- fixed a bug with range modifier not working correctly
2012-07-19 16:57:24 -04:00
9fcc851523
CC-84: Smart Playlists
...
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
0322e6b0c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 14:45:34 -04:00
82f087c84d
CC-84: Smart Playlists
...
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
1f603bb75b
cc-4105 : merge devel into my branch
2012-07-19 10:51:04 -04:00
6fc41ee4bf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-18 16:12:20 -04:00
266d86d9e4
CC-84: Smart Playlists
...
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -04:00
2d8a9188eb
CC-84: Smart Playlists
...
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
9516771099
Merge branch 'cc-84-smart-playlist' into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Scheduler.php
2012-07-18 12:23:57 -04:00
7c5291fe0c
CC-84: Smart Playlists
...
- ui cleanup
2012-07-18 11:55:29 -04:00
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
c23023bcd9
Removed irrelevant comment
2012-07-17 16:43:04 -04:00
25d3028fb1
cc-4105: added testing support for api client and ApiController
2012-07-17 16:43:04 -04:00
531dfe2b5e
cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller
2012-07-17 16:43:04 -04:00
0ddc8497c3
cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well
2012-07-17 16:43:04 -04:00
f348652f0e
cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side
2012-07-17 16:43:04 -04:00
fdf921bbaf
cc-4105: Made reloadMetadataGroupAction safer by validating input
2012-07-17 16:43:04 -04:00
01448d42df
cc-4105: added some comments to describe development
2012-07-17 16:43:04 -04:00
b0f5b722db
cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction
2012-07-17 16:43:04 -04:00
98b4e3c47b
cc-4105: Tweaked php method to have more consistent return values
2012-07-17 16:43:04 -04:00
aa298453b7
cc-4105: removed useless comments
2012-07-17 16:43:04 -04:00
eb00b5cbb3
cc-4105: renamed controller action and method to correct name
2012-07-17 16:43:04 -04:00
0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
1bd07eeaca
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
eba4b688c4
User Patch: If a callback is not given, then just provide the raw JSON.
...
Submitted by Ross Masters <ross@rossmasters.com>
2012-07-17 14:47:13 -04:00
a8ca9accdb
CC-84: Smart Playlists
...
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
and vice versa
2012-07-17 14:40:52 -04:00
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -04:00
7c07bf146c
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-17 11:07:38 -04:00
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
1804531e84
removed comment
2012-07-16 17:19:11 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
a1c205edff
cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions
2012-07-16 16:43:48 -04:00
1c084a3101
moved misplaced docstring
2012-07-16 15:47:44 -04:00
d08b62dd39
cc-4105: removed dead code path
2012-07-16 15:25:45 -04:00
723e6356bc
Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2
2012-07-16 14:58:34 -04:00
a9f6bb3b5c
cc-4105: changed error handling from returning none to throwing exception
2012-07-16 14:58:23 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
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
312f35ae48
CC-430: Audio normalization (Replaygain Support)
...
-change default database value to null
2012-07-16 12:10:42 -04:00
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
3e24b71436
removed wrong comments
2012-07-16 10:31:00 -04:00
ce1a63f47d
CC-430: Audio normalization (Replaygain Support)
...
-small bug fixes
2012-07-15 22:55:52 -04:00
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -04:00
39760f8494
CC-4090: Make code style PSR compliant
2012-07-15 22:22:07 -04:00
632f039977
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:19:55 -04:00
b4f1cc13c0
CC-430: Audio normalization (Replaygain Support)
...
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
71dc7d99b4
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-15 22:17:36 -04:00
44d91f7798
cc-4105: clean up url construction in api client
2012-07-15 22:17:36 -04:00
0fd6c4adbf
fixed typo
2012-07-15 22:17:36 -04:00
9f1ec3c05c
created a new controller action for chunked requests from media monitor
2012-07-15 22:16:58 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
5661872034
checkAuth in init() function
2012-07-15 21:07:34 -04:00
8340079b95
cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method
2012-07-13 17:57:18 -04:00
47893865cc
cc-4105: clean up url construction in api client
2012-07-13 16:32:17 -04:00
601263b7a0
CC-84: Smart Playlists
...
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -04:00
46294c3f40
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
...
Conflicts:
airtime_mvc/application/forms/SmartPlaylistCriteria.php
2012-07-13 16:00:02 -04:00
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
b48fb49947
CC-84: Smart Playlists
...
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
3b708fae6a
fixed typo
2012-07-13 14:54:04 -04:00
a6d51bea8d
created a new controller action for chunked requests from media monitor
2012-07-13 14:51:43 -04:00
971b4cf7cf
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-13 14:32:31 -04:00
bf46605ea1
CC-84: Smart Playlists
...
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
fcc4c1f9af
CC-84: Smart Playlists
...
-fixed merge conflict
2012-07-13 14:26:17 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -04:00
d81253cccc
CC-84: Smart Playlists
...
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
64857410a6
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 15:28:11 -04:00
f0134ba3fa
CC-84: Smart Playlists
...
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
31bb07b4f0
CC-84: Smart Playlists
...
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
470fef80ba
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 12:05:51 -04:00
8f6d6058a2
CC-4100: Make number of shows displayed in widget customizable
...
-removed Logging message
2012-07-11 19:33:19 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
393495433f
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:17:22 -04:00
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
d52c079606
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:14:59 -04:00
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
4842f1a5a1
CC-84: Smart Playlists
...
-removed limit checkbox
2012-07-11 15:52:46 -04:00
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
fe75ba0e93
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 11:50:52 -04:00
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
646e028037
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 10:47:14 -04:00
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
a1ceb4bfa0
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
b7cd90bc28
CC-84: Smart Playlists
...
-created form and view script
2012-07-11 10:42:51 -04:00
7ce4934cdc
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
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
f174a2bcf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 17:09:46 -04:00
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
f072be5d0e
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 16:41:48 -04:00
6d98cca9c3
SAAS-270: Apache2 errors on SaaS
...
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
d90d83200e
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 15:12:27 -04:00
62b0fec595
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 15:11:59 -04:00
69bbc53b98
CC-4037: Remove SaaS specific code from Airtime codebase
...
-removed live chat popup
2012-07-10 15:09:28 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
dc2b4fed0a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-10 10:19:35 -04:00
00a2a19833
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-09 23:41:00 -04:00
e91c96b90e
CC-4090: Make code style PSR compliant
...
StreamSetting.php
2012-07-09 23:32:21 -04:00
6369c85ed1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-09 14:50:49 -04:00
c6c0a70152
CC-4075: Calendar -> Can create overlapping show by repeating show
...
-fixed
2012-07-09 14:50:35 -04:00
c279e008d0
Merge branch '2.1.x' into devel
2012-07-06 15:52:09 -04:00
63856ea918
CC-4079: Apache error: missing $startDt variable
...
- fixed
2012-07-06 15:40:16 -04:00
e4fb42cbd0
CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
...
-done
2012-07-06 15:26:51 -04:00
24349e64d8
CC-430: Audio normalization (Replaygain Support)
...
-some minor fixes for default value (should be 0 dB not 1dB)
2012-07-05 23:30:53 -04:00
5c1af49252
CC-430: Audio normalization (Replaygain Support)
...
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
ce698d4123
CC-430: Audio normalization (Replaygain Support)
...
-Added support on server side
2012-07-05 22:37:40 -04:00
9bc1c66fe3
CC-2747: If the file contains '\' in its meta title, airtime doesn't
...
detect duplicate
- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
2012-07-05 15:27:49 -04:00
1cbb0345b3
improved error message for overlapping shows
2012-07-05 11:33:03 -04:00
4441bf18b7
CC-4072: Improve the check overlapping shows function
...
-done
2012-07-05 11:24:49 -04:00
771974433b
CC-4071: Prevent shows from overlapping on drag and drop in calendar
...
-done
2012-07-05 11:01:48 -04:00
1fa3da5bd0
CC-4069: Edit Show -> cannot edit show
...
-fixed
2012-07-04 18:58:22 -04:00
cbf026412c
CC-4056: Add Show -> Prevent shows from overlapping
...
-done
2012-07-04 11:34:18 -04:00
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
46604fdf59
CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
...
-fixed
2012-06-29 16:59:03 -04:00
7ea106e0d3
CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
...
-fixed
2012-06-29 16:02:27 -04:00
6d823d01ab
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed
2012-06-29 12:49:59 -04:00
b425fbd894
CC-4045: Logging: add file name and line number on logging function
...
- done
2012-06-29 12:47:14 -04:00
001f0790f9
Merge branch '2.1.x' into devel
2012-06-29 12:26:45 -04:00
335dd1516b
Merge branch '2.1.x' into devel
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
0b069c2f54
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-29 10:56:55 -04:00
a8792a7b97
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
38cb439f53
CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
...
-fixed
2012-06-28 17:55:17 -04:00
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
d13ade977a
CC-4034: Files on Watched folder shouldn't be deleted physically.
...
- fixed
2012-06-28 13:28:45 -04:00
443537b2db
CC-4020: Apache error found: Undefined variable: switch_start
...
- fixed
2012-06-27 22:50:46 -04:00
8141dec3b5
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 15:13:03 -04:00
d5a5bdd310
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 14:57:47 -04:00
bdaa64d4d1
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
1300593e8b
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-27 13:03:22 -04:00
4015949d2a
CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId.
...
-done
2012-06-27 10:27:53 -04:00
a63b765621
CC-4011: System -> Media Folders: Changing page will stop removing a watched folder with lots of files (50,000)
...
-Changed doing 50,000 database calls to 1.
2012-06-25 23:40:07 -04:00
84f867a00f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-25 18:31:07 -04:00
b8c559db58
add time to our version so cache is never used in dev branch
2012-06-25 18:30:33 -04:00
8005049bdc
CC-3996: Undefined offset: 0 in StoredFile.php (Apache error)
...
-fixed
2012-06-25 12:22:34 -04:00
ffb7f2ff65
CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId.
...
-done
2012-06-22 18:01:00 -04:00
c669d3cb47
CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
...
without possibility to navigate back gracefully
- done
2012-06-20 18:02:46 -04:00
10fc5038c8
CC-3965: Clarify input/output stream settings by addding appropriate labels
...
- fixed
2012-06-20 17:39:52 -04:00
f029124447
Merge branch '2.1.x' into devel
2012-06-19 17:57:27 -04:00
9ac024fa72
CC-3993: Validate that reporting stats are correct on Airtime PRO instances
...
-done
-if no log data for the past 24 hours, update current record with current date, and delete old records
2012-06-19 16:59:59 -04:00
b742033647
- Add Media: fix to accept audio files with ID3 tags liquidsoap complains about
2012-06-18 12:24:13 -04:00
f3d0f06397
- Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x)
2012-06-18 12:00:54 -04:00
186b8ef1c2
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-15 16:48:51 -04:00
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
bb54a9041f
CC-3986: 'Add User' does not convert email address to lowercase
...
-done
2012-06-15 15:03:48 -04:00
87faf47c94
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-15 14:42:37 -04:00
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
81fb7699a4
CC-3985: Email field on User creation should be required.
...
- done
2012-06-14 16:11:14 -04:00
73a7a76078
Merge branch 'CC-3963' into 2.1.x
...
Conflicts:
airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
70bfe031ef
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
6b990f8712
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel
2012-06-14 13:45:14 -04:00
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
f433fd89fe
CC-3970: Password Reset: No UI error msg for no mail server founded
...
-done
2012-06-13 16:04:57 -04:00
b07b83f740
CC-3981: Record Show: Change streams settings during recording will
...
cause record fail
- added warning message
2012-06-13 14:44:38 -04:00
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
4077858c8e
CC-3927: Should automatically switch back to Master/Show stream if there
...
is a connection interruption
- chaning label and description text
2012-06-13 12:46:26 -04:00
f188eeada2
preparation for 2.1.1 release
2012-06-13 11:35:14 -04:00
9b31a6daac
Merge branch '2.1.x' into devel
2012-06-13 10:10:05 -04:00
02b6d04952
CC-3956: PHP script can enter inifinite loop
...
-small cleanup
2012-06-12 20:18:06 -04:00
d1c224321b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 18:51:31 -04:00
b858c34526
CC-3956: PHP script can enter inifinite loop
...
-fixed
2012-06-12 18:51:22 -04:00
776e35dfa9
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 17:49:52 -04:00
548a6ce16a
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- bug fix
2012-06-12 17:49:34 -04:00
f3b925daa2
CC-3412: Icecast stream name not defined
...
-done
2012-06-12 17:08:36 -04:00
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
55634ddd46
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
-tests return value and output
2012-06-12 15:41:10 -04:00
57397312f2
CC-3963: If DJ is scheduled to broadcast for show, then automatically
...
enable source when DJ connects.
- done
2012-06-12 15:38:03 -04:00
df518fb03f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 14:58:51 -04:00
b588b3b9a4
CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving
...
-set track_number as a required field on form
2012-06-12 14:40:18 -04:00
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
d8a1a17f19
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 18:08:47 -04:00
81c7eb7763
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-11 18:08:36 -04:00
2ebf149a65
CC-3949: On edit empty show, time_filled becomes null
...
fix method of checking null
2012-06-11 17:08:17 -04:00
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
06d90c53aa
CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
...
- fixed
2012-06-11 16:42:12 -04:00
6316c23b25
CC-3954: apache log errors part3
...
- bug fix
2012-06-11 16:10:51 -04:00
31000afbf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-11 15:52:58 -04:00
c78ba0faf6
CC-3954: apache log errors part3
...
- fixed
2012-06-11 15:52:39 -04:00
5b9add360c
CC-3718: Please enable user to input the mail server settings
...
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
16b6f09420
CC-3959: Make default username "source" for master and show inputs
...
-done (just added tooltip)
2012-06-11 14:55:26 -04:00
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
62eee61d4e
CC-3956: PHP script can enter inifinite loop
...
- fixed
2012-06-08 17:58:21 -04:00
0bae3f9038
CC-3949: On edit empty show, time_filled becomes null
...
- fixed
2012-06-08 16:18:27 -04:00
e661f400a4
CC-3950: apache log errors part2
...
- fixed
2012-06-08 15:31:45 -04:00
628f1518a7
CC-3906: PlaylistLibrary-> user can not delete track which has been already
...
played even after cancelling the show.
- fixed
2012-06-08 15:24:37 -04:00
1625cc6a25
CC-3948: Dashboard -> Source Info panel: Cannot turn off source if
...
source is disconnect.
- fixed
2012-06-08 15:14:30 -04:00
7d4851573f
CC-3951: Password Reset: You can still reset password even after system email for Password Reset disabled
...
-fixed
2012-06-08 13:09:14 -04:00
0416c05f9c
add reason why Propel connection failed
2012-06-08 12:06:54 -04:00
b586d69d09
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed
2012-06-08 11:39:04 -04:00
951bd3c9b5
CC-3933: Remove version number and date strings from login page footer, add robots.txt
...
-done
2012-06-08 10:51:10 -04:00
3b9f6f12de
CC-3834: System -> Stream Settings: click "save" will cause some errors in
...
zendphp.log
- removed logging
2012-06-08 10:33:06 -04:00
7228dc9eb0
CC-3869: Source Streams: Please give Guest and DJ user clear error message
...
when they try to shut off Scheduled Play stream
- fixed
2012-06-07 14:27:12 -04:00
fb48184629
CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past
...
- fixed
2012-06-07 12:25:21 -04:00
3c7f3d52e1
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- bug fix. In case of this error, we should maintain the original start time.
2012-06-07 12:14:22 -04:00
2bf6408d90
CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
...
- fixed
2012-06-06 18:23:27 -04:00
ec6ff4c9e6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:32:10 -04:00
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
d8a75cf5c6
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 17:06:54 -04:00
fda04295a6
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-06 17:06:46 -04:00
e35692e588
CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing
...
page after error message appears
- fixed
2012-06-06 16:28:41 -04:00
fb533bed07
CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station
...
on Sourcefabric.org' if it's checked then saved.
- fixed
2012-06-06 14:26:23 -04:00
bcf3f0014f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-06 14:19:15 -04:00
0ca45e343b
CC-3878: Recorded media file's track number is changed after restarting media-monitor
...
- fixed
2012-06-06 14:18:54 -04:00
532b2710f0
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-06 13:10:57 -04:00
f57d316b6c
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-changed support feedback message
-fixed whitespace in register-dialog.phtml
2012-06-06 11:10:29 -04:00
226ef262ba
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-retreived hours and minutes via preg_match()
2012-06-06 10:31:49 -04:00
68deba81d9
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-05 22:30:50 -04:00
d4b1fc711e
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-change to wording
2012-06-05 22:30:17 -04:00
b23e3d0a54
CC-3927: Should automatically switch back to Master/Show stream if there is a
...
connection interruption
- done
2012-06-05 16:41:41 -04:00
4bcf904f92
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-05 15:13:04 -04:00
8b71ed6078
CC-3850: Use qTip instead of custom tooltips
...
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
2012-06-05 14:49:31 -04:00
5966c7feda
fixed merge conflit
2012-06-05 14:47:11 -04:00
35be145043
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-05 14:41:19 -04:00
df3a74b501
CC-3850: Use qTip instead of custom tooltips
...
-removed description from icecast_vorbis_metadata element
2012-06-05 14:40:40 -04:00
51227b4cad
CC-3934: Master and Show stream override need to be disabled on airtime-demo
...
- done
2012-06-05 12:18:59 -04:00
74e9f70506
CC-3928: Use liquidsoap to test whether file is playable on upload.
...
-done
2012-06-05 11:24:40 -04:00
a3754be31a
CC-3850: Use qTip instead of custom tooltips
...
-done
2012-06-05 11:24:40 -04:00
e3bacba39b
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-done
2012-06-05 11:20:00 -04:00
990dea12a4
CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents.
...
-fixed
2012-06-05 11:20:00 -04:00
c1976162cb
CC-3793: "Star time" check will block updating shows when error found in colour settings
...
-fixed
2012-06-05 11:19:59 -04:00
19d5655779
CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
...
-fixed to only allow 24h or less
2012-06-05 11:19:59 -04:00
25ff2b3c3a
CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it
...
-added "Back to login screen" link
2012-06-05 11:19:59 -04:00
3566480999
CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
...
-fixed
2012-06-05 11:19:59 -04:00
b6446442ba
CC-3917: record_date field in recorded shows causing problem
...
-fixed
2012-06-04 11:43:41 -04:00
43f57c0f8b
CC-3902: Help -> Getting Started: Step 2 is optional now
...
-fixed
2012-06-03 22:55:49 -04:00
54d741972a
CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
...
-fixed
2012-06-03 22:51:23 -04:00
89c0583849
CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException
2012-06-03 22:39:42 -04:00
4fec2d3982
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 13:59:34 -04:00
81fb81af74
CC-3904: Help -> about: Year 2011 should be 2012
...
Fixed.
2012-05-30 13:59:06 -04:00
f23582612a
SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance
...
-fixed
2012-05-28 15:41:59 -04:00
396795e70e
CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window
2012-05-28 17:59:26 +02:00
561934c8ef
SAAS-244: Live chat box appears in stream-player and preview windows
...
-fixed
2012-05-25 16:23:33 -04:00
f35f561f67
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
- removed 'SAAS'
2012-05-25 10:49:40 -04:00
d91850b1ca
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 18:10:36 +02:00
8b4c876c5b
CC-3884 : UI constantly refreshes when filtered by a show in a timerange
2012-05-24 17:33:15 +02:00
6b8adff769
CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show
2012-05-24 15:08:54 +02:00
eb4207dd1d
CC-3863: Stats should not send version number with extra characters
...
-fixed
2012-05-23 17:25:16 -04:00
b28a700005
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 17:17:00 -04:00
a6dc2adb78
CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
...
you can't even login as admin user
- fixed
2012-05-23 17:14:59 -04:00
80998f2eac
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:19:06 -04:00
28a383e960
- fixed check for currentShow's end boundary to only be greater than current time
2012-05-23 16:18:59 -04:00
1edfb097da
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-23 16:17:37 -04:00
01439663d9
CC-3863: Stats should not send version number with extra characters
...
- fixed
2012-05-23 15:06:22 -04:00
a969599986
CC-3858: Record and Rebroadcast Creation Problem\
...
- fixed
2012-05-23 14:55:55 -04:00
4608f04140
remove useless logging
2012-05-23 00:43:05 -04:00
164c158c80
CC-3859: Playout History: Filter out songs that are not played out
...
- done
2012-05-22 17:39:27 -04:00
453b343284
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
- fixed setting end_time
2012-05-22 16:53:04 -04:00
b2f39ae66b
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-introduced small problem, now fixed
2012-05-22 16:33:18 -04:00
c7a551fe84
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 16:13:11 -04:00
6da923ace1
CC-3859: Playout History: Filter out songs that are not played out
...
- db change and upgrade.
2012-05-22 16:11:25 -04:00
6b44792c11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-22 12:22:11 -04:00
bbd694eb10
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-introduced small problem, now fixed
2012-05-22 12:22:03 -04:00
428b13f3d7
CC-3803 : Don't allow editing of a current Record show
2012-05-22 17:51:53 +02:00
95003c3571
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:45:42 +02:00
78fe946e57
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:40:08 +02:00
d47514c4db
CC-3845 : General UI cleanup
2012-05-21 18:28:19 +02:00
4fe80194b6
CC-3845 : General UI cleanup
2012-05-21 17:07:34 +02:00
f485b9b601
CC-3804: The title of the record show's media will be changed after Media Monitor restart
...
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
2012-05-21 02:23:34 -04:00
bbc101bde8
CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier)
...
-fixed
2012-05-20 23:30:03 -04:00
d0211aaca9
SAAS-208: airtime-system: create a option which can set the live stream connection setting
...
-done
2012-05-18 19:08:50 -04:00
42f75634fc
CC-3854: Crash on Adding Show
...
-fixed
2012-05-18 18:57:22 -04:00
f3840f6eac
CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00"
...
-refactored empty check on $time
2012-05-18 17:54:58 -04:00
d7eb9a9d95
SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
...
- changed "Airtime System Email" label on System->Preferences form
2012-05-18 14:50:42 -04:00
8710c00970
SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
...
-these options are hidden is instance is saas
2012-05-18 12:58:09 -04:00
bb084f5a85
CC-3845 : General UI cleanup
2012-05-18 16:11:22 +02:00
466e30895c
CC-3845 : General UI cleanup
2012-05-18 16:00:36 +02:00
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
5d3382a3d9
CC-3845 : General UI cleanup
...
changing eye icon to play for the preview option in a context menu.
2012-05-18 12:29:37 +02:00
8ad336858e
CC-3747: Metadata popup should also show the filepath of the track
...
- fixed 'File Path' from breaking into 2 lines in Chrome
2012-05-17 18:53:40 -04:00
8ed2efe770
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-17 18:27:06 -04:00
9967f5451c
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
6d75b4fc06
The fix for long connection strings in "Add Show" form caused the tooltips to
...
be displayed incorrectly (hidden). Reverted that change.
Fixed display of "Stream URL" in the stream settings.
2012-05-17 18:07:41 -04:00
869eb77ca4
CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place
...
Fixed both of these issues.
Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.
Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs". Now a scrollbar will appear if the
connection URL is too long.
Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.
Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.
Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
2012-05-17 17:33:50 -04:00
228f699943
CC-3609: Stream settings page layout works better now, the two panels
...
are now placed next to each other.
2012-05-17 15:06:14 -04:00
ccbe4f1998
CC-3420 : Custom UI for jplayer from CC-3395
...
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
821484d81a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:43:16 -04:00
e0c53afe0b
CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00"
...
-fixed
2012-05-15 15:43:06 -04:00
1921b26943
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:17:58 -04:00
1245d1e860
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed in a better way
2012-05-15 15:17:19 -04:00
61fd560daa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 15:11:04 -04:00
b96f0590b1
CC-3808: No tooltip for preview playlist
...
-done
2012-05-15 15:10:56 -04:00
6695e3e190
-fix javascript error in widgets
2012-05-15 14:35:01 -04:00
4b03a45d46
CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
...
-fixed
2012-05-15 14:20:53 -04:00
55b0715142
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 12:35:15 -04:00
025ef0ed27
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed
2012-05-15 12:35:02 -04:00
c4c988b98a
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
-now shows all keys, null or not, in the list
2012-05-15 11:54:11 -04:00
d2dc02cf9e
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 15:07:42 +02:00
07d029b8cc
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 14:56:31 +02:00
6a2bab66fa
CC-3825 : Deleting any recorded show cancels the current recording show
2012-05-15 13:02:24 +02:00
6add79268f
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
- system info from airtime-check-system now displays in "Show Me What I Am Sending"
2012-05-14 18:10:20 -04:00
12be26925e
-set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called
...
-this will keep all the cc_live_log data in tact if support-settings are saved
2012-05-14 15:38:04 -04:00
d2704c4d22
- check if variable exists before using if exlpode() was called
2012-05-14 15:24:53 -04:00
8ff30cf5a1
CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
...
-fixed
2012-05-14 11:58:07 -04:00
803c44611a
CC-3819 : Add View on Soundcloud context menu option on calendar page
2012-05-14 15:48:09 +02:00
f8900d4b05
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:13:08 +02:00
2be64a0067
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:08:56 +02:00
ff5aebfd6b
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:06:56 +02:00
cc71c61fce
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 13:01:44 +02:00
97ce006130
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 12:36:57 +02:00
eb182cf887
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
- added phone_home_stat testing parameter
- fixed problem if missing data in airtime_latest_version file
2012-05-11 17:27:14 -04:00
de372f967d
--removed function no longer in use
2012-05-11 16:09:36 -04:00
746e55de32
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled broadcasting
2012-05-11 16:09:36 -04:00
195d0d8311
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-calculated scheduled usage
2012-05-11 16:09:36 -04:00
624ba85212
- deleted old broken code from LiveLog.php
2012-05-11 16:09:36 -04:00
de3e5a6e3c
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-fixed inserts into cc_live_log
2012-05-11 16:09:36 -04:00
99738fad30
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-added cc_live_log inserts
2012-05-11 16:09:35 -04:00
e347819c77
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-created cc_live_log table
2012-05-11 16:06:28 -04:00
5620c2b85e
CC-3772: On upgrade, make sure values in cc_files year have correct format
...
removed to_date postgresql function, bad metadata will cause this to fail.
2012-05-10 17:01:22 +02:00
80861bc643
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
-better way to do this...
2012-05-09 01:18:58 -04:00
6c4bb1ef9e
-rename playlists.js to dashboard.js
2012-05-08 20:41:09 -04:00
0a03bba5b7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 15:08:47 -04:00
9a9add9732
SAAS-235: Metrics: "Trial End Date" should be sent to stat server (only for SaaS customers)
...
-done
2012-05-07 15:07:29 -04:00
1d245ed79d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:26:00 -04:00
c466b946a0
CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
...
-change read permissions on files right after they're uploaded
2012-05-07 13:12:20 -04:00
abd63e736a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 18:19:26 +02:00
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
bdf314b93a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
3a6a1d8691
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 12:02:15 -04:00
96fa5ac715
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-added soundclound_enabled check
2012-05-07 12:01:36 -04:00
6a93a479f8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 17:49:35 +02:00
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
678e573e7a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-done
2012-05-07 11:24:40 -04:00
b5db91f0f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 10:22:41 -04:00
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
1cc84c1c85
CC-3761 : Calendar->Update Show:Try to input wrong number of Colour, Browser hangs
2012-05-07 14:48:33 +02:00
41e7150462
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:29:02 +02:00
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
bd6686a243
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
fixed
2012-05-06 20:45:52 -04:00
77bffcd8e9
join function should be static
2012-05-06 20:30:49 -04:00
6135660d0f
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
2012-05-06 20:05:14 -04:00
4ad3286db2
CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u"
2012-05-06 15:34:41 -04:00
adee58bcbc
-better handling of timezones
2012-05-05 22:29:31 -04:00
1f214747b2
-catch all exceptions in Preference model and make header 503
2012-05-05 22:29:16 -04:00
5204da4502
-new logging class
...
-don't log errors to stdout
-log all errors to /var/log/airtime/zendphp.log
2012-05-05 22:28:52 -04:00
7c06e27e7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 15:58:14 -04:00
f50d7c3c03
SAAS-157:Automated metrics: gather info about soundcloud usage
...
-added soundcloud_enabled option
2012-05-04 15:58:07 -04:00
9092b7f725
CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
...
-fixed
2012-05-04 12:47:29 -04:00
22c5da1629
CC-3755: Found Exception in apache's error log
...
-Return error code so that python services automatically retry later.
2012-05-04 12:40:44 -04:00
b4cd429204
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:06:41 -04:00
65e771d189
CC-3756: Cannot download/preview tracks in Media Library
...
-Fixed
2012-05-04 12:02:42 -04:00
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
edaec54a5d
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
...
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
10704be503
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 16:14:03 -04:00
80898ec898
CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0
...
-fixed
2012-05-03 16:13:50 -04:00
13e147540d
SAAS-214: "--email" being inserted for "city" field in statistics
...
-fixed quote insertion if string is empty
2012-05-03 13:55:55 -04:00
81d7e0c80f
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed filepath join
2012-05-03 09:59:31 -04:00
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
8a2b9e7221
CC-3746: Calendar: Duration of 24hrs show is 00h 00m
...
- fixed
2012-05-01 17:05:18 -04:00
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
c9df8e8b15
CC-3722: Create loading indicator for AJAX call when calculating Show length
...
- done
2012-04-26 11:56:14 -04:00
cf4101cdcd
CC-3720: Switch order of streams in dashboard
...
- done
2012-04-26 11:22:57 -04:00
0fe4478bb5
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- added exception handling
2012-04-26 10:56:08 -04:00
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
28d27b8932
CC-3719: "Start time" check will block editing ON AIR show
...
- fixed
2012-04-25 18:01:37 -04:00
b5a65ae7e4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 17:22:05 -04:00
fe71487fa2
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- fixed
2012-04-25 17:21:25 -04:00
e12bd35ee2
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
-use str formatter for padding
2012-04-25 16:39:58 -04:00
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
b5bf5e9598
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:08:05 -04:00
06455c65e3
CC-3714: Create show with start time as 0xx:xx will freeze the browser
...
-fixed
2012-04-25 12:07:58 -04:00
a291f42112
CC-3716: cannot create show start before 10:00
...
-fixed
2012-04-25 12:02:06 -04:00
d2448b804f
CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show
2012-04-25 17:09:40 +02:00
9b4c3efe8e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 15:22:51 +02:00
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
eec14f9592
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 09:19:26 -04:00
bf96207849
CC-3714: Create show with start time as 0xx:xx will freeze the browser
...
-fixed
2012-04-25 09:19:15 -04:00
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +02:00
439ebb1128
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 12:50:21 +02:00
4cdfd33044
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 11:32:43 +02:00
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
172bbf9d7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-24 16:47:48 -04:00
dd72090c3f
CC-3711: Verify Propel hasn't broken anything with its different handling of boolean columns compared to Pear.
...
-fixed in ShowBuilder controller
2012-04-24 16:46:51 -04:00
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
5be12c0a93
CC-3695: Non-admin user cannot preview the contents
...
- guest doesn't have access to playlist builder, hence allowing DJ, PM and
admin to access the preview.
2012-04-24 15:57:43 -04:00
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
2cb17a3b08
CC-3660: Cannot click Airtime Manual link on override info popup
...
- replaced the popup with qtip
2012-04-24 11:26:22 -04:00
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
5e5ced6fe5
CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system)
...
-fixed
2012-04-22 14:28:02 -04:00
6e9b179afc
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
-fixed
2012-04-20 16:57:32 -04:00
2a9ea435f2
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 15:37:51 -04:00
85bc150159
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 14:46:23 -04:00
5aa2339a1d
CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace.
...
-Fixed
2012-04-20 13:11:28 -04:00
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
da8a5296b0
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
235997c616
CC-1927 Remove PEAR DB
...
* Removed the DEB package "php-db" from the full install script as it is
no longer needed.
* Missed one call to PEAR::isError()
2012-04-19 16:35:19 -04:00
9ec584e90c
CC-1927 Remove PEAR DB
...
Removed remaining references to $CC_DBC
2012-04-19 16:35:19 -04:00
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
c0da27b445
CC-1927: Remove Pear DB
...
Final touches on install/upgrade scripts, now they are working.
Still need to remove last traces of PEAR throughout the code.
2012-04-19 16:34:14 -04:00
95d69a3bbe
CC-1927: Remove PEAR DB
...
Fixed all install/upgrade scripts.
2012-04-19 16:34:14 -04:00
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
3849e944cf
CC-3682: System-> Stream - Tooltips on port ranges should be introduced
...
- fixed
2012-04-19 15:22:02 -04:00
92671f5723
CC-3681: the value range for the Master, Show Source posrts should be
...
corrected (shrinked)
- added validator that check if the value is between 1024 and 49151
2012-04-19 15:18:53 -04:00
92f2027fc4
-missing CC_CONFIG global..
2012-04-19 15:06:15 -04:00
1e111f176e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 15:03:28 -04:00
458aae33a1
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-Removed use of filemtime
-audiopreview is now in correct directory
2012-04-19 15:03:17 -04:00
ee7829d920
CC-3663: Cannot edit rebroadcast show
...
-fixed
2012-04-19 12:57:13 -04:00
32eb80bdeb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 12:56:31 -04:00
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
ad769b53d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 12:35:05 -04:00
64e8640795
CC-3668: Live stream player - volume control needs improved usability
...
-new layout done, mute/un-mute image blurry (need new one)
2012-04-19 12:34:51 -04:00
a7fc31012f
CC-3689: Remove Edit Show Instance ability
...
- done
2012-04-19 11:29:19 -04:00
8bd3a35789
CC-3683: Upgraded database not equivalent to fresh install database part 1
...
- fixed
2012-04-19 11:24:30 -04:00
bd8ce4b0a7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 19:02:53 -04:00
5bea867bec
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-fixed
2012-04-18 19:02:29 -04:00
de89db7c36
CC-3668: Live stream player - volume control needs improved usability
...
-in progress
2012-04-18 18:24:50 -04:00
8588857def
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed
2012-04-18 16:49:32 -04:00
7de74f2540
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 16:14:04 -04:00
79f3473dfe
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed for Now Playing
2012-04-18 16:13:52 -04:00
58f4727f17
CC-3666: Default Playlist fade in/out time is not zero.
...
- fixed
2012-04-18 16:06:23 -04:00
70a51f1aca
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 15:45:15 -04:00
dacdc4e432
CC-3672: Source switch stays connected if current show is cancelled
...
- fixed
2012-04-18 15:38:47 -04:00
d3d6b10528
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 14:03:47 -04:00
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
843299361a
Merge branch 'cc-3637-fix-external-source-dashboard-display' into devel
2012-04-18 12:32:21 -04:00
479e112317
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
7659ae6384
added missing bracket on <span>
2012-04-18 12:26:10 -04:00
000f7d549c
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- fixed a bug where variable name wasn't changed
2012-04-18 12:25:10 -04:00
53a85204da
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed (check for array length after explode())
2012-04-17 16:52:59 -04:00
64a7a13f79
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 16:25:57 -04:00
d258e39b2e
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage.
...
-Remove unecessary "continue;" statements
2012-04-17 16:25:10 -04:00
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
467fbc2c4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 19:00:57 +02:00
4732c0ad67
CC-733 : Broadcast Log
2012-04-17 18:59:17 +02:00
29e24d1847
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 12:24:05 -04:00
cdf92b016f
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-undone
2012-04-17 12:23:56 -04:00
102bcb1d46
CC-3416 : Create password reset form
2012-04-17 18:16:10 +02:00
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
4527da6cdf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:22:03 -04:00
1d91d1b11b
CC-3659: Override on Master/Show Source connection needs to have
...
better description about what the override field actually does.
- fixed description
- extra fix:
- using variable instead of hard coded text
- removed unnecessary code
2012-04-16 18:21:28 -04:00
27e5a6db5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:36:19 -04:00
e786514f27
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-fixed
2012-04-16 17:31:16 -04:00
da691dcfb7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:29:18 -04:00
c08800468f
CC-3658: DJ assigned to the Show can't switch/kick streams
...
- fixed
2012-04-16 17:29:02 -04:00
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
2f4861db26
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- added comment
2012-04-16 17:06:06 -04:00
d11fca8ac8
CC-3444: Ability to edit currently playing show (end time and permissions
...
- fixed
2012-04-16 16:48:04 -04:00
2e811dfef8
CC-3642: System->Streams->DJ URL changes are not reflected in Calendar
...
->LiveStream
- fixed
2012-04-16 15:23:37 -04:00
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
0ad9177dac
CC-3648: Airtime Station time is broken
...
- fixed
2012-04-16 10:19:34 -04:00
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
a6f44226b9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 17:18:52 -04:00
9cafc91785
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
...
play unavailable track leads to platform hanging
- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
2e4cab45b3
-Logging::log works with arrays
2012-04-13 16:50:54 -04:00
3ae8eb9105
CC-3622: When changing location of the stor directory, the "organize"
...
subfolder is not being created
- fixed
2012-04-13 15:09:59 -04:00
36ca2c29fc
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't marking the file as deleted
- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
fd700c225c
CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
...
be remover from server
- RecallByMd5() was checking against all cc_files entries which includes
deleted files
2012-04-12 17:37:14 -04:00
c706bc32fd
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- fixed
2012-04-12 17:23:26 -04:00
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
c6ad9462af
CC-3634: Media Folder: if file was deleted from file system, and the file
...
was scheduled in the future, it wasn't getting deleted from Airtime
- fixed a bug
2012-04-12 17:18:45 -04:00
62cd704d1c
--added comment
2012-04-12 17:12:43 -04:00
9d4a474521
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 17:07:27 -04:00
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
c2db20f004
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-cleanup
2012-04-12 15:10:40 -04:00
bfed474b7b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:41:18 -04:00
a2fedaa3f1
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 13:36:45 -04:00
83d78eb0dd
-check if exec function is available before using it
2012-04-12 13:36:36 -04:00
7276d3d895
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:34:48 -04:00
380094b4cc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:29:58 -04:00
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
0b1b7d0e9f
CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer
...
-play/pause removed
2012-04-12 12:25:35 -04:00
4ef18fb00f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:36 -04:00
c90a8006cc
CC-3622: When changing location of the stor directory, the "organize"
...
ubfolder is not being created.
- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
390f9b44fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:09 -04:00
0486d33e27
Merge branch 'CC-3174' into devel
2012-04-12 18:12:01 +02:00
b0948e8848
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:01:55 -04:00
adddd1085c
CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment
...
added a flag whether to check user permissions or not.
2012-04-12 18:00:38 +02:00
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
18391604b5
CC-3424: UI Design for new drop down menu
...
- html integration
2012-04-12 10:26:11 -04:00
3d156a0516
CC-3612: Stream->Preferences-> inappropriate error message is popped up
...
-fixed
2012-04-12 10:01:22 -04:00
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
0ec58f0bc3
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
f0be7cc995
- comments and removing logging
2012-04-11 16:06:10 -04:00
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
c510286614
CC-3596: Playlist->Library->Edit Metadata: Throw exception after
...
inputing string in "BPM"
- added digit validator
2012-04-11 14:09:51 -04:00
13502b4c08
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 12:27:54 -04:00
f82aef2a85
CC-3566: Preferences->"Fade In" is not respected when Show starts
...
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
4ff0962b60
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 11:22:07 -04:00
26d13e7184
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-11 11:01:22 -04:00
a09a31bc88
CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
...
-pypo side fixed
2012-04-10 23:13:52 -04:00
1017b4e449
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-10 17:37:15 -04:00
e4fc5fafb5
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-10 16:30:46 -04:00
148fdfb8f9
Merge branch 'CC-3603' into devel
2012-04-10 15:28:38 -04:00
428d04d77f
CC-3605 : Create 2.1 upgrades
2012-04-10 18:07:39 +02:00
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
1dcced18ac
CC-3605 : Create 2.1 upgrades
2012-04-10 14:45:48 +02:00
56ce2b0da5
- text change on live stream section on show form
2012-04-09 17:04:53 -04:00
32548de639
CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting
...
entire text and typing does not erase the highlighted text.
- removed all the masking
- meioMask is very outdated so it's removed from the project.
2012-04-09 16:35:39 -04:00
7fc575e750
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 15:51:37 -04:00
ee0a08be15
CC-3487: Improved restart warning message for stream settings page
...
-fixed
2012-04-09 15:51:17 -04:00
516f71c23e
CC-3487: Improved restart warning message for stream settings page
...
-fixed
2012-04-09 15:49:39 -04:00
5bc1fe84ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 12:43:46 -04:00
54ec6445c6
CC-3606: System->Media Folders-> system seems to search
...
-fixed. Need to check if directory actually exists.
2012-04-09 12:43:40 -04:00
b32e463350
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- fixed
2012-04-09 12:19:22 -04:00
6785a373a1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 10:50:51 -04:00
d035681f35
CC-3596: Playlist->Library->Edit Metadata: Throw exception after
...
inputing string in "BPM"
- added validator on the form
2012-04-09 10:50:32 -04:00
064490a2fd
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- temp commit
2012-04-09 10:37:44 -04:00
d562a26f4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-07 22:33:47 -04:00
548c4ffb8d
-change it so that user can access API actions if logged in.
2012-04-07 22:28:10 -04:00
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
ef6c496ba3
CC-3541: Missing show title from "Show Content" pop-up
...
-fixed
2012-04-05 15:49:58 -04:00
8050a1ce29
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-05 14:45:16 -04:00
35a89e0308
CC-3174 : timeline
2012-04-05 15:52:16 +02:00
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
cf2813a545
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:56:06 +02:00
35d2ded26b
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:47:35 +02:00
cde8e07c0b
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- fixed
2012-04-04 16:26:28 -04:00
ab7da1ce90
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -04:00
5da7d42290
CC-3548: Schedule: Separate repeate show template and single instance on
...
'When' section
- UI portion of the feature
2012-04-04 14:53:26 -04:00
3be1944fa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:29:44 -04:00
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
e5843dc54e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:09:39 -04:00
ebbaa02210
CC-3514: Playlist-> Metadata list of fields is not matching to that of
...
Playlist->Edit Metadata
- fixed
2012-04-03 18:09:03 -04:00
edcce7432d
CC-3409: System status page times out if monit is not running.
...
-Fixed
2012-04-03 17:38:59 -04:00
bcdd27863f
CC-3513: Playlist Builder->Download makes user be redirected to a blank page
...
- fixed
2012-04-03 16:30:54 -04:00
4cb64b0eb1
CC-3569: Update total track metric to only report tracks that exist
...
- fixed
2012-04-03 15:53:55 -04:00
eb8bdabe91
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- fixing user info display
2012-04-03 14:15:15 -04:00
012ecc4698
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 13:53:24 -04:00
44e3217f3a
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- fixed order of css insertion.
2012-04-03 13:53:08 -04:00
057ca55074
CC-3589 : Send cancel recording message to pypo
2012-04-03 18:43:13 +02:00
1da134f967
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:26:13 +02:00
711105aade
CC-3588 : Cancelling Empty Show gives "Invalid Request"
2012-04-03 18:26:04 +02:00
a49a3a1d2e
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- master panel UI integration
2012-04-03 11:58:48 -04:00
d2d45dcae6
CC-3587 : index problem in scheduling.
2012-04-03 17:56:50 +02:00
079862d2f2
CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"
2012-04-03 16:11:53 +02:00
5dfaa00c25
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-03 11:15:22 +02:00
d27470da99
Merge branch 'CC-3174' into devel
2012-04-03 10:58:39 +02:00
1519ada85c
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fix problem when constant isn't defined
2012-04-02 17:28:05 -04:00
709f38e4ed
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fixed
2012-04-02 17:28:05 -04:00
2e88801dad
CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next
...
-fixed
2012-04-02 17:28:05 -04:00
6c25423f4e
CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct
...
removing table tools.
replacing with something simpler that will preserve order on screen.
2012-04-02 19:03:11 +02:00
c5b761bff3
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:31:02 +02:00
eeb7273909
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:20:13 +02:00
ebf530a97c
CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears
2012-04-02 11:02:03 +02:00
2395415292
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-30 15:11:54 -04:00
286c240012
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- done
2012-03-30 15:11:24 -04:00
cfb5fbc0c9
CC-3518 : Airtime requires internet access to run
2012-03-30 17:37:21 +02:00
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
9e9ae11725
CC-3551 : Change Cue Out for currently deleted track
2012-03-30 12:24:55 +02:00
5b65b56b93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-29 16:57:49 -04:00
7325d51ada
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
1b8a967cc0
CC-3174 : timeline
...
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
0746115d2c
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-29 11:06:57 +02:00
4f5d7efaa1
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- done
2012-03-28 15:12:01 -04:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
1e9348f27f
CC-3509: "Add Files" button (make it look better)
2012-03-28 17:50:14 +02:00
8910d93c55
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-28 17:30:21 +02:00
aca6e995dd
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 17:29:34 +02:00
ac35ba5a93
CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
...
- fixed a bug when master and dj port are both empty, it was returnning error
2012-03-28 10:15:54 -04:00
fe21abf16d
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 16:14:02 +02:00
2bb9b03b19
CC-3507: Live Stream status: naming
...
- naming change on stream setting page
2012-03-28 09:55:04 -04:00
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
b70773489a
CC-3534 : Check Scheduling Edge Cases
...
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
b935c82b83
CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
...
- fixed
2012-03-27 17:14:34 -04:00
9dbe8a5e5e
CC-3463 : Usability improvements for timeline
2012-03-27 18:40:17 +02:00
c1bdc6ff0f
CC-3463 : Usability improvements for timeline
...
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
dfc6ae6273
CC-3463 : Usability improvements for timeline
...
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
2956009f42
CC-3451 : Ability to delete the currently playing clip
2012-03-27 14:11:36 +02:00
10e4ae781f
CC-3451 : Ability to delete the currently playing clip
2012-03-27 12:44:48 +02:00
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
a50b1ffe73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 17:59:53 -04:00
d7af91f306
CC-3520: Change default password of monit
...
-done
2012-03-26 17:59:44 -04:00
44e8e96cc8
CC-3507: Live Stream status: naming
...
- fixed
2012-03-26 17:29:09 -04:00
3308cbb7de
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 16:18:43 -04:00
ccfa954f0e
CC-3174: Show Content Builder
...
-fixed indentation
2012-03-26 15:43:29 -04:00
375be99fbd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 15:09:56 -04:00
e76f4baf18
CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
...
- done
2012-03-26 15:09:27 -04:00
1a4e6c563b
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
c301cd5256
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
275faa1881
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-26 19:08:52 +02:00
0525f182ef
CC-3516: Creating a show has a long execution time
...
-grey out add-show form while busy
2012-03-25 22:56:51 -04:00
3ab8c3d57b
Merge branch 'CC-3174' into devel
2012-03-23 16:42:40 +01:00
711d1f202a
CC-3463 : Usability of timeline
...
changing buttons to be jquery ui icons.
adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
1ccf63ab0b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-22 16:24:38 -04:00
f8d3a8c8bb
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- PHP side implementation
2012-03-22 16:23:59 -04:00
24260e8908
CC-3408: Live Stream: Check if the selected port is available to use
...
- done
2012-03-22 16:21:23 -04:00
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
b4e9f9699c
CC-3483: Live Stream: default fade in/out for live stream transition
...
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
4bb0421cf7
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -04:00
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
e76cffd8b0
CC-3463 : timeline usability
...
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
e194ff0dc8
CC-3469: Stream settings: Connection URLs are not generated correctly
...
- done
2012-03-19 16:08:23 -04:00
b7634098d3
CC-3471: Stream setting page looks much worse in Chrome than in Firefox
...
- fixed
2012-03-19 15:02:29 -04:00
8105c6571c
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
...
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
5a7a502d45
CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
...
-Done
2012-03-17 15:24:19 -04:00
9be6f1bd0e
CC-3464: Playout forward cache should be configurable
...
-Done
2012-03-17 14:53:15 -04:00
7914b30233
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
2012-03-16 18:03:35 -04:00
77e1c1c0cb
CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled.
...
-added check to make the code do nothing when a previous, current and next show id aren't specified.
2012-03-16 17:13:32 -04:00
8a34023336
CC-3465: Now playing should show tracks over shows for previous and next
...
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -04:00
5156f8067e
CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
...
able to control switches and able to kick out connection
- refactoring code
2012-03-15 20:52:22 -04:00
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
559acfd5a1
CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
...
able to control switches and able to kick out connection
- refactoring code
2012-03-15 14:33:59 -04:00
04c2c2f920
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-15 14:29:48 -04:00
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
2beadc9301
CC-3174 : showbuilder
2012-03-15 14:14:02 +01:00
fa1f03ed58
CC-3174 : showbuilder
...
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
ae646545c4
CC-3201 : file import more visible
2012-03-15 11:36:32 +01:00
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
2ee4b227fc
CC-3439: Live Stream: Only admin should be able to turn on/of switch and
...
able to see kick out button
- done
2012-03-14 14:43:11 -04:00
06e810c35d
CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch
...
status when it restarts
- missed one file from previous commit
2012-03-14 14:43:10 -04:00
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
e31ac81e74
CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
...
button with new stream source indicator
- Initial commit
2012-03-14 14:43:10 -04:00
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
efee025691
CC-3406: Live Stream: Switch off live sources on disconnection
...
- done
2012-03-14 14:43:10 -04:00
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
d4a387e113
- adding switch to liquidsoap
2012-03-14 14:41:00 -04:00
dfe87723f0
- bug fix in stream setting
...
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
1ebe3d1812
CC-3224: "On-the-fly" stream rebroadcasting
...
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
ca04a7a686
CC-3224: "On-the-fly" stream rebroadcasting
...
- Form in preference section
2012-03-14 14:41:00 -04:00
f399c7adab
CC-3426: apache log errors from plupload
...
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
a65ea6d058
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
2012-03-13 17:46:13 -04:00
927e5033c8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated detection of ogg or mp3 files
2012-03-13 14:12:14 -04:00
48c8607d17
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
-added brackets around other if condition
2012-03-13 11:34:43 -04:00
13e3197ebf
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
- added brackets to an statement
2012-03-13 11:31:24 -04:00
9e850838ca
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
2012-03-13 10:36:11 -04:00
1e4d34447a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-03-13 10:23:44 -04:00
cbaeda1d6b
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
- if the previous track is null the previous show is sent back as an example of the algorithm.
2012-03-13 10:21:01 -04:00
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
d713f830cd
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +01:00
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
denise
Rudi Grinberg
Martin Konecny
James
Vladimir
james
Paul Baranowski
Naomi Aro
root
Denise Rigato
James
Daniel