Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,032 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1199 Commits

Author SHA1 Message Date
Martin Konecny b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -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 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
denise e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -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 4ee7724149 CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32: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
Martin Konecny 2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
denise 2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
Naomi 3fc6a0fbae Merge branch 'master' into CC-2301 2013-05-02 18:02:09 -04:00
Martin Konecny d902d38429 revert jsonEncode change not supported by older zend versions 2013-05-02 17:50:36 -04:00
Naomi bd1c1fa32f Merge branch 'master' into CC-2301 2013-05-02 16:59:47 -04:00
Martin Konecny ca22a25827 fix silly mistake with echoing json twice 2013-05-02 16:57:07 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
denise 0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
Martin Konecny acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Martin Konecny 0e3b4da52f clear unused function 2013-04-24 15:17:06 -04:00
Martin Konecny 243dda60f8 remove useless comment 2013-04-19 20:25:26 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992: 
Decouple pypo from Airtime install

-first commit
 2013-04-19 20:10:51 -04:00
Martin Konecny 018ec9231e don't print out anything extra after printing json 2013-04-18 16:20:34 -04:00
Martin Konecny 479e69de12 CC-5009: 
Use Silan to silently update track length in the background

-done
 2013-04-18 15:40:33 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise cfee74693b CC-4961: Show linking 
moved move-show to calendar service
 2013-04-05 17:44:30 -04:00
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range 
-fixed
 2013-04-05 15:32:44 -04:00
Martin Konecny fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny 301115c035 CC-5039: Encoded forward slash causing lots of apache error logs 
-fixed: data should have been sent as POST rather than GET
 2013-04-04 15:12:52 -04:00
Martin Konecny d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny a748b05125 CC-5040: 
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
 2013-04-03 17:11:36 -04:00
denise 81dbb17922 CC-4961: Show linking 
-moved show deletion into show service
 2013-04-03 11:46:46 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 731b86b36c Added back editing a repeating show instance feature 2013-03-27 16:25:39 -04:00
denise e259639d1a Removed scheduleController private variable, currentUser 
Removed showService private variable, currentUser
 2013-03-27 09:02:49 -04:00
Martin Konecny ee617c8a70 Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/UserController.php
 2013-03-26 16:34:11 -04:00
Martin Konecny d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny 5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00