Commit Graph

208 Commits

Author SHA1 Message Date
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
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 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
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
martin 6cc334f55f -updated version string number 2011-05-30 11:52:47 -04:00
Naomi 03fae770e5 CC-2326 Edit a show (End Date problems) 2011-05-26 17:00:21 -04:00
Naomi 81ee30105d CC-2326 Can't edit a show more than once (End Date problems)
keep adding the 1 day interval here
2011-05-26 16:27:50 -04:00
Naomi 8d59c18bef CC-2326 Can't edit a show more than once (End Date problems)
show editing assumed inclusive end dates while show creating assumed non inclusive.
2011-05-26 15:41:47 -04:00
Naomi 765897600d CC-2318 Edit Metadata of Live shows doesn't work
form is not taking care that a track number should be an integer,
default empty string cannot be set for integer, rejected by database.
2011-05-26 11:11:12 -04:00
Martin Konecny 6a181a4e9a CC-2323: Next song in the top panel not showing
-fixed
2011-05-25 14:35:31 -04:00
Naomi 2866bf46cd CC-2282 Import script does not restore storage from backup if database is intact
making spaces after ifs to follow coding standards.
2011-05-24 20:48:01 -04:00
Naomi 71ac8d4b1b CC-2282 Import script does not restore storage from backup if database is intact
not considering a duplicate to exist just because there's a row in the database, checking if its file exists on the system as well.
2011-05-24 20:48:01 -04:00
Martin Konecny 28a609c4dd CC-2317: Once uploaded, file size is different than original. 2011-05-24 16:33:26 -04:00
martin ebd93cd55a CC-2287: Files greater than 100MB are not being played
-increased chunk read size
2011-05-20 16:03:31 -04:00
martin 73877b222c CC-2287: Files greater than 100MB are not being played.
-fixed
2011-05-20 14:29:22 -04:00
Naomi a2ec9b4d10 CC-2281 Install script should check for pre-installed versions and prompt user to upgrade/full installation
moving constants in conf.php to constants.php
2011-05-19 14:27:30 -04:00
Naomi b84854c13c CC-2271 1.8.2 code cleanup tasks
changing 1.8.1 upgrade script to using raw source first.
2011-05-19 09:59:13 -04:00
martin d6616004a6 CC-2283: Now playing bar only shows the first word of the show name
-fixed
2011-05-18 18:37:13 -04:00
martin 3416ba20d9 cc-2263: unable to cancel recording show
-made cancelled recorded shows still upload.
2011-05-18 14:33:42 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere
now can edit title/description of a playlist without leaving the main playlist builder screen
2011-05-18 14:33:41 -04:00
martin a48f467de7 cc-2263: unable to cancel recording show.
-almost final check-in. Everything looks good right now...
2011-05-18 14:33:41 -04:00
martin 1d8f323a27 cc-2235: help says right-click to add playlist to show
-fixed
-also renamed "Add Audio" to "Add Media"
2011-05-17 13:55:51 -04:00
Naomi 3f43c39f41 CC-2256 Airtime-upgrade.php does not upgrade the web app
changing to version 1.8.2
2011-05-17 11:33:22 -04:00
martin 91caaf2c0f Merge branch 'cc-2126-user-should-not-be-able-delete-himself' into devel 2011-05-16 22:52:20 -04:00
martin a937dcb5ac -cc-2126: user should not be able to delete himself
added server side check
2011-05-16 22:37:54 -04:00
martin b87e661f96 Merge branch 'devel' of dev.sourcefabric.org:airtime 2011-05-16 11:45:23 -04:00