Martin Konecny
a6413f2d1a
CC-3336: Refactor schedule API used by pypo
2012-02-28 22:33:19 -05:00
Martin Konecny
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
Martin Konecny
497715df44
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Naomi Aro
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
Martin Konecny
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny
1d02c56874
CC-3336: Refactor schedule API used by pypo
...
-refactored pypo-push
2012-02-28 15:04:24 -05:00
Martin Konecny
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -05:00
Naomi Aro
f39afe9503
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-28 20:58:49 +01:00
Naomi Aro
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Martin Konecny
a53d856e8d
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-28 14:56:21 -05:00
Martin Konecny
99c24ed038
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
James
d8f7cce56e
CC-3346: Recorder will not record shows if calendar is not touched 2
...
hours before the recorder starts
- apiclient should log to correct log file.
2012-02-28 14:45:33 -05:00
James
d4cdac505a
CC-3346: Recorder: Merge recorder with pypo
...
- fixed log message
2012-02-28 14:45:18 -05:00
James
5aabe89069
CC-3346: Recorder: Merge recorder with pypo
...
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
Conflicts:
python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
Martin Konecny
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
james
91ef7f7669
CC-3346: Recorder: Merge recorder with pypo
...
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -05:00
Martin Konecny
413d669bbf
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Daniel
15552319aa
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
Naomi Aro
31abc21aaa
CC-3174 : showbuilder
...
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00
Martin Konecny
39fac2f88a
CC-3336: Refactor schedule API used by pypo
...
-refactored pypo-push
2012-02-28 11:06:31 -05:00
Naomi Aro
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
James
3c9b8e5044
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-28 10:01:14 -05:00
James
ba828a28bc
CC-3346: Recorder will not record shows if calendar is not touched 2
...
hours before the recorder starts
- apiclient should log to correct log file.
2012-02-28 10:00:43 -05:00
Naomi Aro
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +01:00
Naomi Aro
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
Martin Konecny
4514967ccd
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-02-27 21:37:23 -05:00
Martin Konecny
02b878561a
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-27 19:35:11 -05:00
Martin Konecny
428d836d4e
CC-3350: Upgrade 1.8.2 to 2.0.1 doesnt preserve recorded files names when the Airtime stor directory is a symlink
...
-fixed?
2012-02-27 19:34:57 -05:00
James
6eb7372909
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-27 18:10:58 -05:00
Daniel
fc2b18923e
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
2012-02-27 18:09:30 -05:00
James
33b6c2a390
CC-3346: Recorder: Merge recorder with pypo
...
- fixed log message
2012-02-27 18:09:07 -05:00
Naomi Aro
5972aba46e
CC-3174 : showbuilder
...
changing playlist placeholder to be a li item thanks
to a hack on stack overflow.
2012-02-27 23:58:08 +01:00
Daniel
9736fd7deb
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
2012-02-27 17:28:06 -05:00
Naomi Aro
20a82abb23
CC-3174 : showbuilder
...
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
James
f030cf4f67
CC-3346: Recorder: Merge recorder with pypo
...
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
2012-02-27 16:18:10 -05:00
Naomi Aro
99d3699e71
CC-3174 : showbuilder
...
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
Naomi Aro
43d67c921d
CC-3174 : showbuilder
...
adding cue/fade columns to table
fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro
6ecf2f94b0
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-27 20:26:47 +01:00
Naomi Aro
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Martin Konecny
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
Naomi Aro
28759a2d34
CC-3354 : timeline drag and drop
...
changing helper to say just the number of items being moved like gtalk.
2012-02-27 16:01:05 +01:00
Naomi Aro
f01a872bea
CC-3174 : showbuilder
...
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro
318a0345bb
CC-3174 : showbuilder
...
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro
9c248bb34d
CC-3174 : showbuilder
...
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
Naomi Aro
4a02d12600
CC-3174 : showbuilder
...
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
Naomi Aro
8ae303de83
CC-3174 : showbuilder
...
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
Naomi Aro
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +01:00
Naomi Aro
36cf8ded18
CC-3174 : showbuilder
...
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
james
38c16df138
CC-3346: Recorder: Merge recorder with pypo
...
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-25 09:44:33 -05:00
james
793c72b09c
CC-3357: Upgrade script to 2.0.2 doesn't work
...
- It was deleting /user/lib/airtime after it installs virtualenv. rm comand is
ran before anything.
2012-02-24 21:02:54 -05:00