Commit Graph

552 Commits

Author SHA1 Message Date
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
James 22c9416c31 CC-2747: When metadata contains non utf-8 encoding, we should handle it
- we cover some cases with cp1252 encoding for now.
- extra fix: Logging.php (copied from 2.0.0)
2011-08-31 14:46:21 -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
James c460519a88 Merge branch '1.9.1' into devel 2011-08-31 10:15:00 -04:00
James 982c8f9c20 CC-2746: Removing required attribute from all fields
- done
2011-08-31 10:13:57 -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 b5645d238a CC-2746: Edit metadata loses data if required data is missing
- fixed
2011-08-30 16:50:46 -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 7335dcc2b3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-29 17:44:46 -04:00
James cab2a0f8f4 CC-2661: Upgrade script for steam config feature
- done
2011-08-29 17:44:28 -04:00
martin 1e70feda6b CC-2438: Add a button to listen to the stream immediately
-Pop-up. Just need a proper skin.
2011-08-29 15:30:00 -04:00
James 83bba9532e CC-2089: create "cancel show" command for pypo
- done
2011-08-29 11:54:44 -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 d992457bd5 CC-2607: handling comment
- each line read is trimed now
- xtra bug fixed:
- bug on merging with 1.9.3
- state_change_restart array is filled with info for displaying
purpose
2011-08-26 13:13:02 -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 ad620577be - Version string fix 2011-08-25 17:16:09 -04:00
James 2901a7a7eb - Version string change for 1.9.3 2011-08-25 17:02:56 -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 30d0cedc34 CC-2718: Changes to the support page
- fixed a case when it didn't store 'privacy' flag when 'publicise'
is checked on support setting page
2011-08-24 16:49:47 -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 405edcc5fa CC-2718: Changes to the support page
- "Help Airtime" button is enanbled solely depending on feedback checkbox
when user already agreed to Terms and condition
2011-08-23 16:46:29 -04:00
James 4c4b57fd31 CC-2718: Changes to the support page
- overriding isValid in RegisterAirtimeForm
2011-08-23 16:09:11 -04:00
James 796a762908 CC-2718: Changes to the support page
- only need to validate publicise fields when publicise is on
2011-08-23 15:42:36 -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 e580c5ae0d CC-2438: Add a button to listen to the stream immediately
-initial commit
2011-08-23 12:45:03 -04:00
martin d7830785df CC-2717: Media Monitor forgets about watched directories after being restarted 2011-08-22 20:41:34 -04:00
James 376ae1370c CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime
- done for new install
- upgrade need some more work
2011-08-22 12:03:09 -04:00
martin c61759a1da CC-1942: Add ability to set timezone in preferences
-fixed spelling mistake
2011-08-22 11:37:48 -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
martin fdf1b4c100 CC-2692: Integrate ZFDebug into Airtime
-done
2011-08-22 10:12:53 -04:00
James dc6ed33b47 Merge branch '1.9.1' into devel 2011-08-19 16:43:16 -04:00
James d6692b7cf9 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 16:43:01 -04:00
James 30fcb0b95d CC-2704: Support settings UI tweaks
- adding server name again under Preference
2011-08-19 16:42:46 -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 ea2981574c Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 15:46:45 -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 5a84ad4e9d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 15:45:20 -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 13f7a73850 -convert playlist.js to all spaces (instead of tabs) 2011-08-19 15:30:00 -04:00
James f2f599f723 CC-2704: String change
-fixed
2011-08-19 15:00:45 -04:00
James 9b6ead98ae Merge branch '1.9.1' into devel 2011-08-19 14:58:56 -04:00
James 8e108e8596 CC-2704: Change text
- fixed
2011-08-19 14:58:31 -04:00
James 314749bf98 Merge branch '1.9.1' into devel 2011-08-19 13:11:11 -04:00
James bb97a0eede CC-2704: Support Setting UI tweak
- move station name under publicise
- make it required field
2011-08-19 13:09:10 -04:00
martin 75ac719b33 Merge branch '1.9.1' into devel 2011-08-19 12:30:14 -04:00
martin fa50c93914 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 12:29:41 -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
James e14e4f3713 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 12:23:34 -04:00
James ac448c8dbb CC-2704: Change "Stream Setting" -> "Stream Settings"
- done
2011-08-19 12:23:15 -04:00
James 8e0496d8c1 CC-2704: Support Setting UI tweak
Merge branch '1.9.1' into devel

Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
2011-08-19 12:22:08 -04:00
James db225dd610 CC-2704: Support settings UI tweaks
- Move station name to "Support Settins" page
2011-08-19 12:19:35 -04:00
martin a1c2b0f7d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 12:07:42 -04:00
martin b87e95126c CC-2379: "Add Show" uses browser time instead of server time
-added note about custom changes to fullcalendar.js
2011-08-19 12:07:34 -04:00
James 43298d60be Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 19:08:10 -04:00
James f855da0f45 Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/configs/navigation.php
	install_minimal/DoctrineMigrations/Version20110711161043.php
	python_apps/api_clients/api_client.py
2011-08-18 19:05:13 -04:00
James d83f9f1b96 CC-2701: Separate Support Settings from Preference page
- done.
2011-08-18 18:58:59 -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
martin fc66b1d1ba Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 15:44:57 -04:00
martin dd9ef5b9c8 CC-2379: "Add Show" uses browser time instead of server time
-Fixed
2011-08-18 15:44:16 -04:00
James 873f7e1dae CC-2698: upgrading fail from 1.8.2->1.9.0
- fixed version string
- deleting entries from cc_schedule before adding "ON CASCADE" constraint
2011-08-18 15:32:33 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James 4275cc6667 CC-26027: Remove file
- removing old file
2011-08-18 13:53:50 -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 4eaf56b93f -station name in preferences no longer required 2011-08-17 15:55:11 -04:00
martin e392c8437a cc-2683: not using utc time
-clean up recorder file
2011-08-16 16:36:31 -04:00
martin 0a11160298 cc-2683: not using utc time
-fix install script inputting timezone preference even if
 it already existed
2011-08-16 15:34:19 -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
James e18c0903cb -version string changes 2011-08-15 11:11:55 -04:00
James 75d0e64bdd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-15 11:10:20 -04:00
James 9cad6fe766 -version string changes 2011-08-15 11:10:01 -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 691a83ccd0 - version string and changelog changes 2011-08-09 11:44:11 -04:00
James b9d969e45a CC-2656: Change user manual link on help page
- done
2011-08-09 11:35:25 -04:00
James ad67fbab56 CC-2655: parseInt was using octat radix
- Change parseInt() to use 10(decimal) radix
2011-08-09 11:26:12 -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 a199585cb9 CC-2647 : Check MD will fit db constraints in Airtime 2011-08-05 15:12:55 -04:00
James 6c6776e2ce - version string change 2011-08-05 15:12:55 -04:00
James 5124fa67d3 CC-2626: long numbers after the dot should be truncated
- fixed
2011-08-05 15:09:04 -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 83432e1996 CC-2634: Downloading a file with a non-ASCI name, doesn't
show up those chars

- removed pathinfo() call and manually parsing the basefile name.
2011-08-05 15:09:03 -04:00
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