denise
22bfc45497
CC-1960: Internationalize Airtime / Support translations
...
-defined translations for show builder datatable
2012-11-27 15:51:50 -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
denise
96b87d23e0
CC-1960: Internationalize Airtime / Support translations
...
-added i18n for plupload
2012-11-22 14:37:54 -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
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
Martin Konecny
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
denise
a201d6f2da
CC-4666: Showbuilder page is dead
...
-fixed. result of a bad merge
2012-11-05 11:15:26 -05: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
2854dd40e0
CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error
...
-fixed
-tracks with undefined mime type were not handled properly
2012-11-02 16:54:49 -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
715a21acb2
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-upgraded bootstrap-dropdown.js to v2.2.1
2012-11-02 11:59:36 -04:00
denise
a937df30ad
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-02 10:48:16 -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
James
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
James
d7a5ab4d94
CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu
...
- fixed
2012-11-01 15:21:56 -04:00
denise
dfd52eedf1
CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
...
-fixed
2012-10-31 15:24:50 -04:00
james
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -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
denise
00947f9d7e
CC-4640: Automatically jump to current song when loading the Now Playing page.
...
-small fix
2012-10-30 15:34:38 -04:00
denise
cabe583a3b
CC-4649: Library -> Disable simple search if advanced search fields are open
...
-done
2012-10-30 15:01:46 -04:00
denise
695c0fa926
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-10-30 11:45:53 -04:00
denise
b08f5091b5
CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
...
-done
2012-10-30 11:18:11 -04:00