Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10450 commits 3 branches 0 tags 405 MiB
Commit graph

1099 commits

Author SHA1 Message Date
Rudi Grinberg
e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg
5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Martin Konecny
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
James
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
James
74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
Martin Konecny
6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
denise
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
James
3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
Rudi Grinberg
2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg
1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg
ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg
270eb97128 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585 2012-11-01 15:14:53 -04:00
Rudi Grinberg
226bdbf738 added todo 2012-10-31 17:41:50 -04:00
denise
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
denise
2507e0f8a4 CC-4655: DJ's can delete files that they do not own 
-fixed
 2012-10-31 16:51:29 -04:00
denise
fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
james
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
James
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
Rudi Grinberg
dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise
3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
James
58535bef88 CC-4580: No contents in rebroadcast show 
- fixed
 2012-10-19 16:40:32 -04:00
denise
2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise
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
denise
3b5ec6fbe0 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:46:18 -04:00
denise
d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James
45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
denise
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
James
8a93717415 CC-4568: Show preview broken in Now Playing page 
- fixed
 2012-10-16 11:06:01 -04:00
denise
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
denise
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
Rudi Grinberg
89ed6925df removed benchmarking 2012-09-19 16:36:04 -04:00
Rudi Grinberg
20b79374e2 Removed empty method 2012-09-19 10:25:29 -04:00
Rudi Grinberg
33be48e9e3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 18:21:00 -04:00
Rudi Grinberg
a9eefe21fa cc-4304: Add call to save after each file reassignment 2012-09-18 18:20:33 -04:00
denise
92b40bea0c CC-4484: Some js files do not have the airtime version appended 
-fixed
 2012-09-18 17:43:13 -04:00
Martin Konecny
b69f3288d3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 17:22:22 -04:00
Martin Konecny
6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -04:00
James
be214ac126 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:47:48 -04:00
James
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
Rudi Grinberg
72e6ee35fa cc-4304: Temporarily fixed 2012-09-18 15:26:43 -04:00
Martin Konecny
09bc686d99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 12:41:30 -04:00
Martin Konecny
b0f2176329 fix some TODO's in webstream.php 2012-09-18 12:40:44 -04:00
Rudi Grinberg
6fc0d50c9f lined up 2012-09-18 11:46:35 -04:00
Rudi Grinberg
018b50d316 added better logging 2012-09-18 11:45:10 -04:00
Rudi Grinberg
0a83b33a5a Removed extra logging statements 2012-09-18 11:10:54 -04:00
Rudi Grinberg
49e1b29bc9 Removed instances of getLine and getFile 2012-09-18 11:04:33 -04:00
Rudi Grinberg
2e0e0849c5 More clean up 2012-09-18 11:03:34 -04:00
Rudi Grinberg
d90559fdf8 Cleaned up ShowbuilderController 2012-09-18 11:02:41 -04:00
Rudi Grinberg
9c5ebdc4c0 Removed old commented code 2012-09-17 17:02:59 -04:00
Martin Konecny
0e82083ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:55:53 -04:00