Commit Graph

4842 Commits

Author SHA1 Message Date
James e199c118af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	utils/airtime-import/airtime-import.py
2011-07-18 15:10:57 -04:00
James 7cf8934856 CC-2546: Airtime-import does not confirm
- fix on error. wrong syntax was used
2011-07-18 15:09:27 -04:00
Naomi Aro 7edacd89cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-18 19:48:34 +02:00
Naomi Aro c7279f74ca CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 19:48:20 +02:00
Paul Baranowski f044f6df83 Fixed grammar, typos, and spelling in airtime-import. 2011-07-18 13:30:40 -04:00
martin ef0e0dcfa9 CC-2548: Update from 1.9-beta2 to beta4, doesn't update the version tag in About
-fixed
2011-07-18 12:15:54 -04:00
martin 96a1005727 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-18 11:58:45 -04:00
James a45cc5f29e CC-2546: Airtime-import does not confirm to change the storage dir
- Confirm default to "N" and it accepts "Y" or "y"
- It spits out error msg when input is any other then
"Y","y","n","N"
2011-07-18 11:56:41 -04:00
martin 542547ecf0 CC-2559: Remove files from cc_schedule that are no longer watched
-added foreign key relationship
2011-07-18 11:53:15 -04:00
martin 8ba8944964 CC-2279: Upgrade script for converting stor directory to new format
-added conf.php file
2011-07-18 11:52:33 -04:00
martin d28c662056 CC-2555: Now Playing page takes roughly 1.4 seconds to load on localhost
-fixed
2011-07-18 11:18:38 -04:00
Naomi Aro b7819211ac CC-2559 : Remove files from cc_schedule that are no longer watched
adding foreign key to file_id column of cc_schedule table.
2011-07-18 15:54:05 +02:00
Naomi Aro 4588ebd105 CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 15:28:17 +02:00
Naomi Aro 91feeaf84d CC-2557 : Need to keep tmp file dictionary to change ogg metadata on the server side 2011-07-18 12:49:45 +02:00
Naomi Aro e369ab8dee CC-2505 : Media monitor doesn't delete some tracks from the Airtime server due to weird characters in file names
seems to fix unicode problems I was having.
2011-07-18 12:05:16 +02:00
martin c74af05f18 CC-2279: Upgrade script for converting stor directory to new format
-major cleanup
2011-07-18 00:25:28 -04:00
mkonecny 460989e6bc -cleanup old process code 2011-07-15 20:28:00 -04:00
martin 187d3a5e92 -using threads instead of processes. 2011-07-15 19:49:35 -04:00
martin cc8ec59f89 -updated comments 2011-07-15 19:32:17 -04:00
James fbcd74f4f3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-15 17:35:34 -04:00
James 8f1e0a0767 CC-2553: Exception thrown
- fixed
2011-07-15 17:35:16 -04:00
martin cfa4800fc0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-15 17:01:12 -04:00
martin 36953e58cc CC-2279: Upgrade script for converting stor directory to new format
-almost there...
2011-07-15 17:00:54 -04:00
martin 62b6d020bb CC-2279: Upgrade script for converting stor directory to new format
-testing fixes
2011-07-15 16:38:46 -04:00
James 3e6ca78253 CC-2490: Recorded show file is missing
- fixed.
2011-07-15 16:15:09 -04:00
martin a2b7bd2a0b CC-2279: Upgrade script for converting stor directory to new format
-further tweaks
2011-07-15 14:37:43 -04:00
martin 241eb54e0d CC-2279: Upgrade script for converting stor directory to new format
-further tweaks
2011-07-15 14:20:32 -04:00
martin b40460d8f8 CC-2279: Upgrade script for converting stor directory to new format
-don't exit upon db sql error.
2011-07-14 21:32:45 -04:00
martin 6a2bdaebe6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-14 21:31:15 -04:00
martin ec75af194b CC-2279: Upgrade script for converting stor directory to new format
-escape strings before inserting into database
2011-07-14 21:31:02 -04:00
martin 07b1686643 CC-2279: Upgrade script for converting stor directory to new format
-even more fixes..
2011-07-14 21:06:35 -04:00
martin d52857ea8b CC-2279: Upgrade script for converting stor directory to new format
-further fixes..
2011-07-14 17:13:11 -04:00
James 24891604d3 CC-2507:Deleting a playing during editing does not refresh page
- fixed
2011-07-14 16:57:40 -04:00
martin 1aa1500d0c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-14 16:39:27 -04:00
martin 9f3218b8d9 CC-2279: Upgrade script for converting stor directory to new format
-further fixes
2011-07-14 16:39:18 -04:00
James f95e881ec5 CC-2501:Registration:wording changes
- fixed
2011-07-14 16:06:13 -04:00
James 4601852eed CC-2538:Upgrade script for Phone home metrics-DB changes
- implemented drop() for both music_dirs and country tables
2011-07-14 15:58:15 -04:00
martin e529a16bdb CC-2279: Upgrade script for converting stor directory to new format
-undefined var
2011-07-14 15:47:39 -04:00
James 2b1a0b4f72 CC-2551:airtime-import:Script doesnot send msg to media monitor
- move all error checking and RabitMq calls into MusicDir
functions
- fix in PreferenceController.php so it works with new functions
from MusicDir
2011-07-14 15:43:38 -04:00
martin 146c554c57 CC-2279: Upgrade script for converting stor directory to new format
-fix undefined variable
2011-07-14 15:40:48 -04:00
martin 621c85b1df CC-2279: Upgrade script for converting stor directory to new format
-in progress...
2011-07-14 15:31:19 -04:00
James 47645a2049 CC-2549:airtime-import should work with pythone 2.6
- enhanced usage text
2011-07-14 14:03:33 -04:00
James 5631cd068d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-14 13:33:20 -04:00
James 99153fdb15 CC-2546:Airtime-import does not confirm to change the storage dir
- fixed
2011-07-14 13:32:45 -04:00
martin 75e56034e4 CC-2279: Upgrade script for converting stor directory to new format
-refactoring...
2011-07-14 12:06:46 -04:00
martin 29869c175a CC-2279: Upgrade script for converting stor directory to new format
-refactor media-monitor
2011-07-14 12:06:46 -04:00
James 5e7c763fbf CC-2545:Airtime-import doesnt handle spaces in file/dir names
-fixed
2011-07-14 10:49:57 -04:00
James f0cc6614d9 CC-2545:Airtime-import doesn't handle spaces in file/dir names
- fixed
2011-07-14 10:03:04 -04:00
james 1736675464 CC-2549:airtime-import should work with python 2.6
- using optparse instead of argparse.
- need some more work.
2011-07-13 22:17:38 -04:00
james c03e7332fc - final fix. 2011-07-13 17:31:25 -04:00