Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10314 commits 3 branches 0 tags 405 MiB
Commit graph

3728 commits

Author SHA1 Message Date
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