Commit graph

3196 commits

Author SHA1 Message Date
denise
57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
denise
b801235c99 CC-1960: Internationalize Airtime / Support translations
-added gettext function to strings in layout/scripts
2012-11-20 11:33:37 -05:00
denise
43a797058c -extra quote typo 2012-11-20 11:33:37 -05:00
denise
a76b9b305f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
denise
2ce530c5bd CC-1960: Internationalize Airtime / Support translations
- fix to some controller strings
2012-11-20 11:33:37 -05:00
denise
9958d8da9f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings in layout, and common
2012-11-20 11:33:37 -05:00
denise
8338152876 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all navigation strings
2012-11-20 11:33:37 -05:00
denise
5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
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
Martin Konecny
fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
denise
e0b19cc2d1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 11:17:03 -05:00
denise
8c49540d3d CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:16:10 -05:00
Martin Konecny
9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00
denise
97e94269c5 CC-1960: Internationalize Airtime / Support translations
-added gettext function to strings in layout/scripts
2012-11-16 13:59:51 -05:00
denise
3f3b939ebe -extra quote typo 2012-11-15 17:28:18 -05:00
Martin Konecny
7efa7169ca CC-4700: Return mime type of streams instead of null
-fixed
2012-11-15 16:41:46 -05:00
denise
ef626a71b1 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper to all strings in models
2012-11-15 15:52:51 -05:00
denise
d7495c6937 CC-1960: Internationalize Airtime / Support translations
- fix to some controller strings
2012-11-15 14:05:36 -05:00
denise
4f40efa376 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings in layout, and common
2012-11-15 13:49:44 -05:00
denise
5ba9df9e90 CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all navigation strings
2012-11-15 13:24:30 -05:00
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
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
denise
a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
-fixed
2012-11-12 14:28:50 -05:00
denise
c0e54c64cd CC-4685: System -> User: Unique username error
-fixed
2012-11-12 12:29:07 -05:00
James
6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James
33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James
628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
2012-11-08 17:26:55 -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
ccd6447696 - install failed due to wrong metadata key
- wrong controller action called
2012-11-07 12:05:20 -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
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
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
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
denise
a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
-fixed
2012-11-06 11:14:40 -05:00
James
8e69e50eea Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
Conflicts:
	airtime_mvc/application/models/ListenerStat.php
2012-11-06 11:06:58 -05:00
denise
6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks
-fixed
2012-11-06 10:58:25 -05:00