Commit Graph

262 Commits

Author SHA1 Message Date
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
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
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 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
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 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 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 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 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