Commit Graph

247 Commits

Author SHA1 Message Date
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
Naomi Aro f5e6082ee7 CC-2336 Some Show Editing Features Seem to have been lost 2011-05-30 18:41:31 -04:00
Naomi Aro 1bca5208e7 CC-2336 Some Show Editing Features Seem to have been lost 2011-05-30 18:41:31 -04:00
Naomi Aro f7de484461 CC-2336 Some Show Editing Features Seem to have been lost
recovered everything that original worked I think will keep looking,
still problems with editing a show which has already started.
2011-05-30 18:41:31 -04:00
james e25e9d4d56 CC-2253:Gap until show ends format
removed string 'seconds' at the end
2011-05-30 16:10:20 -04:00
james f7d37adfc6 CC-2253:Gap until show ends should display in HH:MM:SS 2011-05-30 14:57:37 -04:00