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