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
denise
bf2e5c6f32
Fixed Typo in user rights
2013-01-08 11:57:05 -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
251e1a52d6
Removed a function no longer in use
2013-01-07 14:12:31 -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
denise
8142427668
Small formatting fix
2013-01-04 18:18:58 -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
495fd7da1a
CC-4734: French - UI breaks in several places
...
-fixed
2013-01-04 17:19:09 -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
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
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
0f4ddc904f
CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens
...
- fixed
2013-01-03 14:54:07 -05:00
denise
59f3826055
CC-4725: Have a "share" button on the popup player
...
-done
2013-01-03 13:13:27 -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
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
93ea912d54
CC-4774: Add option for Chinese in preferences
...
-done
2013-01-02 11:50:10 -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
james
cf38e2c596
CC-4754: Replay gain modifier
...
- done
2012-12-27 22:58:41 -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
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
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
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -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
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
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
denise
1846f17bbc
CC-4731: Cannot save support feedback settings
2012-12-04 16:21: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
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
b2699fa914
merge from devel
2012-12-03 11:06:56 -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
James
4ad9e28e14
CC-1960: Internationalize Airtime / Support translations
...
- korean lang pack
2012-11-29 10:31:13 -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
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
7cc4c88f2f
CC-1960: Internationalize Airtime / Support translations
...
- css change for close icon
2012-11-27 13:34:54 -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
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
c6a5db4a78
CC-1960: Internationalize Airtime / Support translations
...
-dashboard was missing a translation - fixed
2012-11-23 10:48:44 -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
denise
96b87d23e0
CC-1960: Internationalize Airtime / Support translations
...
-added i18n for plupload
2012-11-22 14:37:54 -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
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
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
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
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
Martin Konecny
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
Martin Konecny
d1a22fe7ca
CC-4677: Improve Smart block repeat description
...
-fixed
2012-11-15 11:30:56 -05:00
James
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -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
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
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
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
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
denise
a1a7396ec9
CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
...
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -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
denise
78e731f717
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-05 12:03:59 -05:00
denise
8fda0ba610
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:03:46 -05:00
denise
c051e0671d
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:00:37 -05:00