adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
45e3fccae2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 12:31:22 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
a65e72941f
CC-4805: Localization -> Changing default language changes datatables and add media language setting
...
-fixed
2013-01-07 18:18:40 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
51425d451f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 13:49:09 -05:00
ecbff94f11
CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
...
- fixed
2013-01-07 13:48:51 -05:00
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
63c847080f
CC-4732: Ask for admin username + password in Stream Settings page
...
- CRLF
2013-01-03 18:02:19 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
dcdbc3160d
CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
...
- fixed
2013-01-02 11:41:33 -05:00
0596d1c391
Merge branch 'cc-4759-add-aac-stream-in-support' into devel
...
Conflicts:
python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
ee8dde07c8
add support for AAC input streams
2012-12-27 17:18:47 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
127d0187b7
CC-4706: Calendar -> Context menu -> Show content does not work
...
-fixed
2012-12-03 11:45:06 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
87d0383533
CC-4703: Now Playing duration column ignores any cue point set
...
- fixed
2012-11-22 14:37:57 -05:00
8483439551
CC-4709:
...
Exception happens when DJ try to click a Webstream not belongs to himself
- fixed
2012-11-22 10:29:40 -05:00
c0e49b69e2
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-21 17:17:53 -05:00
2172ee82d3
Merge branch '2.2.x' into devel
2012-11-21 17:17:32 -05:00
2a4e4c6405
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 14:17:46 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -05:00
10b6dd202e
Merge branch 'devel' into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
f88a7bdb31
Merge branch '2.2.x' into devel
2012-11-21 10:54:17 -05:00
48253b8d14
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 10:19:21 -05:00
8d9fa1976e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-20 16:39:04 -05:00
3c1f80de68
CC-4658: Smart Block: Unable to drag songs into block directly
...
- fixed
2012-11-20 16:38:43 -05:00
fe44d23b74
CC-4715: Better management of tracks that are shorter than they claim to be.
2012-11-20 16:31:27 -05:00
3a682aeada
cc-4585: fixed + added logging
2012-11-20 15:25:41 -05:00
7124cbe04d
fixed bug where hidden files would be shown in library
2012-11-20 15:18:41 -05:00
20855c73b5
refactoring + fix typo
2012-11-20 15:10:38 -05:00
a76b9b305f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
9c612d17a3
CC-4694: Apache/Zend error only specific to some users
2012-11-19 18:41:31 -05:00
7efa7169ca
CC-4700: Return mime type of streams instead of null
...
-fixed
2012-11-15 16:41:46 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -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
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
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
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
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -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
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
7f27e5ff3f
- ListenerStat Model
2012-11-02 16:28:13 -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
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -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
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -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
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
5061dfa05d
CC-4647: apache error log entries
...
- fixed
2012-10-30 12:36:50 -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
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
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
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
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
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
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
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
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
8d56c03fe3
deep voodoo magic to optimize schedule
2012-10-19 11:32:35 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
58d00cb9b9
Formatting sql
2012-10-19 11:05:12 -04:00
6727bce328
CC-4598: Smart block: cannot save dynamic block with 0.5 hours
...
-fixed
2012-10-18 15:03:59 -04:00
6c8c7aa285
CC-4592: Library: Changing fades does not save microseconds
...
-fixed
2012-10-18 12:09:48 -04: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
819dcf70fd
CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
...
-fixed
2012-10-16 15:56:03 -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
8f5830757f
CC-4553: Calendar: Can create overlapping show by repeat show's instances
...
-fixed
2012-10-12 14:26:54 -04: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
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
5a0df2b6d5
Adde TODO's
2012-10-03 12:01:24 -04:00
1ae7784331
Added TODO
2012-10-03 11:59:02 -04:00
2deceaa5fb
comment formatting
2012-10-03 11:58:21 -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
4ff267ee8a
removed z
2012-09-19 17:45:03 -04:00
7bb1eadf03
formatting
2012-09-19 17:39:30 -04:00
36d454184d
formatted
2012-09-19 17:37:49 -04:00
abd58c25a1
removed duplicated comment
2012-09-19 17:12:18 -04:00
cdcb1f0ef9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 17:04:45 -04:00
253a31b1ea
-datatables small fix
2012-09-19 17:05:20 -04:00
b66f00ff07
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-19 16:59:21 -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
e5085f0df3
Cleaned up code.
2012-09-19 16:34:46 -04:00
d70951a334
CC-4494: Calendar: Cannot resize show
...
-fixed
2012-09-19 15:03:16 -04:00
f801fcb81e
empty space
2012-09-19 11:20:26 -04:00
014da73eed
heredoc sql
2012-09-19 11:17:32 -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
58620203cf
line wrap
2012-09-19 10:24:45 -04:00
fb4f7c1cb5
psr
2012-09-19 10:23:54 -04:00
a9eefe21fa
cc-4304: Add call to save after each file reassignment
2012-09-18 18:20:33 -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
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
7a958ec8b6
formatting
2012-09-18 15:52:16 -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
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
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -04:00
2cfb0c85d5
Formatted sql
2012-09-18 15:04:22 -04:00
3a60d729fd
added todo
2012-09-18 15:02:07 -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
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -04:00
6481556f9b
Showbuilder formatting
2012-09-18 11:07:32 -04:00
49e1b29bc9
Removed instances of getLine and getFile
2012-09-18 11:04:33 -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
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
53c6d77821
Formatting
2012-09-17 17:52:56 -04:00
095a5cce4f
Added better debugging
2012-09-17 17:51:50 -04:00
69756f60ca
formatting
2012-09-17 17:49:25 -04:00
ff22b80dfc
formatting
2012-09-17 17:49:16 -04:00
3ba3df07f8
better logging
2012-09-17 17:39:41 -04:00
5a37777cfd
formatting
2012-09-17 17:04:49 -04:00
1c736d6366
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:47:45 -04:00
d0e67d8475
cc-4462: Bandaided, marked as hack
2012-09-17 16:47:33 -04:00
117f11ef97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:46:57 -04:00
75620be761
remove all mosty carriage return characters
2012-09-17 16:46:51 -04:00
81c72b8344
cc-4462: Bandaided
2012-09-17 16:46:49 -04:00
56eb2dff92
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 16:40:37 -04:00
c310cecf40
CC-4463: do we need getFileExtension()?
2012-09-17 16:40:27 -04:00
ae1ae80d36
in_array -> array_key_exists
2012-09-17 16:40:22 -04:00
c2b2ea1d16
Fixed formatting
2012-09-17 16:27:10 -04:00
8b445486b1
CC-4427: Listen button does not work
...
fixed
2012-09-17 16:17:53 -04:00
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
1a29499bb8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:48:09 -04:00
54b6b12ec0
CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it.
...
- fixed
2012-09-17 15:41:27 -04:00
4f576afc00
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
2012-09-17 15:24:02 -04:00
54bb414500
CC-4318: Widgets: Weekly show cannot show the schedule
...
-fixed
2012-09-17 14:56:34 -04:00
1e0595d7ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 14:53:17 -04:00
8801ccecce
CC-4459: Now Playing -> Timeline: 'Filter by show' does not work
...
-fixed
2012-09-17 14:52:56 -04:00
ed45011b40
needle <-> haystack
2012-09-17 14:21:13 -04:00
fef949f6ea
band aided some bug
2012-09-17 12:50:04 -04:00
92a5bf51a6
Added warning for uploading unknown file types
2012-09-17 12:45:33 -04:00
048da282fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:36:57 -04:00
2337078dd8
Cleaned up unused variables. Formatted some lines.
2012-09-17 12:35:12 -04:00
5bbc815a78
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 12:32:54 -04:00
5d0592c729
CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table
...
-fixed
2012-09-17 12:32:39 -04:00
b913b067c2
Added setColumnFilter(oTable)
2012-09-17 11:58:08 -04:00
7fed5bcd18
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 10:57:19 -04:00
be80eeb5fd
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 18:20:46 -04:00
7b1b271a2c
Reformatted sql to use heredocs
2012-09-14 17:09:05 -04:00
39903be69a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:51:48 -04:00
3ced92db7a
CC-4415: Smart Block audio preview doesn't work
2012-09-14 16:51:14 -04:00
ec3e0a9b9f
Added todo
2012-09-14 16:50:28 -04:00
bf651a96aa
cc-4431: Fixed isUserType
2012-09-14 16:47:55 -04:00
76ba4bb6f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 16:03:03 -04:00
05916a4d26
Code cleanup
2012-09-14 15:13:08 -04:00
198d15adc8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:53:32 -04:00
78460703a2
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-done
2012-09-14 14:53:25 -04:00
79ce7b572c
cc-4202: Fixed
2012-09-14 14:51:50 -04:00
6e239d08e9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 14:43:15 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
c7f4ede766
-implemented UI changes for library page
2012-09-14 12:08:51 -04:00
43503475fd
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
...
- CRLF fix
2012-09-13 17:07:47 -04:00
d2f0b10552
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 17:05:56 -04:00
0b917f385e
CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
...
- fixed
2012-09-13 17:05:40 -04:00
d534f22ce4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:11:15 -04:00
da72c00f28
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
...
-fixed
2012-09-13 16:10:17 -04:00
11ef613d1c
comment formatting
2012-09-13 15:16:46 -04:00
e31d570a1c
Sql formatting
2012-09-13 15:13:37 -04:00
f754d78687
Formatted comments and =
2012-09-13 15:12:54 -04:00
14db5053b1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:56:10 -04:00
203378e60a
More exception handling
2012-09-13 14:56:03 -04:00
8a2703c50d
Made method static
2012-09-13 12:33:15 -04:00
24b3fb7e8a
Remvod unused CC_CONFIG, reformatted some code
2012-09-13 10:26:50 -04:00
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
536fdabb77
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 17:27:08 -04:00
3b43efefe0
CC-4413: Unused local variables in models.
...
-done
2012-09-12 17:26:41 -04:00
8e91c515f0
cc-4397: Fixed handling for bad metadata.
2012-09-12 17:26:37 -04:00
af8c813f35
Documented unimplemented interface methods
2012-09-12 17:08:51 -04:00
88604eabcc
Removed unused variable
2012-09-12 16:24:49 -04:00
15355f9e30
Formatted comment
2012-09-12 16:12:00 -04:00
6e8313a395
Fixed typo in SQL missing ,
2012-09-12 16:10:56 -04:00
db5dbab086
Removed unused local variables
2012-09-12 16:09:53 -04:00
414d1fa511
PDO'd UpdateBroadcastedStatus
2012-09-12 16:09:28 -04:00
643c00418a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 15:59:53 -04:00
64a1dade9b
Massive formatting of SQL
2012-09-12 15:59:46 -04:00
20f5fe6480
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00
a418f5777c
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
...
-initial commit
2012-09-12 15:43:50 -04:00
2c1acf8b17
Removed reference to CC_CONFIG
2012-09-12 15:42:00 -04:00
6fc8df9226
Here doc'd sql
2012-09-12 15:39:02 -04:00
b2737688cc
Added space to sql squery
2012-09-12 15:36:37 -04:00
a432665146
Changed to heredoc
2012-09-12 15:19:39 -04:00
d62ba61ea6
Formatting schedule.php
2012-09-12 14:19:02 -04:00
806fd83ccc
Reformatted schedule
2012-09-12 14:14:55 -04:00
dd68f6d945
Changed schedule to use james' helper function
2012-09-12 13:44:20 -04:00
7f9642dcd2
Fixed typo
2012-09-12 12:18:06 -04:00
195008d1e4
more pdo fix
2012-09-12 12:16:53 -04:00
845ec23fa3
fixed booboo
2012-09-12 12:15:47 -04:00
ad75849a6f
Fixed array_map over query instances
2012-09-12 12:09:38 -04:00
d194ff1809
PDO'd a few things missed before in cancelShow()
2012-09-12 12:05:03 -04:00
6d32c03351
getHosts() changed sql style
2012-09-12 12:00:53 -04:00
cebfdd6558
Changed sql string to heredoc
2012-09-12 11:59:27 -04:00
6519512924
fixed array_map over iterable
2012-09-12 11:54:37 -04:00
d69391d2dd
Formatted Block.php
2012-09-12 11:35:28 -04:00
7b41d94352
Reforamtted Block.php
2012-09-12 11:31:41 -04:00
e0286b112f
cc-4292: Removed unnecessary code related to md5.
2012-09-12 11:10:25 -04:00
faa04a2f5c
Refactored RecallByX
2012-09-11 18:22:46 -04:00
c6ab540120
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 17:19:12 -04:00
58d39d74d4
CC-4355: Smart block criteria do not match library columns or metadata editor
...
-fixed
2012-09-11 17:18:17 -04:00
72a424bb7e
Added todo to fix crust
2012-09-11 16:25:45 -04:00
0dd38920a3
Cosmetic changes.
2012-09-11 16:20:59 -04:00
51d4f35c55
Removed unused global variable
2012-09-11 16:15:15 -04:00
d95731f2f3
Reformatted sql to use heredoc
2012-09-11 16:13:39 -04:00
355b0ad35d
cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
...
through paths.
2012-09-11 16:02:39 -04:00
57b59a3290
Cleaned up preference.php
2012-09-11 14:33:50 -04:00
1304111682
Shortened code with if -> ?
2012-09-11 14:10:13 -04:00
751ed8276d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 14:05:54 -04:00
1afdcb8c2d
Shortened an if statement to p ? x : y
2012-09-11 14:05:40 -04:00
c61f5d1972
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 14:04:53 -04:00
0fec175681
CC-1710: FLAC, BWF, AAC support
...
-context menu for mp4's having a problem
2012-09-11 14:04:45 -04:00
63b1ead363
Undefined index error fixed by returning a default error if none is set in the database.
2012-09-11 13:56:48 -04:00
1e1b5919a2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 11:57:13 -04:00
9b0e5a6b2f
removing unused file.
2012-09-11 11:53:36 -04:00
a06eeaa76a
-fix silly mistake after refactoring
...
again
2012-09-11 11:20:42 -04:00
41d9b2490a
-fix silly mistake after refactoring
2012-09-11 11:14:47 -04:00
245d9a95d0
CC-4389: Convert all PHP errors to throw exceptions instead
...
-don't throw exception for suppressed errors.
2012-09-11 11:12:58 -04:00
585ee579d6
CC-4005: Tag files with Last Played date and number of times played
...
- fixed CRLF
2012-09-10 18:07:12 -04:00
645593f954
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Webstream.php
2012-09-10 18:04:35 -04:00
ba37bb4327
CC-4005: Tag files with Last Played date and number of times played
...
- done for files and webstreams
2012-09-10 18:01:36 -04:00
80bdc95cd5
-redoing a commit undo
2012-09-10 17:24:18 -04:00
87ac1744f7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:54:51 -04:00
5292137430
-return json as data type for schedule action
2012-09-10 16:54:42 -04:00
43bef4939e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:30:38 -04:00
af225418c4
Removed empty constructor.
2012-09-10 16:08:21 -04:00
db0a34b35c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:37:36 -04:00
67b295a553
CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps
...
- done
2012-09-10 15:37:22 -04:00
97317c0195
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:35:46 -04:00
e85ea5c683
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:35:42 -04:00
3107286799
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
2012-09-10 15:35:32 -04:00
0c1c4aa27d
Put sql in heredoc for better readability
2012-09-10 15:35:30 -04:00
9d825a55b3
Crap comment removed
2012-09-10 15:32:31 -04:00
2e0b29b14e
Removed unused code
2012-09-10 15:31:56 -04:00
987b65af28
cc-4347: Extra pdo work
2012-09-10 14:53:26 -04:00
0ab08af48f
CC-4380: Show ReplayGain value in the Library page
...
- done
2012-09-10 14:37:38 -04:00
60cf74a602
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 14:16:52 -04:00
957e644829
-fixed javascript error in datatables.js
2012-09-10 14:16:36 -04:00
b085f9ef67
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 14:15:07 -04:00
e85a83d045
Fixed pdo
2012-09-10 14:14:44 -04:00
4d3c624607
CC-4380: Show ReplayGain value in the Library page
...
- temp commit
2012-09-10 12:35:32 -04:00
e5de4f560d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 12:18:41 -04:00
ac8610ca06
CC-4385: Problem with mono streams for stream rebroadcasting
...
-fixed
2012-09-10 12:18:19 -04:00
567a8a2635
cc-4347: Fixed typo
2012-09-10 12:04:33 -04:00
8340db3ce9
Added error handing todo
2012-09-10 11:53:22 -04:00
a0b3742758
cc-4347: resizeShow pdo'd
2012-09-10 11:49:56 -04:00
3df4c8d65a
cc-4347: deleteRebroadcasts and GetEndTimeOfNextShowWithLiveDJ pdo'd
2012-09-10 11:39:22 -04:00
e2c2f67fbb
cc-4347: GetShowInstanceCount() pdo'd
2012-09-10 11:29:28 -04:00
375e89169e
Removed code duplication
2012-09-10 11:27:39 -04:00
53de942c2b
cc-4347: GetNextShowInstance PDO'd.
2012-09-10 11:25:44 -04:00
de86b904a5
Fixed extra cast.
2012-09-10 11:25:21 -04:00
8c3be7393a
cc-4347: GetCurrentShowInstance got PDO nuked.
2012-09-10 11:17:45 -04:00
57aae73074
cc-4347: PDO'd: GetLastShowInstance
2012-09-10 11:06:34 -04:00
737c3fcbae
Todo for consistency.
2012-09-10 11:06:11 -04:00
a3d4b8c722
Todo for consistency.
2012-09-10 11:05:30 -04:00
35c8b50d96
cc-4347: PDO'd Show create
2012-09-07 18:23:55 -04:00
a479a11c8f
Removed crazy handling of flac.
2012-09-07 18:23:14 -04:00
33035a4212
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-07 17:38:35 -04:00
d20c450226
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
...
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
f1487ba69d
cc-4347: Fixed missing AND clause
2012-09-07 17:23:32 -04:00
b4748a3b1f
cc-4347: Fixed typo
2012-09-07 17:15:49 -04:00
7fa17a644e
Sexification
2012-09-07 16:58:49 -04:00
79513356fb
cc-4347: PDO'd getShows
2012-09-07 16:53:16 -04:00
101c28f9c3
remove unused variable (PHP 5.4 warning)
2012-09-07 16:50:52 -04:00
3c0541f138
fix function camelcase
2012-09-07 16:50:33 -04:00
87787081ce
Removed unused optional argument.
2012-09-07 16:26:05 -04:00
8f3c7e8eba
cc-4347: PDO'd getInstanceOnDate()
2012-09-07 15:29:30 -04:00
26a3e35de0
Refactored getMaxLengths()
2012-09-07 15:14:33 -04:00
27c1361fbb
Small refactoring to use getter instead of accessing private variable.
2012-09-07 15:12:46 -04:00
089e896552
fix camelCase of function
2012-09-07 14:34:58 -04:00
49a85afc06
Refactor
2012-09-07 14:33:08 -04:00
5ee24ceb23
cc-4347: PDO. getAllFutureInstanceIds()
2012-09-07 14:30:59 -04:00
82f267310e
cc-4347: Undid refactoring
2012-09-07 14:18:40 -04:00
efb35dd9d6
cc-4347: PDO'd deleteAllRebroadcasts()
2012-09-07 12:29:42 -04:00
ad776ff8f3
cc-4347: PDO deleteAllInstances()
2012-09-07 12:22:49 -04:00
727769b376
cc-4347: PDO getRepeatingDate()
2012-09-07 12:18:13 -04:00
23ccd75290
cc-4347: PDO getRbroadcastsRelative()
2012-09-07 12:10:07 -04:00
cfe0d7aa0c
Unrelated refactorings of Show.php. Added TODO for more later work.
2012-09-07 12:07:29 -04:00
2a00e58610
cc-4347: PDO like a boss.
2012-09-07 11:58:57 -04:00
22a250b5d2
cc-4347: PDOOO
2012-09-07 11:54:32 -04:00
92682b9f89
Added TODO about unused code
2012-09-07 11:39:58 -04:00
f61463b8ba
premature optimization
2012-09-07 11:20:23 -04:00
c28f3af9cf
removed unused code. reformatted some comments.
2012-09-07 11:18:10 -04:00
d805995e72
cc-4347: ~~~~PDO~~~~~~
2012-09-07 11:12:26 -04:00
33326ec052
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 17:23:58 -04:00
73ba643563
cc-4347: _-=~^PDO^~=-_
2012-09-06 17:23:39 -04:00
d9af434138
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 16:46:35 -04:00
7d3ac8eb07
CC-4346: Prepared statements - part 2
...
- done
2012-09-06 16:46:22 -04:00
83415cf298
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 16:18:37 -04:00
fba5d56c76
CC-4364: Show - > On Air button is greyed out although you can hear the playout
...
-fixed
2012-09-06 16:18:28 -04:00
f30507fce6
cc-4347: pdo
2012-09-06 16:17:14 -04:00
2b659f9c91
Sexified.
2012-09-06 16:16:53 -04:00
1852843f96
cc-4347: ~~~~PDO~~~~~~
2012-09-06 15:55:29 -04:00
977c664bfe
cc-4347: Fixed table quoting
2012-09-06 15:49:13 -04:00
ad6e601d5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 15:47:20 -04:00
0fdf1e5e86
cc-4347: PDO
2012-09-06 15:47:07 -04:00
18ec23526f
CC-4294: Webstream length should make hours or minutes optional. Also minutes > 59 should be parsed correctly.
...
-fixed
2012-09-06 15:02:26 -04:00
James
Martin Konecny
denise
Daniel James
james
martin
Martin Konecny
Rudi Grinberg
Rudi Grinberg
Martin Konecny
Naomi Aro