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

1693 Commits

Author SHA1 Message Date
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files 
-Done for class User
 2011-09-23 17:00:55 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files 
-Done for class Schedule and ScheduleGroup
 2011-09-23 16:50:00 -04:00
martin cd95170b06 CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead 
-done
 2011-09-23 16:26:19 -04:00
martin e60db9e031 CC-2860: When recording a show, UTC time is displayed on the 
text field of right progress bar.
 2011-09-23 15:37:45 -04:00
martin 1dd78d0584 CC-2833: Use ClassLoaders for PHP Files 
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
 2011-09-23 12:33:28 -04:00
martin 693c72c396 -change Shows.php to Show.php 2011-09-23 10:56:12 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files 
-shows.php
 2011-09-23 10:54:20 -04:00
martin 7bb9e92ac9 cc-2864: upgrade from 1.7 broken 
-fixed
 2011-09-22 17:30:05 -04:00
Paul Baranowski 48b08893f0 CC-2306: Uploading a file that already exist error message does not have styling 
Tweaked message to the user.
 2011-09-22 15:31:21 -04:00
James 965a649d0e CC-2591: Change function name 
- done
- extra fix: fix was needed due to class name change
 2011-09-22 14:01:05 -04:00
martin c84690adaa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
 2011-09-22 12:25:30 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files 
-made MusicDir, Playlist and StoredFile autoload
 2011-09-22 12:24:17 -04:00
James b3654c62bc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 11:48:07 -04:00
James 73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud 
- done
- need more styling
- note there were changes in style.css
 2011-09-22 11:47:24 -04:00
martin 046f98db8f CC-2363: Diagnostic screen in Web UI 
-everything working
 2011-09-22 10:45:43 -04:00
martin 19d61ad780 CC-2363: Diagnostic screen in Web UI 
-working with ajax now!
 2011-09-19 17:55:26 -04:00
martin a11dba1469 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-19 15:46:15 -04:00
martin 62f0d1c7b2 Merge branch '1.9.1' into devel 2011-09-17 12:37:15 -04:00
martin d824eb7622 CC-2837: Invalid SQL statement 
-fixed
 2011-09-17 12:36:35 -04:00
martin 9861587dec -CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-16 22:05:52 -04:00
martin e1e34d297c -CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-16 21:30:50 -04:00
martin 3485b5a39f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-16 17:53:37 -04:00
martin 659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 
-progress being made
 2011-09-16 17:51:28 -04:00
James 7c94734277 CC-2810: More chmnod fixes for scripts 
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
 2011-09-16 14:01:23 -04:00
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-13 18:43:16 -04:00
martin 9fc2932be6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-13 14:56:48 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
 2011-09-13 14:56:24 -04:00
James f25304bcb7 CC-2789: Prevent brue-force password guessing attacks 
- add recaptcha on login page
 2011-09-13 14:16:16 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2011-09-09 15:07:43 -04:00
martin 8b09f82aa3 -when returning a file url for download, use the server address 
that the server was contacted with.
 2011-09-09 11:45:19 -04:00
james b73016550b CC-2265: Date Start is not updated after dragging show to new day 
- fixed
 2011-09-07 17:30:25 -04:00
James fa929d45a6 CC-2753: Ability to disable stream 1 but still show it in the interface 
- interface change
- all elements becomes 'disabled' depending on 'disable_stream_conf' flag
 2011-09-02 16:13:30 -04:00
James 903c3474c7 CC-2654: Remove abilities that don't apply to SaaS 
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
 2011-09-02 15:24:35 -04:00
James 78ffa74bab CC-2755: trial ending date 
- add functions in Preference.php
 2011-09-02 11:30:47 -04:00
James c6557e1280 CC-2756: Ability to set plan level 
- created setter and getter in Preference.php for plan level
- renamed airtime-stream to airtime-system
- airtime-system is removed from this repository(moved to airtime-saas)
 2011-09-02 10:37:15 -04:00
James 39b688c256 CC-2661: Uptrade script for stream config feature 
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
 2011-09-01 16:02:06 -04:00
James ed5b7bca5f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-31 16:28:40 -04:00
James 0a85d2ecf5 CC-2727: Limit number of streams and max bitrate 
- renamed
SetNumOfStream() -> SetNumOfStreams()
GetNumOfStream() -> GetNumOfStreams() \
- default bitrate is 320
- removed debugging code
 2011-08-31 16:28:20 -04:00
martin 0517bf0c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-31 15:14:44 -04:00
martin 5f56538bff CC-2363: Diagnostic screen in Web UI 
-show hard drive space for /srv/airtime/stor
 2011-08-31 12:52:12 -04:00
martin 03cb154bd1 CC-2737: Show disk space used/space available/ disk quota enforcement 
-modify airtime-check-system to return values instead of printing
 them directly
-add ability to view select airtime-check-system via web interface
 2011-08-30 18:00:03 -04:00
James cdd1da3963 CC-2740: Upload issue 
- fixed a bug for uploading a file with "+" signs in IE
 2011-08-30 15:35:03 -04:00
James d0ecd0acf1 CC-2740: Upload issue 
- fixed a bug for uploading a file with "+" signs in IE
 2011-08-30 15:25:33 -04:00
james b92793e80f CC-2727: Limit number of streams and max bitrate 
- create airtime-stream php script to set number of streams and max bitrate
- the stream section itself is not displayed rather than grey out
 2011-08-26 15:41:20 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
 2011-08-26 12:56:10 -04:00
James 14e1e15830 CC-2733: Resume play is broken: mp3 files skipped 
- killing old pypo and liquidsoap processes
- comparing mime type againt old type of mime
 2011-08-25 16:32:57 -04:00
martin 7cfde811c9 CC-2729: Items in a playlist delivered from the server via JSON aren't in the proper order 
-fixed
 2011-08-24 18:13:50 -04:00
James 58837ff89b CC-2706: Streams should have a username field 
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
 2011-08-24 17:13:56 -04:00
James 9eb21cb327 Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
 2011-08-24 10:30:59 -04:00
James 3e3391dfba CC-2718: Changes to the support page 
- stroing and retreving new value "privact" to DB
- Displaying "Terms and Condition" link when user agrees it
 2011-08-23 15:11:21 -04:00
martin 009c75b217 CC-2683: All times in the database are not stored in UTC. 
-playlist mtime now uses UTC
 2011-08-22 10:14:06 -04:00
James 56a21a524e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 16:35:54 -04:00
James a73612afd2 CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface 
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
 2011-08-19 16:35:23 -04:00
martin 1272c172b7 CC-2703: orange progress bar is playing when there is not content 
-previous and future shows are now ignored as well
 2011-08-19 15:46:35 -04:00
martin 7859783ccb CC-2703: orange progress bar is playing when there is not content 
-fix it so that previous and future shows are ignored as well.
 2011-08-19 15:45:07 -04:00
martin 75ac719b33 Merge branch '1.9.1' into devel 2011-08-19 12:30:14 -04:00
martin c0189e3c5d CC-2703: orange progress bar is playing when there is not content 
-fixed
 2011-08-19 12:29:26 -04:00
martin 846e08699e CC-2628: update a repeated show start time cause the show to get corrupted 
-disabled dragging + dropping repeated show instances
 2011-08-18 18:13:43 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI 
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
 2011-08-18 13:53:12 -04:00
martin 266ee56d6d CC-2683: All times in the database are not stored in UTC. 
-missed a spot where we need to use calculate in UTC
 2011-08-17 16:35:03 -04:00
martin e392c8437a cc-2683: not using utc time 
-clean up recorder file
 2011-08-16 16:36:31 -04:00
martin 8aa26b2eb0 cc-2683: not using utc time 
-top panel now start at correct time
 2011-08-16 15:07:55 -04:00
martin 41fd5f2543 cc-2683: not using utc time 
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
 2011-08-16 15:07:55 -04:00
martin 03f8163764 cc-2682: not using pypo time 
-Remove messages being sent to pypo to change its timezone
-fix time conversion bug in pypo-push
 2011-08-16 15:07:55 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time 
-pypo now works in UTC time
 2011-08-16 15:07:54 -04:00
martin 6ee3d2f5e0 cc-2683: not using utc time 
-date/time values are converted to UTC before storing in database
 on show create
-cleanup
 2011-08-16 15:06:02 -04:00
James 4f2b2dba6d CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI 
interface

- dummy page "Stream Setting" page for the test
- StreamSetting model is added
- set owner and group as 'pypo' for liquidsoap.cfg
- pypofech handle 'update_stream_setting' command
 2011-08-15 16:10:46 -04:00
martin b538f1cc82 CC-1942: Add ability to set timezone in preferences 
-change timezone in python
 2011-08-15 10:06:42 -04:00
martin 84ec62eeca CC-1942: Add ability to set timezone in preferences 
-Can change the timezone for PHP. Need to change for python as well.
 2011-08-15 10:06:42 -04:00
James 13285fdd63 CC-2607: Ability to adjust stream bitrate, type, etc from UI interface 
- created table cc_stream_setting and it's initial entries
- pypo installation will generate liquidsoap.cfg on install time
based on information on cc_stream_setting table
 2011-08-12 15:19:30 -04:00
James 1c81d0d238 CC-2631: Convert pypo to accept commands from RabbitMQ 
- initial commit
 2011-08-11 16:20:20 -04:00
James 968c0f96a2 CC-2651: import idicator 
- Threshold is 10 seconds
- record timestamp once every 5 seconds
- "File import inprogress..." displays above search box
- pyinotify read_freq changed to 0.1 from 1
 2011-08-09 10:40:10 -04:00
James 05b2a9679b CC-2651: Prevent chaning the storage dir while import is happening 
- done
 2011-08-08 17:07:52 -04:00
James 9ff5bdaf0f CC-2652: display info about import 
- temp commit
 2011-08-08 14:44:05 -04:00
Naomi Aro dfb7ca69f6 CC-2632 : Language metadata from version 1.8 doesn't exist in 1.9 metadata 2011-08-05 15:09:03 -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 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
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
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
Naomi Aro b302006100 CC-2571 : Media Monitor Bootstrap 
fixing up character encoding issues.
 2011-07-21 12:12:37 +02: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 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
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 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
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
James 8f1e0a0767 CC-2553: Exception thrown 
- fixed
 2011-07-15 17:35:16 -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 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 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
james ece84a04c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-08 17:46:50 -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 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
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
martin 805d3616fe cc-2419: media monitor import on startup 
-fixed support for watched dirs #2
 2011-07-04 17:59:02 -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 d260c66abc cc-2419: media monitor import on startup 
-added multiple dir support
 2011-07-04 15:08:02 -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 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 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 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
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
Naomi Aro 0111fd5725 cc-1799 : Filesystem 
incorrect variable.
 2011-06-28 15:04:03 +02:00
james c7f5a8689c - adding comment and rewriting function description 2011-06-27 17:34:17 -04:00
james 52dc267670 CC-2357:Tweak to show date end 
- fixed
 2011-06-27 15:59:29 -04: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 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 8eb3ec3df2 CC-2449: Add promote flag for data collection 
- done
 2011-06-25 23:28:42 -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
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
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
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 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
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
martin 98259e71bb -syntax error in MusicDir.php 2011-06-21 11:55:44 -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 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
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
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 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 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 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 b747ce6fb0 cc-2344: wrong song displayed 
-fixed
 2011-06-02 12:45:57 -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
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
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 b87e661f96 Merge branch 'devel' of dev.sourcefabric.org:airtime 2011-05-16 11:45:23 -04:00
naomiaro a3d7c5e70b CC-1799 : Live Studio Playout from media library (pytagsfs) 
metadata almost working from airtime form -> python daemon. Just need to look into permissions for some stor folders.
 2011-05-13 13:25:55 -04:00
Naomi 5be039d349 CC-1799 : Live Studio Playout from media library (pytagsfs) 
if a tag is edited by easytag, the change is now reflected in airtime database.
 2011-05-13 13:25:55 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
mkonecny 359c4a4eb8 cc-2126: user shouldnt be able to delete himself 
-changed it so that the "x" is still visible, but when clicking,
an error message shows. Did this because the columns were resizing
when the x wasnt visible. Also the empty column looked weird with only
one user.
 2011-05-05 23:42:14 -04:00
James Moon 2a5df8bed9 CC-2126: User should not be delete himself 
Done.
 2011-05-05 23:42:14 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap 
-implemented
 2011-05-05 16:45:13 -04:00
mkonecny 1337efcdcd cc-2229-refactor-now-playing-code 
-bug fix with red gap bar showing even when there was no gap
 2011-05-05 15:00:42 -04:00
mkonecny 038f2e1c69 cc-2229-refactor-now-playing-code 
-bug fixes
 2011-05-05 14:55:45 -04:00
mkonecny 7010f2156e cc-2229-refactor-now-playing-code 
-further refactoring...
 2011-05-05 14:08:52 -04:00
mkonecny 48ed126703 CC-2229-refactor-now-playing-code 
-server side done.
 2011-05-05 13:24:21 -04:00
mkonecny 1492dcf283 cc-2229-refactor-now-playing-code 
-initial check-in
 2011-05-05 00:28:34 -04:00
martin 8e2019a935 cc-2182: Convert back to restful design 
-done
 2011-05-02 16:33:37 -04:00
martin 9e01e389ea cc-2182: convert back to restful design 
-initial commit
 2011-05-02 15:33:32 -04:00
martin 50c649dc59 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:31:18 -04:00
Paul Baranowski d14dc6cbe3 Merge commit '08864f79347e912e990f5ce0e86e5a8e739dc29d' 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Shows.php
 2011-04-25 18:49:51 -04:00
Paul Baranowski 219598ac06 CC-2225 airtime-clean-storage doesnt work 
Forced the user to run the script as superuser.
 2011-04-25 18:34:03 -04:00
Paul Baranowski 78ed3e2822 Merge commit 'bfb90eefd10226ca32cc4e3c39cbb34ab88178d8' into 1.8.1 2011-04-25 17:58:34 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
 2011-04-25 17:24:53 -04:00
Paul Baranowski 07633ea249 CC-2225 airtime-clean-storage doesnt work 
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking

Had to rewrite the airtime-clean-storage script.
 2011-04-25 16:48:34 -04:00
James Moon bf34170f29 Temp commit. 
It's not done, need to work more later.
 2011-04-25 10:11:12 -07:00
martin 05ff297cf3 CC-2227 repeating weekday show bug 
-fixed syntax error
 2011-04-22 00:58:01 -04:00
martin 3e560bb082 CC-2227: Repeating weekday show -> Add weekend -> first weekend after show does not have new shows 
-Should be fixed
 2011-04-21 21:50:50 -04:00
martin 7a3fbe9ac7 CC-2196: Update a Live show with invalid data, uncheck the Record checkbox 
-fixed
 2011-04-18 12:01:02 -04:00
martin e48f044e56 -CC-2192: Schedule sent to pypo is not sorted by start time. 2011-04-15 12:26:59 -04:00
Paul Baranowski 03ab7edea0 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 18:55:15 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00