8c49540d3d
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:16:10 -05:00
d7495c6937
CC-1960: Internationalize Airtime / Support translations
...
- fix to some controller strings
2012-11-15 14:05:36 -05:00
105325994f
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-15 12:55:45 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
c0e54c64cd
CC-4685: System -> User: Unique username error
...
-fixed
2012-11-12 12:29:07 -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
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
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
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -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
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
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -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
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
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -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
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
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
3a7700eaac
CC-4583: Use AJAX calls instead of refreshing entire page
...
-done
2012-10-26 18:09:30 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
2527fa2e1a
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 14:42:01 -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
3b5ec6fbe0
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:46:18 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -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
8a93717415
CC-4568: Show preview broken in Now Playing page
...
- fixed
2012-10-16 11:06:01 -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
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
89ed6925df
removed benchmarking
2012-09-19 16:36:04 -04:00
20b79374e2
Removed empty method
2012-09-19 10:25:29 -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
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
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
72e6ee35fa
cc-4304: Temporarily fixed
2012-09-18 15:26:43 -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
6fc0d50c9f
lined up
2012-09-18 11:46:35 -04:00
018b50d316
added better logging
2012-09-18 11:45:10 -04:00
0a83b33a5a
Removed extra logging statements
2012-09-18 11:10:54 -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
9c5ebdc4c0
Removed old commented code
2012-09-17 17:02:59 -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
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
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
ab99e64e8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 11:13:44 -04:00
f6967ac575
Added Martin's fix
2012-09-17 11:03:36 -04:00
7fed5bcd18
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 10:57:19 -04:00
a664e7f74a
Removed extra comments
2012-09-17 10:30:55 -04:00
1c2cebf5a8
Removed comment
2012-09-17 10:27:12 -04:00
f809a17c02
Formatting
2012-09-14 19:05:30 -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
2faf299c73
Removed code duplication
2012-09-14 17:28:50 -04:00
092595eb9f
Removed profane logging message
2012-09-14 17:10:10 -04:00
f2b07e4a83
alignment
2012-09-14 17:02:38 -04:00
67483f8bb2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-14 17:01:45 -04:00
81dadb7f85
Removed annoying logging
2012-09-14 17:01:35 -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
bf651a96aa
cc-4431: Fixed isUserType
2012-09-14 16:47:55 -04:00
ba08355c38
quick fix
2012-09-14 16:16:52 -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
239a228175
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-small fix
2012-09-14 14:36:31 -04:00
e3c1a3ac0e
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-initial commit
2012-09-14 12:09:40 -04:00
d534f22ce4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:11:15 -04:00
505b53fa16
cc-1665: fix broken checkin for webstream
2012-09-13 16:11:06 -04:00
410a3406af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 15:05:48 -04:00
8d08aa888b
cc-4421: Added special handling for files that mutagen returns None for.
2012-09-13 14:54:52 -04:00
b2d61f2402
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 14:22:27 -04:00
2293fcda01
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
...
- fixed
2012-09-13 14:22:13 -04:00
4137602116
Cleaned up API controller
2012-09-13 14:21:15 -04:00
8a2703c50d
Made method static
2012-09-13 12:33:15 -04:00
2b9e6081a4
Added log for exception
2012-09-13 12:27:04 -04:00
e043816bf4
Removed superfluous logging
2012-09-13 12:23:48 -04:00
3fb7526fbb
Shortened logging
2012-09-13 12:15:51 -04:00
b28116f622
removed empty space
2012-09-13 11:34:00 -04:00
d564b85e7c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:12:32 -04:00
a779142a08
-fix commenting error
2012-09-13 11:12:39 -04:00
e2f8d8e0e7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:10:43 -04:00
d409af2876
shortened logging
2012-09-13 11:07:29 -04:00
dced49c425
Removed unused variable
2012-09-13 10:52:58 -04:00
55993352bf
Removed unused variables.
2012-09-13 10:35:24 -04:00
e1403d45bd
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
...
-done
2012-09-13 10:32:33 -04:00
1f3bab2458
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-12 23:06:19 -04:00
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
1c293839da
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
...
-disable preview icon
2012-09-12 17:32:19 -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
87fb9998dd
increase mem warning limit to 30MB
2012-09-12 15:44:26 -04:00
975830ff90
Removed wrong comments
2012-09-11 18:22:24 -04:00
e2d69df4a6
Removed unused code
2012-09-11 17:51:39 -04:00
dc91db1f46
formatting
2012-09-11 17:48:08 -04:00
bc5718ec09
logging removed
2012-09-11 17:39:28 -04:00
cc3ba90ec3
added debugging
2012-09-11 17:32:26 -04:00
b8db419717
All hands for America. Added robust debugging
2012-09-11 17:23:07 -04:00
fc8b2096af
Added debugging for Clifford
2012-09-11 17:21:20 -04:00
728a0dd736
Added todo documenting slight inefficiency
2012-09-11 16:24:59 -04:00
e664707076
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 16:03:01 -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
bc355fe7a7
- webstream controller wasn't assigning webstream object properly
2012-09-11 15:10:30 -04:00
8af91f3901
-webstream controller wasn't setting webstream object properly
2012-09-11 15:02:12 -04:00
1635842b81
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-11 00:51:08 -04:00
8db4c94af1
CC-4389: Convert all PHP errors to throw exceptions instead
...
-echo to stdout as well
2012-09-11 00:50:56 -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
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
4fe8407659
Adde configurable value for list_all_files
2012-09-10 16:29:17 -04:00
c90ead9ef2
cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor).
2012-09-10 16:08:08 -04:00
dfb1ffed79
CC-4319: Calendar: Remove all contents doesn't work
...
- fixed
2012-09-10 15:42:05 -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
a8e7cb392a
Sexification 2
2012-09-07 16:59:35 -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
089e896552
fix camelCase of function
2012-09-07 14:34:58 -04:00
33fe2f3467
CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
...
-fixed
2012-09-06 14:10:50 -04:00
744577a8b5
Removed bad line break
2012-09-06 12:38:55 -04:00
3f898bfc3a
Fixed wrong function name
2012-09-06 12:33:04 -04:00
f4591f825f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-06 12:17:39 -04:00
56527e727c
extra debuggin
2012-09-06 12:17:18 -04:00
8d1003bbbe
CC-4303: Library Tab grays out after certain scenario with normal playlist
...
-fixed
2012-09-06 11:48:00 -04:00
bed360cd3e
Formatting
2012-09-06 11:15:01 -04:00
c1bc50c1db
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-05 16:56:14 -04:00
80fa090f13
Uncommented old line of code perhaps it's useful
2012-09-05 16:39:58 -04:00
8ec9ccedf3
CC-4358: Calendar: Show Content: Undefined Index
...
-fixed
2012-09-05 16:07:40 -04:00
f86fa8f945
gotten rid of annoying logging
2012-09-05 15:38:43 -04:00
579180301a
Removed stat caching to make sure is_file is accurate
2012-09-05 15:05:50 -04:00
a731fc147b
CC-4348: Prepared statements - part 4
...
-fixed Show.php
2012-09-04 13:34:05 -04:00
15f750eca5
CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
...
-included webstreams in the allowance type list in the error message
2012-09-04 11:29:23 -04:00
cad0a8fbd7
CC-1665: Scheduled stream rebroadcasting and recording
...
-make sure webstream length is properly updated in browser view after editing
2012-08-31 13:01:22 -04:00
a0a4094332
cc-4304: Small refactoring
2012-08-30 16:00:14 -04:00
417997e617
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 15:23:24 -04:00
a11ec08154
cc-4304: Implemented default behaviour to cascade delete all the files
2012-08-30 15:23:12 -04:00
010ba63d59
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 14:37:08 -04:00
7eefbf3e24
CC-4311: On Air button gets greyed out few seconds after show starts
...
-additional debug info
2012-08-30 14:36:55 -04:00
ea2595d70f
Documeneted funny quirk related to creating a password
2012-08-30 12:26:36 -04:00
7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -04:00
859445c766
CC-3301: Add ability to switch stereo/mono stream in stream settings
...
-fixed
2012-08-29 17:39:24 -04:00
b75f2ab9c7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 16:13:30 -04:00
80258f1fb7
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-fixed for dragging tracks into deleted blocks
2012-08-29 16:13:18 -04:00
7c79aad5f4
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-removed unnecessary exception catch
2012-08-29 16:04:40 -04:00
fe48780932
CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
...
-fixed
2012-08-29 16:00:58 -04:00
f483e271f6
formatting
2012-08-29 14:50:10 -04:00
af3cea464b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 12:58:06 -04:00
46a6a5fc30
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-added in saving behaviour for regular playlists
2012-08-29 12:05:41 -04:00
e796d4c03d
MM2: equal signs sexified
2012-08-29 11:39:42 -04:00
5effb253bf
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-done
2012-08-29 11:38:47 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
699a49a103
CC-4090: Make code style PSR compliant - part 4
...
-controllers dir
2012-08-29 10:54:36 -04:00
3d20ded170
CC-4307: Add "Never show again" to the pop-up registration prompt
...
-done
2012-08-28 17:30:34 -04:00
c67ad44699
Merge branch 'cc-4274' into devel
2012-08-28 17:25:11 -04:00
481616a0d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 17:22:57 -04:00
a0ad9a91ea
CC-1665: Scheduled stream rebroadcasting and recording
...
-Better error logging
-convert minutes > 59 into hours
2012-08-28 17:22:48 -04:00
05908d121f
cc-4274: Fixed bad table name.
2012-08-28 16:23:16 -04:00
33bb4e600c
cc-4274: implemented james' hack to fix this issue.
2012-08-28 16:23:16 -04:00
7ee68c55e0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 16:17:46 -04:00
9d90e8c531
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
...
-done
2012-08-28 16:17:37 -04:00
8249ea8816
CC-1665: Scheduled stream rebroadcasting and recording
...
-small optimization for user auth
2012-08-28 12:38:13 -04:00
219fba9bee
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-28 12:30:45 -04:00
fc67d7f08d
CC-1665: Scheduled stream rebroadcasting and recording
...
-allow user more flexibility for entering length interval (require hours OR minutes)
2012-08-28 12:30:33 -04:00
69b61c4cfe
CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
...
-fixed
2012-08-28 12:13:58 -04:00
7f66bdbb66
cc-4301: Fixed bug where owner_id would be null whenever show is recorded.
2012-08-27 17:58:09 -04:00
583d3837be
cc-3936: formattingk
2012-08-27 17:15:38 -04:00
57020b6e3b
cc-3936: Added warning whenever files that don't exist in db are requested to be deleted.
2012-08-27 16:50:22 -04:00
3fb0fbd73f
CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls
...
-fixed
2012-08-24 19:25:19 -04:00
54db68bb26
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 12:40:39 -04:00
dc8e3da6db
CC-4283: Password Reset: Please let user input username they want to reset
...
-done
2012-08-24 12:40:30 -04:00
dcc9c58577
cc-3936: Sexified equal signs.
2012-08-24 10:20:59 -04:00
36b344a910
cc-3936: remove unneeded garbage.
2012-08-24 10:20:59 -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
a4c579f36e
CC-4254: Library: advanced search on library
...
- bug fix
2012-08-23 10:59:34 -04:00
38173bd3a2
- small fix
2012-08-23 10:19:00 -04:00
442c156458
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed context menu for webstreams
2012-08-22 16:08:51 -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
e9bc0074c0
cleaned up ApiController.php a little bit.
2012-08-22 14:38: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
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
2cdaa186e3
CC-4257: Smart Block: Admin cannot delete DJ user's block
...
-fixed
2012-08-21 15:42:44 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12: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
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
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
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -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
5b134d0055
cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController
2012-08-17 12:37:58 -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
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
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
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
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
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
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
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
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -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
65cb34db4a
CC-1665: Scheduled stream rebroadcasting and recording
...
-webstream preview on show builder working
2012-08-09 18:14:53 -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
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
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
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
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
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
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
361e681a59
CC-84: Smart Playlists
...
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -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
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
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
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
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -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
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
eb4c23b0b6
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
3735579378
-remove cc_access table and gunid usage
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
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
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
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
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
1f603bb75b
cc-4105 : merge devel into my branch
2012-07-19 10:51:04 -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
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
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
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -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
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
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
denise
James
Martin Konecny
Rudi Grinberg
james
Rudi Grinberg
denise
Vladimir