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

4178 commits

Author SHA1 Message Date
Martin Konecny
72cfe62de9 more persistent links (won't be invalid if title changes) 2013-05-17 13:19:40 -04:00
denise
f4d313a67c Hungarian translation locale option 2013-05-16 12:50:12 -04:00
denise
3010d014b4 Hungarian translation 2013-05-16 12:47:40 -04:00
Martin Konecny
3208ab0fd1 Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2 2013-05-16 12:28:23 -04:00
cliff.wang
70b734c940 Update Chinese po file 2013-05-16 11:16:36 -04:00
Martin Konecny
ca6442f7f0 ensure we are parsing in base 10 2013-05-15 17:18:52 -04:00
Martin Konecny
05dc0b7dbc added comments, remove deprecated code, better var names... 2013-05-15 16:44:36 -04:00
Martin Konecny
018c88d12a CC-5063: 
"Nothing Scheduled" appears between 2 scheduled tracks

-fixed
 2013-05-15 16:43:58 -04:00
denise
148e1b9e46 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:48:04 -04:00
denise
5a86bd9ac4 CC-5149: Linked show: Regular show will be treat as linked show in some case 
A new form was not getting sent to the user properly after a show creation
 2013-05-15 15:47:45 -04:00
Naomi
10154ae724 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:39:07 -04:00
Naomi
b0cdc606f8 CC-5096 : Add "i" (info) icon to stream output type 2013-05-15 15:38:46 -04:00
denise
491ea6a32c CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Made some small optimizations. Still needs more work.
 2013-05-15 15:32:29 -04:00
denise
f3edc2bee6 CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library 
Fixed so it doesn't update files that are scheduled in other shows
 2013-05-15 12:38:48 -04:00
denise
254ebb709e CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library 2013-05-15 11:25:30 -04:00
Martin Konecny
b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -04:00
Martin Konecny
5080807a21 IM-629 
-fix minor SQL syntax error
 2013-05-14 19:18:41 -04:00
Martin Konecny
b287409bfb IM-629 
-not using show_instnace_filter POST param correctly
 2013-05-14 19:18:30 -04:00
Martin Konecny
bb36556bb9 IM-629 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
 2013-05-14 19:18:08 -04:00
Naomi
393c8abb95 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 18:14:51 -04:00
Naomi
7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Martin Konecny
af7b2d5347 IM-629 
-fix using instance id instead of show id
 2013-05-14 17:18:20 -04:00
Martin Konecny
992e3c37ef IM-629 
-add missing POST parameter
 2013-05-14 17:18:11 -04:00
Martin Konecny
22a12dd1a9 IM-629 
-show only single show at a time
 2013-05-14 17:18:03 -04:00
Martin Konecny
43e825fe49 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:57:28 -04:00
Naomi
78187a72ac Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:52:24 -04:00
Naomi
74c0e390b6 CC-5147 : check builder feed on now playing page updating when not needed 
wrong timestamp used when changing to prepared statement.
 2013-05-14 16:51:34 -04:00
Martin Konecny
70a8d3d5dd CC-5146: 
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast

-fixed
 2013-05-14 16:16:58 -04:00
denise
8901d6b4d9 Committing new compiled .po files 2013-05-14 16:14:19 -04:00
denise
ec87a8ff88 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:09:22 -04:00
denise
e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -04:00
Naomi
809d5a35b9 CC-5108 : Waveform Editor UI 
changing colour to be less dark. can better see highlights/drawn fades.
 2013-05-14 15:49:13 -04:00
Naomi
0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
denise
2d09ba3a16 CC-4863: I18N:System -> Listener status: string is not translated 2013-05-14 11:50:01 -04:00
denise
4ee7724149 CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32:21 -04:00
denise
c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
denise
bfd525395a Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 08:59:30 -04:00
denise
9377e21293 Removed unnecessary function call when editing a show 2013-05-14 08:59:21 -04:00
Naomi
d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi
872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
Naomi
2ba743a436 CC-5132 : Playlist Editor: Add file before Smart Block will cause exception 2013-05-13 12:23:05 -04:00
Naomi
bd2462170b CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-13 11:42:11 -04:00
denise
6b560eede1 Deleted unused functions in Show.php 2013-05-13 09:55:17 -04:00
denise
741507fab1 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-13 09:22:50 -04:00
denise
ba82e3b3ae Added missing localization files for en_GB, and de_AT 2013-05-13 09:22:40 -04:00
Naomi
82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi
da46757e28 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 17:36:18 -04:00
Naomi
b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
denise
27b79c2e91 CC-5128: Library -> Do not auto sort by scheduled 2013-05-10 16:17:30 -04:00
denise
a9d0b53954 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 16:08:07 -04:00