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
denise
James
Martin Konecny
Rudi Grinberg
james
Rudi Grinberg