2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
f0e2d5d295
mass string change to _
2012-11-13 15:37:24 -05:00
925afcc64c
renamed links
2012-11-13 15:10:07 -05:00
33e4d6154d
CC-4693: Preferences: Bottom save button is not aligned
...
-fixed
2012-11-12 14:43:44 -05:00
a727f2bb1e
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-11-12 14:28:50 -05:00
c0e54c64cd
CC-4685: System -> User: Unique username error
...
-fixed
2012-11-12 12:29:07 -05:00
0a0cf70046
CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save
...
-fixed
2012-11-12 12:06:22 -05:00
ef8f8dfa75
CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
...
-fixed
2012-11-12 11:45:26 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
628e6bed37
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
...
- fixed
2012-11-08 17:26:55 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
bd482a0a75
CC-4583: Use AJAX calls instead of refreshing entire page
...
-fixed
2012-11-07 15:17:47 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
29c7e58643
CC-4679: Library: Deleting Webstream leaves the SAVE button
...
-fixed
2012-11-06 16:49:36 -05:00
f623445b0d
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-06 16:34:19 -05:00
bf4f5fd699
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-06 16:34:06 -05:00
504d9968f1
CC-4639:
...
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit
- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
c605c97268
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this option from context menu
2012-11-06 14:33:34 -05:00
a1a7396ec9
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -05:00
e262d48eec
CC-4675: Preferences: Error messages are hidden
...
-fixed
2012-11-06 12:17:45 -05:00
de89686d48
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added comments
2012-11-06 12:03:49 -05:00
2cbba60037
CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
...
-fixed
2012-11-06 11:54:24 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
8e69e50eea
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
...
Conflicts:
airtime_mvc/application/models/ListenerStat.php
2012-11-06 11:06:58 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
2e79e8421c
CC-4661: Listener Statistics
...
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
4218a7f30d
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:48:56 -05:00
080c3ec944
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:38:35 -05:00
90a93e9a6c
CC-4664: Playlist/Block preview: Tracks deleted from library still get played
...
-fixed
2012-11-05 13:58:11 -05:00
78e731f717
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-05 12:03:59 -05:00
8fda0ba610
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:03:46 -05:00
c051e0671d
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:00:37 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
a201d6f2da
CC-4666: Showbuilder page is dead
...
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
1c628bd831
renamed displayable to visible
2012-11-05 10:57:18 -05:00
acf954f637
changed hidden check to displayable check
2012-11-05 10:55:54 -05:00
6e89fdab30
changed file existence checks to displayable
2012-11-05 10:14:49 -05:00
b6341e44b3
removed pointless code duplication
2012-11-05 10:12:03 -05:00
34248921fc
refactored code to use displayable
2012-11-05 10:09:34 -05:00
aa9a6691f2
added a single test for checking if a file should be shown or not
2012-11-05 10:08:29 -05:00
311c88a8a2
added check for hidden in buildEntry
2012-11-05 09:54:00 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
00a4e45491
added check for hidden in buildEntry
2012-11-05 09:47:16 -05:00
800f8b9ded
added criteria to remmove hidden files in blocks
2012-11-05 09:40:58 -05:00
4522fa94b2
added clause to exclude hidden files from getShowListContent
2012-11-05 09:30:21 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9c4f2e3298
refactored addWatchedDir to use early return style
2012-11-03 01:16:57 -04:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -04:00
12009e95fc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:18:33 -04:00
9609a4e220
Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:16:54 -04:00
a93b588a09
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
2012-11-02 18:25:23 -04:00
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
106b18bf30
CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
...
-fixed
2012-11-02 17:49:32 -04:00
8b70136dd6
CC-4661: Listener Statistics
...
- db change commit
2012-11-02 17:44:06 -04:00
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
2854dd40e0
CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
...
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -04:00
7f27e5ff3f
- ListenerStat Model
2012-11-02 16:28:13 -04:00
2ae3c0ac03
Line wrapping
2012-11-02 16:06:12 -04:00
1111fd8163
align
2012-11-02 16:04:47 -04:00
ac9b47f5e2
made rescanWatchDirectoryAction more concise
2012-11-02 16:02:05 -04:00
5cb83909d8
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-02 16:00:09 -04:00
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
ba1f6ed054
CC-4374: Nowplayling page: Cannot remove tracks from recording show
...
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
715a21acb2
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-upgraded bootstrap-dropdown.js to v2.2.1
2012-11-02 11:59:36 -04:00
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -04:00
a937df30ad
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-02 10:48:16 -04:00
cc208da2fb
CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
...
-added labels
2012-11-02 10:48:08 -04:00
feb6c9d6f5
CC-4636: Exception happens when trying to remove user that have created some smart block
...
- doing delete cascade on cc_block on deleting users
2012-11-01 17:45:28 -04:00
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
d7a5ab4d94
CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
...
- fixed
2012-11-01 15:21:56 -04:00
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -04:00
226bdbf738
added todo
2012-10-31 17:41:50 -04:00
5b14c4fe88
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
...
-fixed
2012-10-31 17:19:27 -04:00
2507e0f8a4
CC-4655: DJ's can delete files that they do not own
...
-fixed
2012-10-31 16:51:29 -04:00
4cca80fe44
Added schema changes
2012-10-31 16:23:12 -04:00
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -04:00
dfd52eedf1
CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
...
-fixed
2012-10-31 15:24:50 -04:00
a3a2edc3f1
Added column for files that have been deleted by user
2012-10-31 14:53:36 -04:00
cc40dfdf4e
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-added comment
2012-10-31 14:16:16 -04:00
71be2b2bd1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-31 12:36:56 -04:00
fd0e1c3c95
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-fixed
2012-10-31 12:36:45 -04:00
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -04:00
9293a26738
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
...
tracks meet the time limit
- code optimazation
2012-10-31 12:05:17 -04:00
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
cbee9422ec
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:58:16 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
9b77007e03
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:19:51 -04:00
8c90c1a12f
CC-4645: Add support for x-scpls playlist types
...
-fixed
2012-10-30 17:19:40 -04:00
00947f9d7e
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-small fix
2012-10-30 15:34:38 -04:00
5f03a38262
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 15:04:08 -04:00
cabe583a3b
CC-4649: Library -> Disable simple search if advanced search fields are open
...
-done
2012-10-30 15:01:46 -04:00
ef68680868
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 13:23:23 -04:00
3e60ac4393
remove \r line endings
2012-10-30 13:23:09 -04:00
acc3ccca22
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 13:03:05 -04:00
b8039e315a
CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length
...
-done
2012-10-30 13:02:55 -04:00
bba7975882
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 12:36:59 -04:00
5061dfa05d
CC-4647: apache error log entries
...
- fixed
2012-10-30 12:36:50 -04:00
71291b14f0
CC-4646: Library: Make advanced search options hidden by default
...
-done
2012-10-30 11:59:52 -04:00
695c0fa926
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-10-30 11:45:53 -04:00
51de436fd5
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 11:18:18 -04:00
b08f5091b5
CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
...
-done
2012-10-30 11:18:11 -04:00
7276985bb4
test commit
2012-10-29 19:19:48 -04:00
5651dbce56
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:37:27 -04:00
a937aa0e28
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-29 16:19:39 -04:00
4861397872
CC-4644: Exception from zendphp.log
...
- fixed
2012-10-29 16:19:23 -04:00
d97afabaea
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
332f9993c0
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-done
2012-10-29 15:20:16 -04:00
fdd889d7a8
- fixed formatting
2012-10-29 12:09:11 -04:00
8ac0f41987
CC-4590: New smart block says 'Empty playlist'
...
-fixed
2012-10-29 11:57:20 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
d6a4f2f713
Cleaned up soundcloud
2012-10-26 18:45:27 -04:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
0ab1353564
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
...
-fixed
2012-10-26 18:00:48 -04:00
f14320a769
CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
...
- fixed
2012-10-26 17:15:39 -04:00
e667a721ad
- comment for some code
2012-10-26 16:26:48 -04:00
1ee228558a
CC-4574: Audio preview fails with certain characters in metadata
...
- fixed
2012-10-26 16:24:17 -04:00
dc361c1136
Aligned constants
2012-10-26 13:10:08 -04:00
4daaa776e2
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
-fixed
2012-10-23 17:45:55 -04:00
2d6be404d4
cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
...
-regen propel files
2012-10-23 13:45:15 -04:00
c74354b6f9
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-23 12:24:53 -04:00
dff5bb4e2b
CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
...
- fixed
2012-10-23 12:24:38 -04:00
50d09d09d3
cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
2012-10-23 12:08:01 -04:00
8b9b005708
CC-4612: Create index for cc_schedule during upgrade to improve the performance when cc_schedule's getting bigger
...
- also create one during fresh install
2012-10-22 17:29:26 -04:00
9ddd54ec12
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-22 16:37:19 -04:00
c51fb8a040
CC-4549: Tooltip for source username cannot be shared between input and output settings
...
-fixed
2012-10-22 16:37:06 -04:00
abf4319d67
Removed logging
2012-10-22 15:55:24 -04:00
feac48a003
cc-4613: fixed
2012-10-22 15:34:33 -04:00
e0402c88cf
cc-4613: fixed
2012-10-22 15:20:03 -04:00
0084f8ce93
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 17:48:47 -04:00
a9df8cd7f2
CC-4610: Creating recording show will generate lots of exception in zendphp.log
...
- fixed
2012-10-19 17:30:54 -04:00
2bab46a12e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 16:40:49 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
f30d636b17
CC-4581: Confirmation dialog for removing an item from a show refers to deletion
2012-10-19 16:19:32 -04:00
9dfee6aa68
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-fixed
2012-10-19 15:39:45 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -04:00
3ecde35b7c
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 14:28:14 -04:00
1146e1f269
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
...
- fixed
2012-10-19 14:27:57 -04:00
96ff440435
Removed space
2012-10-19 14:18:34 -04:00
7356d4fe89
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 13:42:41 -04:00
8f998fd2c8
CC-4595: Fade in/out setting doesn't work
...
-fixed
2012-10-19 13:42:24 -04:00
671802d658
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 13:24:14 -04:00
57ef1c20ac
Removed trailing whitespace
2012-10-19 13:24:06 -04:00
a1e653b41f
Deep optimization
2012-10-19 13:22:00 -04:00
7d8079f770
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ShowbuilderController.php
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
a51c3174e0
SAAS-282: Overlap detection prevents creation of a repeating show
...
-fixed
2012-10-19 12:33:12 -04:00
3b5ec6fbe0
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:46:18 -04:00
6d1b8fe586
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 11:32:42 -04:00
8d56c03fe3
deep voodoo magic to optimize schedule
2012-10-19 11:32:35 -04:00
f5051cff3a
CC-4605: Some AJAX calls are cached
...
-fixed
2012-10-19 11:22:44 -04:00
d5c2c37a3e
Revert "CC-4605: Some AJAX calls are cached"
...
This reverts commit ffca5b42a8
2012-10-19 11:16:42 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
e88e3a3df2
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 11:07:52 -04:00
ffca5b42a8
CC-4605: Some AJAX calls are cached
2012-10-19 11:07:37 -04:00
58d00cb9b9
Formatting sql
2012-10-19 11:05:12 -04:00
e9815b617b
- added comment
2012-10-18 15:21:38 -04:00
6727bce328
CC-4598: Smart block: cannot save dynamic block with 0.5 hours
...
-fixed
2012-10-18 15:03:59 -04:00
67ac4340c4
CC-4596: Too many ajax calls in Calendar page
...
-fixed
2012-10-18 14:47:19 -04:00
99861269e1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-18 12:10:05 -04:00
6c8c7aa285
CC-4592: Library: Changing fades does not save microseconds
...
-fixed
2012-10-18 12:09:48 -04:00
dc7b609115
CC-4593: Widen container in CSS so label is not truncated
2012-10-18 16:12:51 +01:00
887a86c6a1
CC-4591: Calendar: Cannot change start time for repeating show
...
-fixed
2012-10-18 10:51:24 -04:00
7c799cd3af
Fixed formatting of tooltip for smart blocks
2012-10-18 13:01:55 +01:00
7123230eea
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-17 15:28:15 -04:00
5fc72d9e51
add function necessary for saas
2012-10-17 15:28:05 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
c1745145e8
- CRLF fix
2012-10-16 16:25:56 -04:00
35c8fe55b4
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 16:24:12 -04:00
3f1df49221
CC-4572: Adding a playlist to a show in Now Playing page fails, interface greys out
...
- bug with php 5.3.2 with DateTime::createFromFormat()
- fixed with workaround
2012-10-16 16:22:44 -04:00
2b1db835dd
CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show'
...
-done
2012-10-16 16:01:05 -04:00
819dcf70fd
CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
...
-fixed
2012-10-16 15:56:03 -04:00
5d1d68d96b
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 15:29:18 -04:00
25c28da761
CC-4550: Track should not be a required field in metadata editor
...
-fixed
2012-10-16 15:29:05 -04:00
562c509939
CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up
...
- fixed
2012-10-16 14:51:14 -04:00
cafc5a77d7
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 14:38:39 -04:00
96da822bc7
CC-4574: Audio preview fails with Zend errors on file with question mark in the title
...
- fixed
2012-10-16 14:38:24 -04:00
e41145b54e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 14:33:56 -04:00
846af50543
CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
...
-fixed
2012-10-16 14:33:45 -04:00
67ca0db4c8
CC-4542: Playlists containing dynamic smart blocks cannot be previewed
...
- fixed
2012-10-16 14:09:34 -04:00
75db11d780
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 12:07:02 -04:00
7796b23a58
CC-4506: Audio Preview in Playlist doesn't work
...
- fixed
2012-10-16 12:06:47 -04:00
fe1d8d51a9
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 12:05:24 -04:00
b061573d23
CC-4554: Playout History search sticks on 'Processing' message
...
-fixed
2012-10-16 12:04:52 -04:00
8a93717415
CC-4568: Show preview broken in Now Playing page
...
- fixed
2012-10-16 11:06:01 -04:00
9d23e61acc
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 10:37:56 -04:00
03b32ea986
CC-4563
...
Library: Exception is found when remove a block by context menu
- fixed
2012-10-16 10:37:42 -04:00
9d3271c03d
CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show
...
-fixed
2012-10-15 15:36:38 -04:00
5ff89eeba2
CC-4561: Can create overlapping shows when rebroadcasting a repeating show
...
-fixed
2012-10-15 14:19:52 -04:00
095c2c7cc6
CC-4559: More useful tooltip for Find Shows button in Now Playing page
2012-10-15 12:41:39 +01:00
a103c76378
CC-4558: Make button in Now Playing consistent with same action in Calendar
2012-10-15 12:27:16 +01:00
b79e190d3c
-small comment change
2012-10-12 15:42:51 -04:00
e60a23aab4
CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day
...
-fixed
2012-10-12 15:34:42 -04:00
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04:00
1613353be8
Fix inconsistent label which does not match tooltip
2012-10-12 17:15:57 +01:00
f77ec31a8d
CC-4552: Small formatting improvement
2012-10-11 17:44:08 +01:00
4b2b5ada6e
CC-4548: Calendar -> Add/Remove contents -> Advanced search: Green check is pushed to different line under 1400 screen width
...
-fixed
2012-10-11 12:23:24 -04:00
03e4bb15c7
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-11 12:12:06 -04:00
5c0bdfa2db
CC-4544: Playlist/Smart Blocks: Add cue format helper
...
-done
2012-10-11 12:11:53 -04:00
93fde28cfe
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-11 17:04:07 +01:00
843a456b3b
CC-4552: Fixed various errors in Support Feedback page
2012-10-11 17:03:09 +01:00
5f35336fd0
CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
...
-fixed
2012-10-11 11:49:04 -04:00
c95050c04c
CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
...
-fixed
2012-10-10 15:06:30 -04:00
2fbd8e868b
CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error"
...
-fixed
2012-10-10 14:22:09 -04:00
395d25158f
CC-4545: Fix tooltip for Auto Switch On feature
2012-10-10 16:26:32 +01:00
fa8c561dab
CC-4543 Adjusted CSS for wider colour code label
2012-10-10 11:44:38 +01:00
d4fa24a9af
CC-4543: Fixed colour code labels in playlist preview pop-up
2012-10-10 11:17:09 +01:00
c9ac675a10
CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
...
-fixed
2012-10-09 14:39:29 -04:00
dc410f4289
CC-4528: Calendar: Can drag and drop current show into past (it's forbidden to set it by editing show)
...
-fixed
2012-10-09 14:20:00 -04:00
279737751b
CC-4540: Smart Block: Error messages are too long
...
-fixed
2012-10-09 12:12:52 -04:00
b4fee4321c
CC-4537: Bit rate hint should be in kbps to match actual search
2012-10-09 16:46:51 +01:00
c6dc5a818f
CC-4172: Fix alignment of 'is in the range' boxes
2012-10-09 16:24:03 +01:00
2f447d24a5
Fixed typo in password restore message
2012-10-09 14:21:58 +01:00
456d9ba99a
CC-4172: Shrink width of table to fit 1280 pixel wide display
2012-10-08 15:33:57 +01:00
44a3f85636
CC-4507: Tweak CSS to make more room for metadata in Master Panel
2012-10-08 12:49:54 +01:00
0d35056cd4
CC-4486: Library -> Advanced Search: Alignment is off sometimes
...
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
5a0df2b6d5
Adde TODO's
2012-10-03 12:01:24 -04:00
9dc8707c40
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-03 11:59:05 -04:00
1ae7784331
Added TODO
2012-10-03 11:59:02 -04:00
2deceaa5fb
comment formatting
2012-10-03 11:58:21 -04:00
317bb7de69
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-10-03 11:40:40 -04:00
eadde1c498
CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
...
-fixed
2012-10-03 11:29:16 -04:00
f94c4cd96a
CC-4515: Calendar: Errors for editing recording show
...
-fixed
2012-10-03 11:13:41 -04:00
1b0dd13eac
CC-4521: Playlist Builder: Cannot set fades
...
-fixed
2012-10-02 15:38:05 -04:00
aede8e8efa
CC-4520: Playlist Builder: Cannot set cue in
...
-fixed
2012-10-02 15:35:49 -04:00
968c719fa1
CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
...
-done
2012-10-02 14:12:22 -04:00
3dd7e9767b
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
...
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
7d00631150
Set min-width value for source info block in Master Panel (CC-4510)
2012-10-01 12:11:36 +01:00
4ff267ee8a
removed z
2012-09-19 17:45:03 -04:00
7bb1eadf03
formatting
2012-09-19 17:39:30 -04:00
cde8c60afc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:38:00 -04:00
36d454184d
formatted
2012-09-19 17:37:49 -04:00
9df90414fc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:22:13 -04:00
5a8510b909
remove gap on right side of show builder: part 3
2012-09-19 17:22:04 -04:00
29347527cf
CC-4471: Library -> Remove extra top margin in playlist builder
...
-done
2012-09-19 17:14:22 -04:00
abd58c25a1
removed duplicated comment
2012-09-19 17:12:18 -04:00
253a31b1ea
-datatables small fix
2012-09-19 17:05:20 -04:00
cdcb1f0ef9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:04:45 -04:00
3e769b6e7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:04:26 -04:00
e926b62915
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:00:15 -04:00
f909ab9da2
CC-4490: Calendar: Empty show icon should have a tooltip
...
-done
2012-09-19 16:59:45 -04:00
b66f00ff07
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:59:21 -04:00
40c122fafa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:56:04 -04:00
84ed03ffac
remove gap on right side of show builder: part 2
2012-09-19 16:55:44 -04:00
f2e495cbd8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:40:05 -04:00
2afc4183bb
CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
...
-fixed
2012-09-19 16:39:56 -04:00
946df8a2e3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:36:13 -04:00
89ed6925df
removed benchmarking
2012-09-19 16:36:04 -04:00
e5085f0df3
Cleaned up code.
2012-09-19 16:34:46 -04:00
a3b53ee3d3
remove gap on right side of show builder
2012-09-19 16:19:02 -04:00
b4277f1f17
CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
...
-fixed
2012-09-19 15:46:03 -04:00
4b2d6caf0e
CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
...
-done
2012-09-19 15:35:45 -04:00
dc4e12a0ae
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 15:03:29 -04:00
d70951a334
CC-4494: Calendar: Cannot resize show
...
-fixed
2012-09-19 15:03:16 -04:00
f717efd7fb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 13:23:14 -04:00
ca0fb969b7
fix jplayer errors for mp3 and firefox (flash)
2012-09-19 13:23:06 -04:00
51bcf04803
CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options
...
- fixed
2012-09-19 13:11:08 -04:00
b2e452acbb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 12:51:13 -04:00
8652681eda
CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length
...
- fixed
2012-09-19 12:51:03 -04:00
0158d3f936
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 12:47:18 -04:00
801edc2fcf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 12:42:08 -04:00
81620d4f94
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
...
-fixed
2012-09-19 12:41:54 -04:00
f801fcb81e
empty space
2012-09-19 11:20:26 -04:00
014da73eed
heredoc sql
2012-09-19 11:17:32 -04:00
6001995e01
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 11:15:09 -04:00
ecb5c93ddf
Removed methods again...
2012-09-19 11:14:59 -04:00
7dac1c6561
Added them back because not sure
2012-09-19 11:14:26 -04:00
99b28cca82
Removed unused methods
2012-09-19 11:11:50 -04:00
dc95ab1d00
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
ddc0e8d2ba
remove console.log from javascript library :/
2012-09-19 11:04:01 -04:00
281e7d1092
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 10:49:52 -04:00
0c823af660
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
...
-done
2012-09-19 10:49:17 -04:00
20b79374e2
Removed empty method
2012-09-19 10:25:29 -04:00
58620203cf
line wrap
2012-09-19 10:24:45 -04:00
fb4f7c1cb5
psr
2012-09-19 10:23:54 -04:00
1da4f44768
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 21:29:19 -04:00
7036036a86
CC-4476: Make all green notification boxes fade out after 5 seconds
...
-fixed
2012-09-18 21:29:02 -04:00
33be48e9e3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 18:21:00 -04:00
a9eefe21fa
cc-4304: Add call to save after each file reassignment
2012-09-18 18:20:33 -04:00
92b40bea0c
CC-4484: Some js files do not have the airtime version appended
...
-fixed
2012-09-18 17:43:13 -04:00
5003e86eac
- changed smart block qtip text
2012-09-18 17:37:38 -04:00
f9778f2da4
-removed windows CRLF
2012-09-18 17:26:34 -04:00
610a5da24e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:23:37 -04:00
1d699fe0b8
CC-4479: Buttons in dialog windows are not styled
...
-done
2012-09-18 17:22:24 -04:00
b69f3288d3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:22:22 -04:00
6420e6a830
remove trailing whitespace
2012-09-18 17:22:14 -04:00
39e1bd5271
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 16:55:57 -04:00
b77429164b
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-removed setInterval function
2012-09-18 16:55:46 -04:00
3ecbab3259
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 16:50:57 -04:00
8433ec5445
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
...
- fixed
2012-09-18 16:50:42 -04:00
cc966ca62b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 16:49:52 -04:00
54ab58a9c7
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-removed (commented out) code for this ticket
-postponing for now
2012-09-18 16:49:45 -04:00
d55915d649
naming convention fix
2012-09-18 16:40:23 -04:00
608fff090c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:52:26 -04:00
1c89244b02
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:52:20 -04:00
7a958ec8b6
formatting
2012-09-18 15:52:16 -04:00
8cae11d588
CC-4478: Library: audio preview check should be skipped if file does not exist
...
-fixed
2012-09-18 15:52:11 -04:00
be214ac126
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:47:48 -04:00
eecc90547d
CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
...
- fixed
2012-09-18 15:47:37 -04:00
0241eb4714
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:29:08 -04:00
09b117999e
CC-4475: Register form button doesn't have any styling
...
-fixed
2012-09-18 15:28:38 -04:00
da11dc077e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:27:35 -04:00
4c58c4c9a9
CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
...
-fixed
2012-09-18 15:27:27 -04:00
a2f3210c79
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:26:53 -04:00
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -04:00
e676cf856f
-remove console.log
2012-09-18 15:16:54 -04:00
0386f8a9cb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:14:57 -04:00
7bbd10556b
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
...
-done
2012-09-18 15:14:46 -04:00
2cfb0c85d5
Formatted sql
2012-09-18 15:04:22 -04:00
3a60d729fd
added todo
2012-09-18 15:02:07 -04:00
b372c9ae50
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 14:56:53 -04:00
859041bcf4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 14:40:32 -04:00
98f0692b8d
CC-4457: Media Library: The background of 'Adding items' is minimize to a point
...
- fixed
2012-09-18 14:40:18 -04:00
b069b1254e
Aligned
2012-09-18 12:56:01 -04:00
90d3494576
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:48:55 -04:00
6ac241b1fc
Added todo
2012-09-18 12:48:45 -04:00
09bc686d99
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 12:41:30 -04:00
b0f2176329
fix some TODO's in webstream.php
2012-09-18 12:40:44 -04:00
a22ba39de1
formatting
2012-09-18 12:26:07 -04:00
d2f43058c2
fixed comment
2012-09-18 12:09:28 -04:00
f9319b869a
Corrected comments
2012-09-18 12:08:30 -04:00
bc873a3ece
Added extension handling for file path
2012-09-18 12:04:54 -04:00
8657a80459
removed return ''
2012-09-18 11:51:13 -04:00
6fc0d50c9f
lined up
2012-09-18 11:46:35 -04:00
018b50d316
added better logging
2012-09-18 11:45:10 -04:00
355ceadedb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 11:22:44 -04:00
e00ff6367d
CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate
...
-fixed
2012-09-18 11:22:37 -04:00
9759543943
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 11:11:06 -04:00
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -04:00
6481556f9b
Showbuilder formatting
2012-09-18 11:07:32 -04:00
75d6b509ea
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 11:05:20 -04:00
9c721f202f
-small UI improvement
2012-09-18 11:05:13 -04:00
49e1b29bc9
Removed instances of getLine and getFile
2012-09-18 11:04:33 -04:00
2e0e0849c5
More clean up
2012-09-18 11:03:34 -04:00
d90559fdf8
Cleaned up ShowbuilderController
2012-09-18 11:02:41 -04:00
96f138a9fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 10:55:55 -04:00
9249bf8cd0
Big formatting changes.
2012-09-18 10:55:42 -04:00
1698aae251
CC-4466: Buttons on Now Playing page are clickable even though they are disabled
...
-fixed
2012-09-18 10:53:19 -04:00
f50fccaf5f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:28:36 -07:00
bb3ffce071
CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled
2012-09-17 16:28:28 -07:00
542c5c857f
alignment
2012-09-17 17:54:10 -04:00
James
Rudi Grinberg
denise
Martin Konecny
james
Rudi Grinberg
Martin Konecny
Daniel James
Naomi Aro