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

1920 commits

Author SHA1 Message Date
denise
105325994f CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-15 12:55:45 -05:00
James
2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
James
d8165cbf44 - haproxy support subdomain name with '.' 2012-11-13 16:32:36 -05:00
denise
c0e54c64cd CC-4685: System -> User: Unique username error 
-fixed
 2012-11-12 12:29:07 -05:00
Martin Konecny
ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -05:00
James
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
James
9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
denise
bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page 
-fixed
 2012-11-07 15:17:47 -05:00
denise
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
Martin Konecny
272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Martin Konecny
fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny
38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
James
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
Martin Konecny
3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
James
9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise
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
Martin Konecny
d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
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
Martin Konecny
c1b2978fba disable rabbitmq status on SaaS 2012-10-25 17:50:43 -04:00
James
b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
Martin Konecny
3c61b39daa Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2012-10-23 16:09:55 -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
4ad8ee2472 - removing a line for saas 2012-10-18 14:32:56 -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