Commit Graph

294 Commits

Author SHA1 Message Date
lukabazuka b3cf225d85 jPlayer CSS changes 2011-10-07 15:46:42 +02:00
James 03a339bfeb CC-2937: Remove the word "Metadata" from metadata popup window
- done
2011-10-06 12:39:10 -04:00
martin 929e29182b CC-2908: Add "Live Stream" title to live stream popup window
-custom logo
2011-10-04 17:18:36 -04:00
James 7f2acb072b CC-2895: Manage Media Folder: Title disappears after adding watched
folder

- fixed
2011-10-03 17:35:43 -04:00
James 7648c8e318 CC-2917: Adding show, when inputting time and specifying a bogus time
(like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- minified js file
2011-10-03 17:22:29 -04:00
James 64a46294c9 CC-2910: Ability to collapse stream sections in "Stream Settings"
- done
- only stream 1 is expanded by default
2011-10-03 17:00:39 -04:00
James e2ff0a6a94 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 16:50:50 -04:00
James 0e29dfa617 CC-2917: Adding show, when inputting time and specifying a bogus
time (like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- fixed by implementing masking on the fields
- used meioMask jquery plugin
2011-10-03 16:43:32 -04:00
James 79519e25c2 CC-2875: Soundcloud error icon
- fixed
2011-10-03 15:48:43 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 4f11428b60 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 14:13:02 -04:00
martin 27892c8b46 CC-2906: Airtime Volume Control is invisible when turned on.
-fixed
2011-09-30 15:48:12 -04:00
martin 20c2405f20 CC-2907: Stream player window gets a 404 when clicked
from "Stream settings" page

-fixed
2011-09-30 14:46:09 -04:00
martin a31920e982 CC-2438: Add a button to listen to the stream immediately
-Streams selectable by their description
-Repeatedly clicking on the ON-AIR, focus()es the window
 instead of reloading it.
2011-09-30 12:58:49 -04:00
martin c469f51eb3 CC-2908: Add "Live Stream" title to live stream popup window
-done
2011-09-30 11:45:51 -04:00
James bd4c9f9651 CC-2899: Error on stream setting page can be hidden by a collapsed section
- fixed
2011-09-29 12:03:11 -04:00
martin fef0392e43 CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -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
James ac13bba2db CC-2874: adding error icon
- done
2011-09-22 17:06:33 -04:00
James 350aaf2335 Merge branch '1.9.1' into devel 2011-09-22 14:33:14 -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
James 95a2c179c2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 13:40:32 -04:00
James 6d23ea4b49 CC-2308: 404 page
- done
2011-09-22 13:40:16 -04:00
martin 3fe823f84c CC-2363: Diagnostic screen in Web UI
-Change disk numbers to start at one instead of zero.
2011-09-22 12:28:21 -04:00
James 43ba92a535 CC-2866: progress icon not showing
- fixed
2011-09-22 12:15:03 -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 4e79a88adc CC-2363: Diagnostic screen in Web UI
-Don't log to console
2011-09-22 11:01:16 -04:00
martin 046f98db8f CC-2363: Diagnostic screen in Web UI
-everything working
2011-09-22 10:45:43 -04:00
James a4fb63afcf CC-2856: duration was is always fixed to 1h
- fixed
2011-09-21 10:16:48 -04:00
martin 19d61ad780 CC-2363: Diagnostic screen in Web UI
-working with ajax now!
2011-09-19 17:55:26 -04:00
martin 5a5430f468 CC-2363: Diagnostic screen in Web UI
-add vladimirs design
2011-09-19 15:45:23 -04:00
Martin Konecny debfcc112d Merge branch '1.9.1' into devel 2011-09-19 12:48:15 -04:00
James bd33b12d71 CC-2842: Clicking "Additional Options" in stream settings opens it for all
- fixed
2011-09-19 11:31:10 -04:00
James 09df72862d CC-2768: Plupload update
- fix for 1.9.4
2011-09-19 11:15:53 -04:00
James 637eaafcc4 CC-2839: End Date and Time show NaN when incorrect start date is entered
- fixed
2011-09-19 11:10:55 -04:00
James ee7bb8babe CC-2835: styles.css file merge
- done
2011-09-16 14:13:01 -04:00
James 2a0839f7ba CC-2768: Plupload needs update to fix issue with Safari 5.1 and html5
- fixed by upgrading plupload to 1.5
2011-09-16 11:33:19 -04:00
James 1e4bcdf831 CC-2814: Login error messages need to be highlighted
- done
- Recaptcha box and submit button is moved to center
2011-09-14 17:50:00 -04:00
James f60a4439be CC-2775: layout fix
- fixed
2011-09-14 16:43:16 -04:00
James ebf5c75af3 CC-1929: login page: username should get focus on loading
- done
2011-09-13 15:29:01 -04:00
James 750482474f CC-2791: limiting length and numeric with javascript
- done
2011-09-13 15:21:23 -04:00
James e918f3b29a CC-2791: "Port" should only allow numbers and 5 digits
- fixed
- fixed scrolling when errors
2011-09-12 13:57:26 -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
James 8239588a95 CC-2798: Delete a song from the playlist builder doesn't refesh
the list

- fixed
2011-09-09 11:35:30 -04:00
james 57781f819e CC-2622: stop current play song, when item is removed from thie list
- fixed
2011-09-08 15:09:12 -04:00
james f1c311acb6 CC-2775: Better layout for Stream Settings page
- layout is done
- need to implement status update part
2011-09-07 09:48:02 -04:00
James 361dc4569e CC-2771: Liquid soap doesn't support bitrate lower than 48 Kbits for ogg files
- fixed
- extra fix: option ogg is disabled when shoutcast is selected
2011-09-06 11:44:21 -04:00
James 1a8214fccc CC-2755: Ability to set trial ending date
- codes for front end.
- design needs to be integrated.
2011-09-02 12:02:02 -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
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 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 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 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
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 13f7a73850 -convert playlist.js to all spaces (instead of tabs) 2011-08-19 15:30:00 -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 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 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 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 8aa26b2eb0 cc-2683: not using utc time
-top panel now start at correct time
2011-08-16 15:07:55 -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 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 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
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 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 99c505bddc CC-2581: some of php.ini directive has to be moved
- done
2011-07-21 16:06:59 -04: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
martin 8ca2eec3e0 CC-2561: Broken image links when selecting directory from server.
-fixed
2011-07-18 17:09:03 -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
James 24891604d3 CC-2507:Deleting a playing during editing does not refresh page
- fixed
2011-07-14 16:57: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
james ba4733ceb6 CC-2460:Popup shouldn't show after X is pressed
- changed name to "donotshowregistrationpopup"
2011-07-06 17:02:58 -04:00
martin 6b9066466b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 14:43:01 -04:00
martin 67df619c90 CC-2272: Ability to change storage directory location
-done
2011-07-06 14:42:43 -04:00
james a8546e289e CC-2068:Now playing should use Title/Creator, not Song/Artist
- fixed
- removed some unnecessary code.
2011-07-06 13:56:27 -04:00
james 752f60bd76 CC-2512:Small browser window causes day/week/month buttons to
overlap Calendar

- fixed
- also margin was adjusted to more reasonable size
2011-07-06 11:57:42 -04:00
james 156a114bd5 CC-2507:Deleting a playlist during edting does not refresh the page
- fixed
2011-07-06 11:45:34 -04:00
james acf5dbd6df CC-2515:Phone Home Metric:prevent parent window refreshing
- fixed.
2011-07-06 11:32:57 -04:00
james e69c0ea351 CC-2510:Pref screen: able to select promote my stn
- fixed
2011-07-06 11:12:13 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
2011-07-05 15:53:50 -04:00
james dcddec9536 CC-2447:Preview keeps playing if you create a new playlist
- fixed
- preview stops on clicking on any of new, delete, done editing button
2011-07-04 14:49:17 -04:00
james cb72db4a31 CC-2460:Popup shouldn't show after X is pressed
- changed function name to "donotshowpopup"
2011-07-04 13:11:35 -04:00
james 4ca7b3cf16 CC-2501:registration-workding-change
- temp commit. Styling is still broken
2011-07-04 13:07:46 -04:00
james d9a9af9e6d CC-2476:Dragging a playlist, draws a orange grid
- fixed(Thanks to Vladimir)
2011-07-04 11:35:35 -04:00
james 22df189cdc CC-2477:Duration box is too small
-fixed
2011-07-04 11:11:35 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X
- fixed
2011-07-04 09:54:44 -04:00
james 79ea4ead9d CC-2468:Changing host to DJ
- style.css change
2011-07-04 09:31:07 -04:00
james 8475326d96 CC-2475:When Promote is checked promote info section has to be
expanded by default

- fixed
2011-06-30 12:29:35 -04:00
james 48537c3c10 CC-2484:Calendar sholdn't move down
- the fix was fairly easy. so I did complete fix.
2011-06-30 12:15:54 -04:00
james 43c8a28633 CC-2455:Show what i am sending heading
-fixed
2011-06-29 17:28:51 -04:00
james 3f8e61f949 CC-2458:Diabled checkbox do no look diabled
- fixed
2011-06-29 16:55:44 -04:00
james a018466b80 CC-2468:Manage Users Say DJ and add show says host
-fixed
2011-06-29 16:33:20 -04:00
james ae35ef12c2 CC-2457:Confimation before deleting or changing
- done
2011-06-29 14:42:56 -04:00
martin e8c36be242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-28 12:50:15 -04:00
martin 00910ae346 -clean up imports in MediaMonitor.py 2011-06-28 12:50:05 -04:00
james 2163efc1be CC-2425:Tweaks to phone home metrics
- In order for the user to click the "Yes, Help Airtime" button,
both "send support feedback" AND "privacy policy" should be checked
2011-06-28 12:47:54 -04:00
james 11af81133c CC-2431:Clendar shrinking issue
-fixed
2011-06-27 17:32:54 -04:00
james 33bb5560bf CC-2357: tweak to show date end
- fix on end time.
2011-06-27 16:29:22 -04:00
james 52dc267670 CC-2357:Tweak to show date end
- fixed
2011-06-27 15:59:29 -04:00
james 4eea4f11b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-27 14:38:16 -04:00
james 6a7f1d3588 CC-2412:Error causes box to float
- fixed
2011-06-27 14:37:31 -04:00
Naomi Aro 363a73af10 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 2011-06-27 18:31:13 +02:00
Naomi Aro e8265614ba CC-2456 : Multiple storage folders show up on the same line 2011-06-27 18:05:28 +02:00
james 396bfd5f8d CC-2453:Make textarea non resizable
- fixed
2011-06-27 09:55:39 -04:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences
applying html/css changes to music folder preference page.
2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
2011-06-26 23:13:49 -04:00
James 59e19fe9d1 CC-2450:Phone home metric
- email is not required anymore.
- Send info box suppose to dispalys filelds only when thev
value is non-empty string. It wasn't diaplyng where the
value was 0(fixed).
2011-06-26 01:01:35 -04:00
James a936212355 Merge branch 'cc-2425-tweak-phone-home' into devel 2011-06-26 00:45:30 -04:00
James 194ad31c9f CC-2425:Tweak phone hom
- done
2011-06-26 00:45:02 -04:00
James cc542797c7 CC-2425:Tweaks to phone home metric
- Done
2011-06-24 17:26:37 -04:00
James Moon 52e41555bd CC-2426:Time boxes are too big
- fixed
2011-06-23 00:05:57 -04:00
James Moon 3c3850db29 CC-2305:Create playlist out of range
- HTML is fixed as Valdimir requested.
- CSS is fixed.
2011-06-22 23:37:26 -04:00
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
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 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 fd1c202de9 CC-2381: Songs library search speed performance
-removed javascript alert popup
2011-06-17 15:18:09 -04:00
martin b802ba9a42 cc-2381: slow library searching speed
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
james 1fbaa7d5fb CC-1724:Phone home statistics
- Popup form validation is added( javascript )
2011-06-16 14:26:24 -04: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
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
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
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