Commit Graph

3970 Commits

Author SHA1 Message Date
denise 1c0d8abd4c CC-4807: Names of languages need to be localized
-done
2013-01-11 14:44:14 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
denise f80f0dddd7 Listenerstat ajax call was missing baseUrl 2013-01-11 13:18:57 -05:00
Martin Konecny 89274e43b3 fix spelling mistake 2013-01-11 13:17:08 -05:00
Martin Konecny c11edea253 CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one
-fixed
2013-01-11 13:13:36 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
denise a129b0b081 CC-4472: User password verify or clear text display.
-done with password verify
2013-01-10 17:51:25 -05:00
denise 86f57cb953 CC-4820: I18N: Date and Time picker of Record/rebroadcast show is not translated
-fixed
2013-01-10 16:30:04 -05:00
denise 4673f11d76 Default language to english when cookie is not set 2013-01-10 15:06:45 -05:00
denise 954b65fa41 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:58:02 -05:00
denise 6fe8006612 Jquery cookie plugin 2013-01-10 14:57:47 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise b2d709052e Modified show is partially filled icon 2013-01-10 14:26:39 -05:00
Martin Konecny e0b71568b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:24:51 -05:00
Martin Konecny 0e217dfb38 CC-4798: Need a 'show is partially filled' icon 2013-01-10 14:24:43 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation
-fixed
2013-01-10 14:22:25 -05:00
denise a0be1c647e CC-4786: Refresh page when language setting changes
-configure localization and reinitiliaze edit user form after the user locale is set
2013-01-10 14:01:03 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes
-done
2013-01-10 13:55:52 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain
- done
2013-01-10 13:49:41 -05:00
denise c20ed7ebad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 12:04:44 -05:00
denise 690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00
James 4bf9ab60d9 CC-4819: Tracks length in Scheduler is 0.0 all the time
- fixed in better way
2013-01-10 11:49:02 -05:00
denise 0aeea61006 CC-4822: Cannot preview playlist
-fixed
2013-01-10 10:52:39 -05:00
denise 1100baefbc CC-4823: Locale cookie doesn't get set after user logs in
-fixed
2013-01-10 10:37:30 -05:00
james 594a38da16 CC-4770: Playlist's length doesn't counts Webstream and Smartblock in
- the bug was introduced by CC-4668
- fixed
2013-01-09 22:53:29 -05:00
james 3a72302a3c CC-4819: Tracks length in Scheduler is 0.0 all the time
- fixed
2013-01-09 22:19:39 -05:00
denise 20f7544552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 18:03:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page
-done
2013-01-09 18:03:23 -05:00
Martin Konecny a5e7c0197f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 15:52:45 -05:00
Martin Konecny 58fc8ecee7 CC-4766: Invalid date appears during setting show's time and date 2013-01-09 15:52:35 -05:00
cliff.wang 2dc7d35f57 Update Chinese translation files 2013-01-09 15:32:18 -05:00
denise 7866b8a0cb Small fix to select box sizes 2013-01-09 15:11:22 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference
-done
2013-01-09 13:38:38 -05:00
denise f887ca3d8d CC-4813: Users -> Do not save username on User Management page
-fixed
2013-01-09 13:25:18 -05:00
denise 26ab0fb468 CC-4809: Listen popup UI breaks with localization
-added comment
2013-01-08 17:56:05 -05:00
denise 03da2aee80 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:51:58 -05:00
denise 3b2b275c30 CC-4809: Listen popup UI breaks with localization
-fixed
2013-01-08 17:51:42 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
- done
2013-01-08 17:32:27 -05:00
denise 22e4811b22 Add gettext wrapper function to string missing it 2013-01-08 16:51:11 -05:00
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file
-fixed
2013-01-08 16:47:00 -05:00
denise 87bfc81ca0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:53:33 -05:00
denise 6097196dd7 CC-4813: Users -> Do not save username on User Management page
-fixed
2013-01-08 15:52:56 -05:00
James 6d48e1faf0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:52:33 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
- fixed
2013-01-08 15:52:11 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library
-fixed
2013-01-08 15:42:35 -05:00
Martin Konecny 0612a595c9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:14:42 -05:00
Martin Konecny 178abcfada CC-4785: Zend errors on page not found
-partially fixed
2013-01-08 15:14:33 -05:00
denise a7992c291e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:09:55 -05:00
denise 3de33bc3e3 CC-4811: Move the edit user form to its own page
-done
2013-01-08 15:09:35 -05:00
Martin Konecny c632ad00f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:37:53 -05:00
Martin Konecny add51bd735 -update plupload from 1.5beta to 1.5.4 2013-01-08 12:37:37 -05:00
James 45e3fccae2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:31:22 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
- fixed
2013-01-08 12:31:14 -05:00
cliff.wang 8ce646fcc7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 11:58:40 -05:00
cliff.wang 2078a4ffa3 Updated Simple Chinese language files 2013-01-08 11:57:47 -05:00
denise bf2e5c6f32 Fixed Typo in user rights 2013-01-08 11:57:05 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting
-fixed
2013-01-07 18:18:40 -05:00
James de980d21ea Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:15:12 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI
- fixed
2013-01-07 18:14:57 -05:00
denise e9a86b7bcf CC-4799: Calendar -> Show empty and show partially filled icons need qtips
-fixed
2013-01-07 17:26:40 -05:00
denise 1f1b408c6e CC-4803: Calendar -> Soundcloud id is always null
-fixed
2013-01-07 17:21:35 -05:00
denise cffad91840 CC-4800: Soundcloud icon qtips do not work and have wrong colour scheme
-fixed
2013-01-07 15:23:51 -05:00
denise 67df511ab8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 14:12:39 -05:00
denise 251e1a52d6 Removed a function no longer in use 2013-01-07 14:12:31 -05:00
James 51425d451f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 13:49:09 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
- fixed
2013-01-07 13:48:51 -05:00
denise 19e1c9bd9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 12:41:45 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
James 0542e713ed CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu
- fixed
2013-01-07 12:20:07 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
Daniel James a2c1b9c699 Clarify label on default interface language preference 2013-01-07 11:05:38 +00:00
Daniel James 053418d7ac Added missing colon to the end of 'Language' 2013-01-07 10:42:16 +00:00
denise 8142427668 Small formatting fix 2013-01-04 18:18:58 -05:00
denise 5d361db730 Small localization(Spanish) change 2013-01-04 18:17:03 -05:00
denise 3c969b0aef Removed useless code 2013-01-04 18:16:47 -05:00
denise 02a1199386 CC-4734: French - UI breaks in several places 2013-01-04 17:27:58 -05:00
denise fc4ccb4798 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
2013-01-04 17:21:46 -05:00
denise 495fd7da1a CC-4734: French - UI breaks in several places
-fixed
2013-01-04 17:19:09 -05:00
James a145dcda06 - localization(Korean) fix 2013-01-04 14:47:17 -05:00
Daniel James f3f753cf60 Janitorial fixes to .po and .mo files 2013-01-04 17:55:01 +00:00
Daniel James c5f1d4a568 Removed bogus extra comma 2013-01-04 17:30:51 +00:00
denise 02ac909430 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:39:04 -05:00
Martin Konecny cf860bfe3c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:40:40 -05:00
Martin Konecny 10efbee530 CC-4784: Load CSS before javascript
-fixed
2013-01-04 11:40:32 -05:00
denise 32fd92c892 CC-4787: Edit User: Don't save username field
-fixed
2013-01-04 11:38:49 -05:00
denise 7e1efe5d96 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:00:36 -05:00
denise 596e103d96 CC-4763: Alignment error for User settings UI in Firefox
-fixed
2013-01-04 11:00:21 -05:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page
- CRLF
2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page
- done
2013-01-03 17:58:50 -05:00
denise 64116c7bff CC-4779: Library -> Metadata tooltip -> Some words get wrapped in different languages
-fixed
2013-01-03 16:56:04 -05:00
denise 7ea649e063 CC-4783: Username on the edit user form should be readonly
-done
2013-01-03 16:27:05 -05:00
denise c11032111e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 16:19:20 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis
-done
2013-01-03 16:19:02 -05:00
James 1f7e0ce042 CC-4782: Replay Gain modifier adds horizontal scroll bar when set to +10dB
- fixed
2013-01-03 14:58:29 -05:00
James 0f4ddc904f CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens
- fixed
2013-01-03 14:54:07 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00
denise 59f3826055 CC-4725: Have a "share" button on the popup player
-done
2013-01-03 13:13:27 -05:00
denise e9bd63b163 Updated German .po file 2013-01-03 11:22:45 -05:00
denise 1d6150b1a5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:27:56 -05:00
denise cd252d357d CC-4777: Edit Metadata: Remove second title
-done
2013-01-02 16:27:35 -05:00
Martin Konecny d41c248435 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:24:12 -05:00
Martin Konecny f7bcc8a4ed Merge branch 'patch-2' of https://github.com/havban/Airtime into devel 2013-01-02 16:24:04 -05:00
denise c05f465047 CC-4772: L10N -> Korean: "Scheduled Play" in the Dashboard is not translated in Korean version
-fixed
2013-01-02 16:20:09 -05:00
Martin Konecny 25df87d2e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:09:39 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed
-fixed
2013-01-02 16:09:32 -05:00
denise 3f7a1189f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:08:58 -05:00
denise 44ab27ad7d CC-4773: L10N: Some strings is not listed in airtime.po
-added missing file extension error message to plupload language files
2013-01-02 16:08:38 -05:00
denise 05eee37f20 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:04:37 -05:00
denise 88f2f1e4a7 CC-4773: L10N: Some strings is not listed in airtime.po
-fixed
2013-01-02 16:04:19 -05:00
cliff.wang cdb3ec468a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 12:15:05 -05:00
cliff.wang 306282521a Add Chinese pulp upload translation file 2013-01-02 12:14:22 -05:00
denise a725148832 CC-4775: Add option for Italian language in preferences
-done
2013-01-02 12:10:16 -05:00
denise 0ab56c831d Updated header info of Chinese .po file 2013-01-02 12:01:26 -05:00
denise 994cbce503 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 11:50:34 -05:00
denise 93ea912d54 CC-4774: Add option for Chinese in preferences
-done
2013-01-02 11:50:10 -05:00
James 3cad875d0c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 11:43:14 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
- fixed
2013-01-02 11:41:33 -05:00
denise f8cbd27da3 CC-4746: Russian - UI breaks in several places
-fixed
2013-01-02 11:29:41 -05:00
denise 0dc602ad8e CC-4746: Russian - UI breaks in several places
-fixed
2013-01-02 11:17:24 -05:00
denise c0cba93355 CC-4749: Spanish: UI breaks with localization
-fixed
2013-01-02 10:56:51 -05:00
James 5e42695718 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-28 16:20:21 -05:00
James 1dfe99224c CC-4754: Replay gain modifier
- adding text
2012-12-28 16:18:47 -05:00
James f26778ee72 CC-4757: Duplicate playlist
- done
- we still need a icon for context menu
2012-12-28 16:17:58 -05:00
cliff.wang 69ff8f3acd Add Simple Chinese language files 2012-12-28 11:11:53 -05:00
James 6e77f2637a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-28 10:59:03 -05:00
james 4aae3ba51b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-27 22:59:05 -05:00
james cf38e2c596 CC-4754: Replay gain modifier
- done
2012-12-27 22:58:41 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
Martin Konecny ee8dde07c8 add support for AAC input streams 2012-12-27 17:18:47 -05:00
james c0665e4748 CC-4754: Replay gain modifier
- Initial commit
2012-12-27 00:36:11 -05:00
denise a4008aaef3 CC-4721: Library -> Context Menu -> 'Add to smart block' option only takes affect once the open smart block has been saved 2012-12-19 15:01:53 -05:00
denise 274b1f7562 CC-4743: Make user rights description localizable 2012-12-17 16:53:43 -05:00
denise adae81bffa CC-4747: Add User page -> Typo on form labels 2012-12-17 16:53:18 -05:00
denise 0324d48e06 CC-4747: Add User page -> Typo on form labels 2012-12-17 16:52:08 -05:00
denise 854537f387 CC-4745: Add Russian language option to preferences 2012-12-17 14:33:14 -05:00
denise bd18039785 CC-4744: Edit user form needs styling
-done
2012-12-17 14:12:27 -05:00
Daniel James a2d0f98a62 Added Russian localization files 2012-12-14 09:54:42 +00:00
denise 8b76bd0373 CC-2258: Describe rights for each user type on the user page
Modified user rights descriptions
2012-12-13 15:29:29 -05:00
denise 8125337c4a Changed the opacity of user rights tipsy tooltip 2012-12-13 12:58:26 -05:00
denise 076a1c56cb CC-2258: Describe rights for each user type on the user page 2012-12-13 12:29:02 -05:00
denise 2bebe7f025 Modified jquery tipsy css 2012-12-11 18:08:37 -05:00
denise 854eccfb76 CC-4736: Let non-admin users update their user info
Adding jquery tipsy plugin
2012-12-11 11:30:59 -05:00
denise f12547dfb4 CC-4736: Let non-admin users update their user info
new form
2012-12-10 16:56:25 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info
-done but needs design
2012-12-10 16:55:44 -05:00
denise e6cc0c3417 Corrections to French .po file: recompiled .mo file 2012-12-10 11:28:27 -05:00
denise 713c3e82e4 Corrections to French .po file 2012-12-10 11:22:59 -05:00
Febiansyah Hidayat 5e9d5bd71a Update airtime_mvc/public/js/airtime/preferences/streamsetting.js
Update statement to remove "disabled" attribute to be compatible with chrome and firefox browser.

Perform commit in devel branc as requested in: https://github.com/sourcefabric/Airtime/pull/21#issuecomment-11144375
2012-12-08 09:25:19 +09:00
James e5edfd15f2 - Korean Lang pack fix 2012-12-05 17:43:29 -05:00
James efa5f6ff6c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-05 13:29:48 -05:00
James e1e8160e53 CC-4737: Listener stats should take up the full screen
- fixed
2012-12-05 13:29:29 -05:00
denise 402950211a CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-removed redundant 'Ok' button
2012-12-05 13:23:58 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-cancel button does not reload the page anymore
2012-12-05 13:21:18 -05:00
denise 8e6dd6f862 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-05 13:16:40 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page
-done
2012-12-05 13:16:25 -05:00
Daniel James 343c0922a2 Added United States and Great Britain localizations 2012-12-05 11:43:34 +00:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise 844246df3a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 15:30:56 -05:00
denise ee086fe43a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 14:46:06 -05:00
denise fde74105de CC-4729: Register dialog is missing title 2012-12-04 14:33:45 -05:00
denise e69bd74d6e -adding german translation files for datatables and plupload plugins 2012-12-04 12:14:35 -05:00
denise 7c046bd0cc -adding spanish translation file for plupload plugin 2012-12-04 12:14:01 -05:00
denise a10f8276db -added spanish .po, and.mo files
-added spanish translation files for datatables and plupload
2012-12-04 12:08:23 -05:00
denise 83ae677301 -added german, and spanish locales into locale table 2012-12-04 12:07:29 -05:00
Daniel James d33e93da2e Added initial German localization 2012-12-04 13:22:25 +00:00
Daniel James 6a0d669100 Added language and copyright header to French translation 2012-12-04 12:57:01 +00:00
denise 4515ac2aef - added french .po file
- added french translations for datatables and plupload plugins
2012-12-03 18:15:08 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax
-done
2012-12-03 17:15:47 -05:00
denise ab55bb73bb CC-4683: System -> Preference: Save button is old style
-support feedback form also had old button style
2012-12-03 14:51:21 -05:00
denise 155f1eae11 CC-4683: System -> Preference: Save button is old style
-done
2012-12-03 11:57:01 -05:00
denise 127d0187b7 CC-4706: Calendar -> Context menu -> Show content does not work
-fixed
2012-12-03 11:45:06 -05:00
Daniel James e54f8db7d6 Added copyright and contact headers to gettext files 2012-12-03 14:36:47 +00:00
Martin Konecny b474035d76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/common/DateHelper.php
	airtime_mvc/public/js/airtime/library/library.js
2012-11-30 18:01:02 -05:00
martin 70511746d0 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-11-30 17:58:00 -05:00
denise 2f0c6b702a CC-1960: Internationalize Airtime / Support translations
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
denise 81c9b4d862 CC-1960: Internationalize Airtime / Support translations
-added a template po file for translations
2012-11-29 11:47:11 -05:00
denise dfc7bbbd5a CC-1960: Internationalize Airtime / Support translations
-small change to en_CA po file
2012-11-29 11:32:25 -05:00
denise 0e3525180e CC-1960: Internationalize Airtime / Support translations
-added default locale into cc_pref
2012-11-29 10:57:59 -05:00
denise 260c6aea59 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-29 10:50:01 -05:00
denise 7a4e871495 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-29 10:47:17 -05:00
denise b50ed74fe9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-29 10:46:35 -05:00
James 4ad9e28e14 CC-1960: Internationalize Airtime / Support translations
- korean lang pack
2012-11-29 10:31:13 -05:00
denise b674cb9b01 CC-1960: Internationalize Airtime / Support translations
-revised .po file
2012-11-28 16:54:29 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
2012-11-28 11:54:22 -05:00
denise e475c2e99e CC-1960: Internationalize Airtime / Support translations
-overwrote zend from stringLength validator
2012-11-27 17:28:27 -05:00
denise ac0e1d07be Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 17:11:43 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
James 1196c1c07c Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 15:56:04 -05:00
James 8acc8fce76 CC-1960: Internationalize Airtime / Support translations
- fixed close button on show add form
2012-11-27 15:55:32 -05:00
denise 37ce75f686 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 15:52:14 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
James 1ce448b50b Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 13:35:09 -05:00
James 7cc4c88f2f CC-1960: Internationalize Airtime / Support translations
- css change for close icon
2012-11-27 13:34:54 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations
-unlocalized some strings
2012-11-27 12:33:43 -05:00
denise c4062f7770 CC-1960: Internationalize Airtime / Support translations
-fixed javascript strings
2012-11-27 12:31:21 -05:00
denise 0a642fc717 CC-1960: Internationalize Airtime / Support translations 2012-11-27 12:23:16 -05:00
denise d2ed927e65 CC-1960: Internationalize Airtime / Support translations
-playout history datatable was missing translation table
2012-11-27 12:17:59 -05:00
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 3b124e6f5d CC-4668: Blocks/Playlists: Length includes deleted tracks
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
denise ae15a47bc5 CC-1960: Internationalize Airtime / Support translations
-added .po file
2012-11-26 14:22:15 -05:00
denise af70f241d2 CC-1960: Internationalize Airtime / Support translations
-updated. po  file
2012-11-26 14:19:13 -05:00
denise ddb6289c87 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 16:54:39 -05:00
denise 04f6ae5c1a CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-11-23 16:53:51 -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
martin 5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin 75adf9b6a1 CC-4701: same webstream played twice in a row does not work.
-fixed
2012-11-23 14:03:31 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -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
James da6013b523 CC-4717: Lintian warnings from devel branch
- fixed
2012-11-22 15:14:55 -05:00
James 87d0383533 CC-4703: Now Playing duration column ignores any cue point set
- fixed
2012-11-22 14:37:57 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations
-added i18n for plupload
2012-11-22 14:37:54 -05:00
Martin Konecny 2fa8f05c3c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 11:40:55 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
-fixed
2012-11-22 11:40:44 -05:00
James acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden
- fixed
2012-11-22 11:18:42 -05:00
denise 9a1a7b2e97 CC-1960: Internationalize Airtime / Support translations
-added locale directory structure under airtime_mvc
2012-11-22 11:09:24 -05:00
Daniel James a819b20f55 Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files 2012-11-22 15:37:08 +00:00
James 8483439551 CC-4709:
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
2012-11-22 10:29:40 -05:00
James dcc9a192d1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 10:15:35 -05:00
denise c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -05:00
denise 993d3fda7b CC-1960: Internationalize Airtime / Support translations
-set locale based on user's preference
2012-11-21 16:41:54 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 14:17:46 -05:00
denise 7a9f01458c CC-1960: Internationalize Airtime / Support translations
-fixed langauge label on preferences page
2012-11-21 12:46:52 -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 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
denise df6d199b60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-21 10:52:52 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 10:19:21 -05:00
James 4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule
- fixed
2012-11-20 18:03:13 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -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
Martin Konecny 9abd7fa431 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 16:48:17 -05:00
denise 06c3dcb69e CC-1960: Internationalize Airtime / Support translations
-added jquery.i18n library
2012-11-20 16:43:42 -05:00
denise e9b9f63630 CC-1960: Internationalize Airtime / Support translations
-added english translation file for datatables
2012-11-20 16:42:06 -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
James 8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James 3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly
- fixed
2012-11-20 16:38:43 -05:00
Martin Konecny fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Rudi Grinberg 3a682aeada cc-4585: fixed + added logging 2012-11-20 15:25:41 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg 20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists
- add delayed removing of success message
2012-11-20 15:05:09 -05:00
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
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description
-fixed
2012-11-15 11:30:56 -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
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save
-fixed
2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
-fixed
2012-11-12 11:45:26 -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
denise f623445b0d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:34:19 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-11-06 16:34:06 -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