Commit Graph

516 Commits

Author SHA1 Message Date
denise 36c6edcff1 CC-1960: Internationalize Airtime / Support translations
-addded gettext wrapper to string missing it
2012-11-27 12:10:32 -05:00
denise f86cd7d474 CC-1960: Internationalize Airtime / Support translations
-fixed typos
2012-11-27 12:03:38 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations
-fixed typos
2012-11-27 11:59:55 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
denise 4804685dfd CC-1960: Internationalize Airtime / Support translations
-navigation bar was not showing localized text -fixed
2012-11-22 18:15:54 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations
-added language option in preferences
2012-11-21 12:44:50 -05:00
denise c344282e4d CC-1960: Internationalize Airtime / Support translations
-rescan watched folder button was missing
2012-11-21 11:57:41 -05:00
denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LocaleController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
2012-11-20 16:56:18 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
2012-11-20 16:40:02 -05:00
denise 43a797058c -extra quote typo 2012-11-20 11:33:37 -05:00
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-20 11:33:37 -05:00
Rudi Grinberg a69ff167d4 mass string change to _ 2012-11-20 11:33:37 -05:00
Rudi Grinberg 15741bdfa9 renamed links 2012-11-20 11:29:56 -05:00
denise e0b19cc2d1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 11:17:03 -05:00
denise 3f3b939ebe -extra quote typo 2012-11-15 17:28:18 -05:00
denise d83a96a8ec CC-4699: Library -> 'File Import in Progress' is missing loading icon
-fixed
2012-11-15 12:14:25 -05:00
denise b173b6dda4 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper functions for all strings in view/scripts, and forms
2012-11-15 10:59:06 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
Rudi Grinberg f0e2d5d295 mass string change to _ 2012-11-13 15:37:24 -05:00
Rudi Grinberg 925afcc64c renamed links 2012-11-13 15:10:07 -05:00
denise 33e4d6154d CC-4693: Preferences: Bottom save button is not aligned
-fixed
2012-11-12 14:43:44 -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 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 fd3305bc4c SAAS-289: Remove all isSaaS checks
-done
2012-11-06 17:10:47 -05:00
denise 29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button
-fixed
2012-11-06 16:49:36 -05:00
denise e262d48eec CC-4675: Preferences: Error messages are hidden
-fixed
2012-11-06 12:17:45 -05:00
denise de89686d48 CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added comments
2012-11-06 12:03:49 -05:00
denise 2cbba60037 CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
-fixed
2012-11-06 11:54:24 -05:00
James 2e79e8421c CC-4661: Listener Statistics
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
Martin Konecny 12009e95fc Merge branch 'devel' of dev.sourcefabric.org: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:18:33 -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 74fe958cad CC-4661: Listener Statistics
- changes for different mount names
2012-11-02 18:25:08 -04:00
James 3af3cd5870 CC-4661: Listener Statistics
- frontend part
2012-11-02 17:00:38 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference
-added labels
2012-11-02 10:48:08 -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 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
James ef68680868 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:23:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
denise b8039e315a CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length
-done
2012-10-30 13:02:55 -04:00
denise 71291b14f0 CC-4646: Library: Make advanced search options hidden by default
-done
2012-10-30 11:59:52 -04:00
denise 8ac0f41987 CC-4590: New smart block says 'Empty playlist'
-fixed
2012-10-29 11:57:20 -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
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings
-fixed
2012-10-22 16:37:06 -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 d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00