Commit graph

7624 commits

Author SHA1 Message Date
Martin Konecny
bed2a0731b fix potential exception 2012-07-11 10:39:23 -04:00
Martin Konecny
82d4ee09ae CC-4059: airtime-test-stream -h option not shown in help text
-fixed
2012-07-10 23:25:35 -04:00
Martin Konecny
35655f9462 -no longer require "cell_phone" column for 2.1.3 upgrade 2012-07-10 19:05:27 -04:00
James
24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.
2012-07-10 17:24:57 -04:00
James
f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James
39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 17:09:21 -04:00
Martin Konecny
f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny
6d98cca9c3 SAAS-270: Apache2 errors on SaaS
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
James
d90d83200e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 15:12:27 -04:00
James
62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 15:11:59 -04:00
denise
69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase
-removed live chat popup
2012-07-10 15:09:28 -04:00
denise
0171212e9b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:19:19 -04:00
denise
81eb751c9f - shortened height on Add/Remove content dialog window 2012-07-10 13:19:03 -04:00
James
df5cc8aa38 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:09:12 -04:00
James
78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
context menu

- fixed
2012-07-10 13:08:36 -04:00
Martin Konecny
2e5b1d9ca8 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-fixed
2012-07-10 10:48:44 -04:00
Martin Konecny
aecee0574d Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
2012-07-09 18:58:22 -04:00
James
b7ca858506 CC-3921: Add mobile phone number field to user record
- added a line to upgrade.sql which takes care of db upgrade
2012-07-09 16:50:51 -04:00
James
63856ea918 CC-4079: Apache error: missing $startDt variable
- fixed
2012-07-06 15:40:16 -04:00
James
31f1d5879e CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
- done
2012-07-05 18:24:07 -04:00
Cliff
d8e0466721 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-05 15:22:37 -04:00
Cliff
7f6828024f add support for precise 64&32, and will change the filename to liquidsoap_*_amd64/i386 2012-07-05 15:15:27 -04:00
denise
6d056daa2f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 18:23:04 -04:00
denise
87afea63bf CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
-fixed
2012-07-03 18:22:48 -04:00
Martin Konecny
00745d372d CC-4058: Timeline -> Cannot add song twice if last cursor is selected
-fixed
2012-07-03 17:06:35 -04:00
Martin Konecny
42f4757288 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 16:43:40 -04:00
Martin Konecny
7f66d735a1 fix spelling 2012-07-03 16:43:33 -04:00
Martin Konecny
619f17b2f9 fix indentation 2012-07-03 16:43:24 -04:00
Martin Konecny
0286aa364e 2.1.3 preparation 2012-07-03 16:43:10 -04:00
denise
8a394f752b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 14:52:53 -04:00
denise
f6d79b1f54 CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
-fixed
2012-07-03 14:52:27 -04:00
james
4384c978b0 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-03 13:33:26 -04:00
james
7342ea4d4b CC-4053: Widget not showing correct day on Sunday
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
denise
e11fe8a2b8 CC-4058: Timeline -> Cannot add song twice if last cursor is selected
-fixed
2012-07-03 12:42:53 -04:00
denise
bc569462ee CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
-fixed
2012-07-03 11:48:57 -04:00
denise
46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
-fixed
2012-06-29 16:59:03 -04:00
James
32350c5246 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-29 16:07:17 -04:00
James
06ac33b130 CC-4052: Pypo: it's not manually grabbing schedule when it times out.
- fixed
2012-06-29 16:07:03 -04:00
denise
7ea106e0d3 CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
-fixed
2012-06-29 16:02:27 -04:00
denise
68420a898f CC-4044: Timeline -> Cursor keeps highlight even if the song is played
-fixed
2012-06-29 15:49:22 -04:00
James
6d823d01ab CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
- fixed
2012-06-29 12:49:59 -04:00
James
b425fbd894 CC-4045: Logging: add file name and line number on logging function
- done
2012-06-29 12:47:14 -04:00
James
e5e0c925e6 CC-4043: Pypo: add same song twice and cancel the first song, the
following song wont play any more

- fixed
2012-06-29 12:11:38 -04:00
James
0b069c2f54 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-29 10:56:55 -04:00
James
a8792a7b97 CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
denise
6c1c36fa9b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-28 17:55:32 -04:00
denise
38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
-fixed
2012-06-28 17:55:17 -04:00
James
93bdcf0b26 CC-4032: pyponotify.py fails because not all files in
/var/log/airtime/pypo are read/writable by pypo

- fix
2012-06-28 17:17:36 -04:00
Martin Konecny
c85602b72e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-28 17:09:51 -04:00
Martin Konecny
13fb3a02c5 CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo
-fixed
2012-06-28 17:09:41 -04:00