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

552 Commits

Author SHA1 Message Date
James 66b1a6794e - fixed a bug where it didn't display error msg when duplicate 
file was uploaded via plupload
 2011-08-02 14:20:28 -04:00
James 79ddd93ec8 CC-2620: Undefined index error on Now playting page after upgrade 
- fixed
 2011-08-02 13:54:26 -04:00
James 28da7488b0 - putting 'gears' as the first option for plupload 2011-08-02 11:24:54 -04:00
James 842de29d4d - minor fix on plupload 2011-07-29 17:13:32 -04:00
James ce0396961d CC-2473: plupload: Cannot upload a 250Mb+ file 
- fixed
- we now use chuck to uploade files
 2011-07-29 16:45:13 -04:00
James 8187a5504b - Release preparation changes 2011-07-27 17:12:27 -04:00
Naomi Aro 8b9cfd7cfa CC-2595 : Apache error when addWatchedDir() from MusicDir.php is called 
need to make this work for new installs.
 2011-07-27 10:41:33 +02:00
James d94357e5e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-25 16:25:07 -04:00
James 2b36e8193e CC-2588 :Use RabbitMQ to control the show recorder 
- done
 2011-07-25 16:24:00 -04:00
Naomi Aro 96284a2a44 CC-2562 : Allow users to convert linked files into watched directories 2011-07-25 16:21:42 +02:00
Naomi Aro 0b5e3a54b4 CC-2562 : Allow users to convert linked files into watched directories 2011-07-25 12:41:13 +02:00
james 047a288c38 CC-2588: Use RabbitMQ to control the show recorder 
- recording works now.
- further testing is needed
- still need to work on canceling the show
 2011-07-23 12:30:36 -04:00
james a84cb7fc37 CC-2579: Upgrad fails 1.8->1.9 
- moved all the config files to each upgrade dir
- also fixed back up name of 1.9.0 conifg to 1.9.0(from 1.8.1)
 2011-07-22 15:32:10 -04:00
james d1494c1735 CC-2579: Upgrade fails from 1.8->1.9 
- airtime.conf files for each version were added.
- Custom CreateIniFiles() were added for 1.8.0 and 1.7.0
upgrade script
- 1.9.0 upgraded deletes all files in /usr/lib/airtime/ except
airtime_virtualenv.
 2011-07-22 10:30:08 -04:00
Naomi Aro d3776f4ea9 CC-2582 : Files with a tracknumber that isn't actually a tracknumber don't get imported properly 
adding more metadata checks so it won't have a database insertion issue.
 2011-07-22 12:54:42 +02:00
James 99c505bddc CC-2581: some of php.ini directive has to be moved 
- done
 2011-07-21 16:06:59 -04:00
Naomi Aro b302006100 CC-2571 : Media Monitor Bootstrap 
fixing up character encoding issues.
 2011-07-21 12:12:37 +02:00
James 48634dd96e CC-2518: Auto-install scrip for manual install 
- done
- php.ini directives are overriden in .htaccess file
- script bypass apache configuration if
apache2/site-avaiable/airtime exists
- script byapss virtualenv setting if
/usr/lib/airtime/airtime_virtualenv exists
 2011-07-20 14:20:47 -04:00
James 931fb4db62 CC-2518: Auto install script for manual install 
- install dir is renamed to install_minimal
- virtualenv command is moved to install script.
- need more work on install_full part
 2011-07-19 17:30:23 -04:00
Naomi Aro 7d79fa7b63 CC-2572 : Set Proper Metadata for a recorded show 2011-07-19 19:02:23 +02:00
Naomi Aro 9aa7b7f403 CC-2572 : Set Proper Metadata for a recorded show 2011-07-19 18:36:10 +02:00
Naomi Aro 9de0d490d8 CC-2569 : Scheduling a rebroadcast show uses old file length access 
use new metadata key access.
 2011-07-19 12:37:06 +02:00
Naomi Aro 5a9bf18ccc CC-2558 : Delete all files from disk, only allow admins to delete 2011-07-19 11:50:49 +02:00
Naomi Aro ba0458c442 CC-2558 : Delete all files from disk, only allow admins to delete. 2011-07-19 11:00:32 +02:00
James d518e6aa15 - updated version string for RC1 2011-07-18 17:54:28 -04:00
martin 8ca2eec3e0 CC-2561: Broken image links when selecting directory from server. 
-fixed
 2011-07-18 17:09:03 -04:00
martin 0e82f2a606 CC-2560: Make sure new watched dirs do not contain existing 
watched dirs (and stor dir) and vice-versa.

-fixed
 2011-07-18 15:27:22 -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
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
martin cc8ec59f89 -updated comments 2011-07-15 19:32:17 -04:00
James 8f1e0a0767 CC-2553: Exception thrown 
- fixed
 2011-07-15 17:35:16 -04:00
James 24891604d3 CC-2507:Deleting a playing during editing does not refresh page 
- fixed
 2011-07-14 16:57:40 -04:00
James f95e881ec5 CC-2501:Registration:wording changes 
- fixed
 2011-07-14 16:06:13 -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
james 4acf835fe1 CC-2536:Should set realpath of directory in MusicDir 
- fixed
 2011-07-13 09:49:51 -04:00
james be7af45c66 CC-2524:Manage Media Folders:No error msg 
- fixed
- changed error msg text
 2011-07-13 09:01:48 -04:00
martin 1411987b01 CC-2534: When copy files into storage folder it says wrong path name 
filter all functions via realpath which will make directories consistent
 2011-07-12 17:05:40 -04:00
martin 1416274882 CC-2529: Create download file API key 
-users who are authenticed via ZEND_AUTH can now preview files
 without using api-key
 2011-07-12 14:09:40 -04:00
martin 88bdb4840b -update version string for beta4 2011-07-12 12:29:12 -04:00
martin 063afda7ff CC-2519: Remove stor folder config option from /etc/airtime/airtime.conf 
-done
 2011-07-11 16:44:37 -04:00
martin 2c4e2afb8b -removed airtime-clean-storage.php + airtime-import.php 
-default created stor dir now has www-data:www-data permission
-created airtime-install.ini file for specifying install defaults
-removed all references to storDir in /etc/airtime/airtime.conf,
 and get value from database instead.
 2011-07-11 16:14:34 -04:00
james e5baf19c71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 14:01:12 -04:00
james e47f80802e CC-2524:MusicDir.php: adding error handling 
- following functions now handle error and return code and
error message if there is an error:
addDir(), setStorDir(), removeWatchedDir()
- fixed airtime-importy.py to work with new MusicDir functions
 2011-07-11 14:00:31 -04:00
Paul Baranowski 2ca9efa955 Removed the GetID3 library, we no longer use it. 2011-07-11 13:55:18 -04:00
james ece84a04c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-08 17:46:50 -04:00
james 9bbd350a3a Merge branch 'cc-2514-new-airtime-import-script' into devel 2011-07-08 17:46:32 -04:00
james c0a68e20c2 CC-2514:New airtime-import script 
- initial commit.
 2011-07-08 17:14:01 -04:00
martin 012aa51f3a CC-2272: Ability to change storage directory location 
-fix SQL syntax error
 2011-07-08 10:12:33 -04:00
martin 9d994aa225 -compare relative paths instead of full paths on bootup 2011-07-07 17:41:08 -04:00
martin 8574eb7063 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-07 16:05:47 -04:00
martin 73da294089 CC-2505: Media monitor doesn't delete some tracks 
from the Airtime server due character encoding

-fixed
 2011-07-07 16:05:34 -04:00
james 25725c5ce2 CC-2520:Phone Home stat:Popup doesn't get disapeared 
- fixed
 2011-07-07 14:09:55 -04:00
james ba4733ceb6 CC-2460:Popup shouldn't show after X is pressed 
- changed name to "donotshowregistrationpopup"
 2011-07-06 17:02:58 -04:00
martin 6b9066466b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 14:43:01 -04:00
martin 67df619c90 CC-2272: Ability to change storage directory location 
-done
 2011-07-06 14:42:43 -04:00
james f8b8a6bada Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 13:56:51 -04:00
james a8546e289e CC-2068:Now playing should use Title/Creator, not Song/Artist 
- fixed
- removed some unnecessary code.
 2011-07-06 13:56:27 -04:00
martin eaba145d6d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 13:55:04 -04:00
martin 3d52db5211 CC-2494: Uploading songs getting a 500 error (shows as yellow ! in the UI) 
-fixed
-also made it so that files deleted via the UI are deleted on the FS as well.
 2011-07-06 13:54:52 -04:00
james 947647ed89 CC-2506:'choose folder' should be 'Choose folder' 
-fixed
 2011-07-06 13:50:32 -04:00
james 752f60bd76 CC-2512:Small browser window causes day/week/month buttons to 
overlap Calendar

- fixed
- also margin was adjusted to more reasonable size
 2011-07-06 11:57:42 -04:00
james 156a114bd5 CC-2507:Deleting a playlist during edting does not refresh the page 
- fixed
 2011-07-06 11:45:34 -04:00
james acf5dbd6df CC-2515:Phone Home Metric:prevent parent window refreshing 
- fixed.
 2011-07-06 11:32:57 -04:00
james e69c0ea351 CC-2510:Pref screen: able to select promote my stn 
- fixed
 2011-07-06 11:12:13 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup 
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
 2011-07-05 15:53:50 -04:00
james 883cacd220 CC-2509:Phone Home stat: not able to upload logo via popup 
- fixed
 2011-07-05 14:21:32 -04:00
mkonecny 8593b340de -update version string to beta3 2011-07-05 00:16:07 -04:00
martin 42a324f659 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 17:59:19 -04:00
martin 805d3616fe cc-2419: media monitor import on startup 
-fixed support for watched dirs #2
 2011-07-04 17:59:02 -04:00
james 3b157fd5d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 17:54:51 -04:00
james 5e93bb999e CC-2501:Registration wording changes 
- modified text and look on preferences
 2011-07-04 17:54:33 -04:00
martin df1dec2078 cc-2419: media monitor import on startup 
-fixed support for watched dirs
 2011-07-04 17:37:05 -04:00
martin c67e711a05 cc-2419: media monitor import on startup 
-fixed syntax errors, added more logging.
 2011-07-04 15:40:09 -04:00
martin ddb5e8e383 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 15:08:14 -04:00
martin d260c66abc cc-2419: media monitor import on startup 
-added multiple dir support
 2011-07-04 15:08:02 -04:00
james e44bf183c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:49:47 -04:00
james dcddec9536 CC-2447:Preview keeps playing if you create a new playlist 
- fixed
- preview stops on clicking on any of new, delete, done editing button
 2011-07-04 14:49:17 -04:00
martin ae156c85b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:29:19 -04:00
martin 429d8b234c cc-2419: media monitor import on startup 
-new method of querying db on startup.
 2011-07-04 14:29:09 -04:00
james cb72db4a31 CC-2460:Popup shouldn't show after X is pressed 
- changed function name to "donotshowpopup"
 2011-07-04 13:11:35 -04:00
james 4ca7b3cf16 CC-2501:registration-workding-change 
- temp commit. Styling is still broken
 2011-07-04 13:07:46 -04:00
james 2bc108e8ae CC-2504:Show me box in preferences does not show promotinal data 
-fixed
 2011-07-04 12:54:10 -04:00
james d9a9af9e6d CC-2476:Dragging a playlist, draws a orange grid 
- fixed(Thanks to Vladimir)
 2011-07-04 11:35:35 -04:00
james 22df189cdc CC-2477:Duration box is too small 
-fixed
 2011-07-04 11:11:35 -04:00
james df64b70280 CC-2415: subsecond offset in playlist builder incorrect 
- fixed
 2011-07-04 10:25:38 -04:00
james 75ea77e6a6 CC-2503: replacing UI_MDATA_KEY_TITLE with MDATA_KEY_TITLE 
-fixed
 2011-07-04 10:00:37 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X 
- fixed
 2011-07-04 09:54:44 -04:00
james 79ea4ead9d CC-2468:Changing host to DJ 
- style.css change
 2011-07-04 09:31:07 -04:00
james 600f80e03f - suppressing error msg in case there is an error 2011-06-30 13:52:51 -04:00
james 3d819297b9 CC-2471:error when upload a duplicate 
- fixed as Paul requested
 2011-06-30 13:36:44 -04:00
james b22a6268f2 CC-2471:error when upload a duplicate file 
- fixed
- Please read the comment on the ticket
 2011-06-30 13:08:45 -04:00
james 8475326d96 CC-2475:When Promote is checked promote info section has to be 
expanded by default

- fixed
 2011-06-30 12:29:35 -04:00
james 48537c3c10 CC-2484:Calendar sholdn't move down 
- the fix was fairly easy. so I did complete fix.
 2011-06-30 12:15:54 -04:00
james c0b95f583a CC-2491:Number of songs shows 0 
- fixed
 2011-06-30 10:45:55 -04:00
james 89df3db096 CC-2496:adding "Select Country" to drop down(popup and support setting) 
-done
 2011-06-29 17:46:46 -04:00
james 7cc6e54f21 CC-2461:Change text of OK in Manage Music Folders 
-fixed
 2011-06-29 17:36:11 -04:00
james 43c8a28633 CC-2455:Show what i am sending heading 
-fixed
 2011-06-29 17:28:51 -04:00
james 3f8e61f949 CC-2458:Diabled checkbox do no look diabled 
- fixed
 2011-06-29 16:55:44 -04:00
james f9f6296e2c CC-2466 Manage Music Folders should be Manage Media Folder 
-fixed
 2011-06-29 16:40:49 -04:00
james a018466b80 CC-2468:Manage Users Say DJ and add show says host 
-fixed
 2011-06-29 16:33:20 -04:00
james ca240422f7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-29 14:43:32 -04:00
james ae35ef12c2 CC-2457:Confimation before deleting or changing 
- done
 2011-06-29 14:42:56 -04:00
martin d03cf4ca14 CC-2482: Next Song/Previous song can still be incorrect in some rare cases 
-should be fixed.
 2011-06-29 14:40:56 -04:00
martin dc457e79a0 added logging to ApiController::getMediaAction 
-Will help us see why files are not sometimes downloaded by pypo.
 2011-06-28 23:06:59 -04:00
martin e8c36be242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-28 12:50:15 -04:00
martin 00910ae346 -clean up imports in MediaMonitor.py 2011-06-28 12:50:05 -04:00
james 2163efc1be CC-2425:Tweaks to phone home metrics 
- In order for the user to click the "Yes, Help Airtime" button,
both "send support feedback" AND "privacy policy" should be checked
 2011-06-28 12:47:54 -04:00
Naomi Aro 0111fd5725 cc-1799 : Filesystem 
incorrect variable.
 2011-06-28 15:04:03 +02:00
martin 8b533bbd21 -updated version string to 1.9.0-beta2 2011-06-27 18:06:32 -04:00
james c7f5a8689c - adding comment and rewriting function description 2011-06-27 17:34:17 -04:00
james 11af81133c CC-2431:Clendar shrinking issue 
-fixed
 2011-06-27 17:32:54 -04:00
james d88f2467b1 Merge branch 'cc-2357-tweak-to-show-date-end' into devel 2011-06-27 16:29:40 -04:00
james 33bb5560bf CC-2357: tweak to show date end 
- fix on end time.
 2011-06-27 16:29:22 -04:00
james cfeff13c4e - changing word 'publicise' to 'promote' 2011-06-27 16:04:28 -04:00
james 52dc267670 CC-2357:Tweak to show date end 
- fixed
 2011-06-27 15:59:29 -04:00
james 4eea4f11b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-27 14:38:16 -04:00
james 6a7f1d3588 CC-2412:Error causes box to float 
- fixed
 2011-06-27 14:37:31 -04:00
Naomi Aro 363a73af10 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 2011-06-27 18:31:13 +02:00
Naomi Aro e8265614ba CC-2456 : Multiple storage folders show up on the same line 2011-06-27 18:05:28 +02:00
james 5f9dd83c38 CC-2377:Upload to soundcloud no show name 
- fixed
- additional fix: getRealFilePath() doesn't exsist anymore.
Places where it calls getRealFilePath(), replaced with getFilePath()
 2011-06-27 11:43:59 -04:00
james 629c3fb1d9 CC-2240:Fix up recorded show function 
- fixed
- added getName() function agagin to StoredFile
 2011-06-27 11:23:48 -04:00
james 396bfd5f8d CC-2453:Make textarea non resizable 
- fixed
 2011-06-27 09:55:39 -04:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences 
applying html/css changes to music folder preference page.
 2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home 
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
 2011-06-26 23:13:49 -04:00
James 1243c60442 CC-2425:Tweak phone home 
- removed original privacy text
 2011-06-26 01:54:05 -04:00
James 195588ecc4 CC-2451: Not storing data 
- fixed
- additional fix: promote data will not be stored if promote
checkbox is not checked
 2011-06-26 01:47:21 -04:00
James 59e19fe9d1 CC-2450:Phone home metric 
- email is not required anymore.
- Send info box suppose to dispalys filelds only when thev
value is non-empty string. It wasn't diaplyng where the
value was 0(fixed).
 2011-06-26 01:01:35 -04:00
James a936212355 Merge branch 'cc-2425-tweak-phone-home' into devel 2011-06-26 00:45:30 -04:00
James 194ad31c9f CC-2425:Tweak phone hom 
- done
 2011-06-26 00:45:02 -04:00
James 8eb3ec3df2 CC-2449: Add promote flag for data collection 
- done
 2011-06-25 23:28:42 -04:00
James cc542797c7 CC-2425:Tweaks to phone home metric 
- Done
 2011-06-24 17:26:37 -04:00
James 0b0d38b990 CC-2448: Dragging to first position error 
- fixed. Final
 2011-06-24 17:16:32 -04:00
James 975633b9cf CC-2448:Dragging causes an error 
-fixed
 2011-06-24 17:14:04 -04:00
James cace4c6d89 CC-2446:Crash in playlist builder 
- fixed.
 2011-06-24 17:00:59 -04:00
James eef1927f07 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:30:05 -04:00
James b83420874c CC-2425:Tweak phone home stat 
- fixed as requested. Just need to add the link
 2011-06-24 16:29:24 -04:00
martin 7607bce6c8 CC-2403: Downloading a file via the web UI returns an absolute path, not relative 
-fixed to take into account the base URL.
 2011-06-24 16:04:57 -04:00
martin a5d2597875 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:02:01 -04:00
martin 21cf476bfb cc-2444: audio preview is broken 2011-06-24 16:01:40 -04:00
James db7b996288 CC-2415:subsecod-offset-in-playlist 
- Displays 1 decimal place on all length and offset in playlist
builder
- secondsToPlaylistTime() function returns time with 1 decimal
millisecond
 2011-06-24 15:51:21 -04:00
James e05645f523 CC-2415:Subsecond offset 
- temp commit. not sure what needs to be done yet
 2011-06-24 12:29:55 -04:00
James 183a348f34 CC-2433: Support settings: shrink down text area 
- fixed
 2011-06-24 10:25:28 -04:00
James 7aca2e25d0 CC-2432:After choosing to register from still pops up 
- fixed
 2011-06-24 10:15:18 -04:00
Naomi Aro fbf5f85509 CC-2423 Undefined property in StoredFile::$md 
uses the new file metadata access now.
 2011-06-24 10:40:31 +02:00
Naomi Aro bae771790a cc-1799 Human Filesystem 
editing recording shows so they work with the new filesystem/file upload.
 2011-06-23 21:14:09 +02:00
Naomi Aro e725e4fbe4 cc-1799 Human Filesystem 
storage dir should be created first so then it's realpath can be inserted into the database.
 2011-06-23 17:51:38 +02:00
Naomi Aro 7876552b38 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-23 17:35:01 +02:00
Naomi Aro 65e647263f cc-1799 Human Readable File System 
refactoring media monitor, separate process for file event processing.
 2011-06-23 17:33:05 +02:00
James Moon 52e41555bd CC-2426:Time boxes are too big 
- fixed
 2011-06-23 00:05:57 -04:00
James Moon f9337e772a CC-2424:Support setting formatting 
- fixed
- additional fix: changed logo restriction to 200*200 min and
600*600 max
 2011-06-22 23:49:15 -04:00
James Moon 3c3850db29 CC-2305:Create playlist out of range 
- HTML is fixed as Valdimir requested.
- CSS is fixed.
 2011-06-22 23:37:26 -04:00
James Moon 219102d9f1 CC-2415:Subsecond-offset 
- bug in secondsToPlaylistTime() is fixed
- for .0307, offset will be calculated as .030
- if we want it to be .0307, futher modification is requried
 2011-06-22 22:33:05 -04:00
martin 8f0b965ea0 CC-2403: Downloading a file via the web UI returns an absolute path, not relative 
-fixed
 2011-06-22 16:50:58 -04:00
martin 50cde2f8b0 CC-2418: Show add: end time shown in display is not the time committed to DB 2011-06-22 11:21:26 -04:00
martin 34ced48076 -change version string to 1.9.0-beta1 2011-06-21 12:38:49 -04:00
james 66b777aedb - fixed bug where Description was not sent 
- changed order of display on info box in popup
 2011-06-21 12:23:43 -04:00
james 70b1b73d20 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-21 12:03:43 -04:00
james ed77eebe59 - removed validator on logo image for now 2011-06-21 12:03:23 -04:00
martin 98259e71bb -syntax error in MusicDir.php 2011-06-21 11:55:44 -04:00
james 3dcb10c931 - adding link to who's using page( it was remove somehow ). 2011-06-21 11:20:02 -04:00
james ea78991d57 - removing one line from PreferenceController.php(the function 
doesn't exist anymore)
 2011-06-21 10:26:34 -04:00
james 60eff4c041 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-21 10:20:17 -04:00
james bcfc5507c6 CC-1724: Phone home statistics 
- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
 2011-06-21 10:19:39 -04:00
Naomi Aro f755e41a9a propel classes 2011-06-21 15:49:31 +02:00
Naomi Aro 5f562b94ca replacing propel files 2011-06-21 15:40:40 +02:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding ability to move stor directory.
 2011-06-21 14:58:38 +02:00
Naomi Aro f1893cebe6 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
making separate js file for music dirs page.
 2011-06-21 11:57:56 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding music dirs concept to Airtime. New cc_music_dirs table/class.
 2011-06-21 10:24:02 +02:00
James Moon dd4ea127fc CC-1724:Phone home statistic 
- Fixed the bug where it didn't populate country dropdown box
This was due to default sql not popuplate country table correctly
- Changed 180*180 min log text to 200*200
- Changed text are size in support settings
- Client now sends base64encoded image to server.
 2011-06-20 20:31:20 -07:00
james 965b96047a Merge 2011-06-20 18:10:39 -04:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
 2011-06-20 18:09:37 -04:00
james e762633405 CC-1724:Phone home statistics 
- Final commit for client side.
 2011-06-20 17:58:38 -04:00
martin 141002eb49 CC-2404: Downloading a file via the web UI shouldn't guide user away from page. 
-fixed
 2011-06-20 14:10:33 -04:00
martin fd1c202de9 CC-2381: Songs library search speed performance 
-removed javascript alert popup
 2011-06-17 15:18:09 -04:00
martin 2e4519f156 Merge branch 'cc-2015-on-reboot-resume-show' into devel 
Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
 2011-06-17 15:10:33 -04:00
martin adae3e21d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-17 14:42:08 -04:00
martin b802ba9a42 cc-2381: slow library searching speed 
-implemented 350ms keystroke delay before searching
 2011-06-17 14:41:57 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
recursively copying the audio_samples directory.
 2011-06-17 17:54:36 +02:00
martin ec6db96025 cc-2015: on reboot resume show 
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
 2011-06-16 18:59:15 -04:00
james 1fbaa7d5fb CC-1724:Phone home statistics 
- Popup form validation is added( javascript )
 2011-06-16 14:26:24 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show 
-removed cue file from pypo responibility
 2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show 
-calculating the amount of seconds since track began complete
 2011-06-16 13:26:36 -04:00
Naomi Aro 35cbeffd4a CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
fixing a couple playlist things to work with the new storedfile class.
 2011-06-16 12:39:17 +02:00
james 5adfb79981 CC-1724:Phone home statistics 
Temp commit
 2011-06-15 17:51:44 -04:00
james 0263278bc2 CC-1724-phone-home-statistics 
add js for register
 2011-06-15 12:07:35 -04:00
james cf654f1a45 CC-1724:phone-home-statistics 
Rebase from devel into this branch
 2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics 
Temp commit
 2011-06-15 11:17:03 -04:00
Naomi Aro 5b26f34033 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
seems mutagen needs everything cast as a string, or one field. Was throwing an exception with no message not sure.
 2011-06-15 14:20:14 +02:00
Naomi Aro a05b02b0dc cc-1799 File system change 
error in this loop variables from copy/paste.
 2011-06-15 11:12:57 +02:00
Naomi Aro d5a3aaf3d0 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
 2011-06-15 11:02:23 +02:00
Naomi Aro c06b15b964 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
about to merge, need to test more with blank metadata/change paths according to spec. Should test case about moving to trash from UI.
 2011-06-15 09:19:41 +02:00
Naomi Aro ff61972e82 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
changing ftype calculation to the python script.
 2011-06-14 18:52:43 +02:00
Naomi Aro af4ec7b872 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
plupload is now working how I want with moving files.
stub files are added then their metadata updated as the web receives info.
 2011-06-14 18:35:07 +02:00
Naomi Aro 17d895861d CC-1799 Put Airtime Storage into a Human Readable File Naming ConventionPut Airtime Storage into a Human Readable File Naming Convention 
put initial stub file in when a user uploads via plupload so they aren't wondering why they don't see anything in their playlist builder. Metadata will be updated when the file event completes.
 2011-06-14 12:07:21 +02:00
james 061dec14aa CC-2289:Differentiate between time and duration 
- modified createNewFormSections function so it populate form
with defalt value
 2011-06-13 14:20:57 -04:00
james 7cc1f5c2e7 CC-2289:Differentiate between time and duration 
- css has been modified (from Vlad)
- new image were added (from Vlad)
 2011-06-13 12:59:44 -04:00
james 6a15f51aac CC-2289:differentiate-between-time-and-duration 
- some change in date populating rules
- change on start date/time triggers change in end date/time
- change on end date/time will triggers background turning into
red color to notify user that end date/time is earlier than
start date/time.
- need to do more work once I get img file from Vladmir
 2011-06-13 12:59:43 -04:00
james 1dabbacca2 CC-2289:Differentiate between time and duration 
- End date and time is added
- duration field is readonly now and is autocalculated
- now playing duration field format is changed( 0h 0m 0s )
- removed millisecond from start and end time in now playing
 2011-06-13 12:59:43 -04:00
Naomi Aro 84dd5dac62 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
delete is working, can upload from plupload.
 2011-06-13 16:41:57 +02:00
Naomi Aro 8a15144dc8 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
experimenting with plupload.
 2011-06-13 12:41:30 +02:00
Naomi Aro 8d9c0dab1a CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding setup to get stor folder etc.
 2011-06-13 12:10:25 +02:00
Naomi Aro 71d853567e CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
selecting a mode to prevent some cases where a duplicate could be entered for only 1 file.
 2011-06-10 16:43:30 +02:00
Naomi Aro 9da314979e CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
fixing problem with StoredFile::Insert()
 2011-06-09 12:57:30 +02:00
Naomi Aro a4b92fe72d CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
regression testing with refactored storedfile, having permission problems unlinking a file.
 2011-06-09 11:50:03 +02:00
Naomi Aro 1f9a39f22d CC-1799Put Airtime Storage into a Human Readable File Naming Convention 
new API method to check media status.
 2011-06-09 10:28:56 +02:00
Naomi Aro 16cfae10ed CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
working on proper length saving. need to fix substring method to ensure all get same number of subseconds to be consistent.
 2011-06-08 19:33:16 +02:00
Naomi Aro 11d18ad8e8 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
can drag a bunch of songs into stor, and they are organized and imported to airtime. Need to fix length property.
 2011-06-08 18:24:17 +02:00
Naomi Aro f066135380 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
plupload is not set up with media monitor yet, need to finish import to airtime by dragging into stor folder.
 2011-06-08 11:59:48 +02:00
Naomi Aro 975f001c86 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
refactoring Storedfile
 2011-06-08 10:15:35 +02:00
james ad3ef3ec30 CC-2255: Separate user types admin and program manager 
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
 2011-06-07 14:31:39 -04:00
Naomi Aro 3c689efe06 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
check if file is new or exists
 2011-06-07 10:39:57 +02:00
Naomi Aro f46cdd3888 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-07 10:00:22 +02:00
martin 61d80b4710 Merge branch '1.8.2' into devel 2011-06-06 20:11:11 -04:00
james 80c17f6c38 Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 16:47:45 -04:00
james 93562d2319 CC-2362:Recorded show wrong file name 
Fixed bug on sending wrong file name to soundcloud
 2011-06-06 16:46:32 -04:00
martin c921348f36 cc-2364: past non-recorded shows have "upload to soundcloud" context menu option 
-fixed
 2011-06-06 15:15:47 -04:00
james ff031cde76 CC-2362:Recorded show wrong file name 
- removed logging
 2011-06-06 14:25:46 -04:00
james 4247f8c7a7 CC-2362:Recorded show wrong file name 
- not finished yet. Temp commit
 2011-06-06 14:10:12 -04:00
Naomi Aro c8219e3b97 Merge branch 'cc-2326-edit-show-end-date-problems' into 1.8.2 2011-06-06 20:06:24 +02:00
Naomi Aro 0f942d149d CC-2326 Edit a show (End Date problems) 
not clearing options array.
 2011-06-06 20:05:35 +02:00
Naomi Aro 02e259c0ea CC-2365 Shows from the past can be dragged into the future 
adding a backend check if the show has started in the past.
 2011-06-06 19:06:22 +02:00
martin 1de4777de3 cc-2362: upload to soundcloud with the wrong name after show rename. 
-make sure to remove all rebroadcasts of recorded shows when editing.
 2011-06-06 12:20:44 -04:00
martin ebf7dd0e0d Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 12:01:58 -04:00
martin d591858528 cc-2362: upload to soundcloud with the wrong name after show rename. 
-changed so that recorded shows are not deleted by default
-changed static method to non-static.
 2011-06-06 12:01:37 -04:00
Naomi c30eeaf5bd CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
searching database by filename to retrieve file.
Checking if is supported audio file/temp audio file.
 2011-06-06 11:26:15 +02:00
Naomi 377f77dff4 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
naming convention in fallback order

stor/artist/album/track - title.ext
stor/artist/album/title.ext
stor/artist/album/originalfilename.ext
stor/artist/track - title.ext
stor/artist/title.ext
stor/artist/originalfilename.ext
stor/originalfilename.ext
 2011-06-06 11:23:30 +02:00
Naomi Aro 1f045c8c7b CC-2356 Default genre when uploading to Soundcloud doesn't work 
somehow variable names must have changed.
 2011-06-04 15:45:08 +02:00
Naomi Aro 27075ad369 CC-2356 Default genre when uploading to Soundcloud doesn't work 
function call changed incorrectly.
 2011-06-04 15:45:08 +02:00
martin 1540e593e4 Merge branch '1.8.2' into devel 
Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
 2011-06-03 17:29:55 -04:00
martin eee885f746 cc-2344: wrong song displayed 
-removed unnecessary code.
 2011-06-03 17:06:47 -04:00
martin e69f9497ed cc-2344: wrong song displayed 
-fixed #2
 2011-06-03 17:03:11 -04:00
martin c9c9ecf2cd cc-2344: wrong song displayed 
-fixed
 2011-06-03 16:36:13 -04:00
martin 19e52e81b5 cc-2351: updating a bi-weekly repeating show is incorrect 
-fixed
 2011-06-03 14:51:17 -04:00
martin e969baee1c cc-2359: record check box is disabled after update show 
-fixed
 2011-06-03 14:01:58 -04:00
martin 308efaeadc CC-2336: Some Show Editing Features Seem to have been lost 
-fixed shows in the past being edited!
 2011-06-02 15:56:54 -04:00
martin b0befdff20 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-02 12:47:10 -04:00
martin b747ce6fb0 cc-2344: wrong song displayed 
-fixed
 2011-06-02 12:45:57 -04:00
james 5a58044c52 CC-2294:Switch left/right orientation of playlist builder 
done
 2011-06-01 10:17:47 -04:00
james 570e7ec9c6 CC-2230:Alignment of text in new playlist description box 
fixed
 2011-06-01 10:04:17 -04:00
james 070641293e Merge branch 'cc-2290-clicking-on-another-tab-whilst-uploading-track-kills-upload' into devel 2011-05-31 16:55:47 -04:00
james 033eb193de CC-2290:Clicking on another tab whilst uploading track 
- Changed msg as requested
 2011-05-31 16:55:28 -04:00
james 75ffe91325 CC-1919:Playlist builder show time offset 
Fixed.

- I wasn't sure if I had to wait for html/css code from Vladmir.
I just did what I could do.
 2011-05-31 16:49:01 -04:00
james 1e62a7be9c Merge branch 'cc-2290-clicking-on-another-tab-whilst-uploading-track-kills-upload' into devel 2011-05-31 12:26:51 -04:00
james 551ed289ca CC-2290:Clicking on another tab whilst uplaoding track kills 
additional fix
- when user adds file and removes file, and the list is empty,
there is no more alert.
 2011-05-31 12:26:30 -04:00
james 7c55f38f36 CC-2291:Remove + button in a circle 
Done
 2011-05-31 11:32:11 -04:00
james 1f02ba813d CC-2290:Clicking on another tab whilst uploading track kills 
- note that change in queue will trigger the alert(on unload),
not the actual upload process
 2011-05-31 11:23:48 -04:00