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

339 Commits

Author SHA1 Message Date
Martin Konecny f7fb6ddff0 -better naming of show instance functions 2011-11-11 22:24:37 -05:00
Martin Konecny 42cde33648 CC-3030: Repeating shows is broken in devel branch. 
-working towards using only DateTime objects
 2011-11-11 17:25:49 -05:00
James b04b7ff010 CC-2848: Misc bugs from demo service 
- Handling concurrency issue playlist section and show(canlendar) section
 2011-11-10 15:35:27 -05:00
James c3d35df55c CC-3026: Schedule Media: The show time displayed in this window is UTC time 
- fixed
 2011-11-09 14:29:52 -05:00
Yuchen Wang 6ffecf80c8 CC-2965: Frontend widget displays shows in UTC time 
Not only were frontend widgets showing UTC time,
the SQL query was also comparing UTC timestamp with local timestamps,
causing widgets to display shows in the wrong day, etc.

Another problem was that "On air today" widget was simply calling
GetNextShows which returns shows within next 48 hours.

Fixed by:
1. Under models/Show.php:
In the GetCurrentShow/GetNextShows/GetShowsByDayOfWeek functions,
added code to convert UTC timestamp to local timestamp or vice versa,
depending on which one is more suitable, in SQL queries, thus
removing inconsistency in timezones. Also, before returning query result,
added code to convert result to local timezone.

In GetNextShows, added an optional parameter endTime to limit the interval
of shows to get. This is useful for the "On air today" widget.

2. Under models/DateHelper.php:
Added a few timezone functions to help converting timezones easier in Show.php.

3. Under controller/ApiController.php:
Added todayInfoAction which is to be used by "On Air Today" widget.
 2011-11-04 16:57:24 -04:00
Martin Konecny 56edfe4e68 CC-2758: Make airtime-install script Debian/Ubuntu compatible 
-uninstall script added
 2011-10-28 12:35:58 -04:00
James f2bf92297a CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page 
- fixed a case where it was displaying "OK" when liquidsoap was not running
 2011-10-23 06:29:06 -04:00
James fb8735588d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-22 11:34:43 -04:00
James f160ded6bc CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu 
- fixed
- extra fix: handles the case when username or password is empty
 2011-10-22 11:34:04 -04:00
Yuchen Wang d9186a3bf2 CC-2951: Allow users to select the starting day of the week 
Added system preference in Preference page for user to select the start day of a week
(defaults to Sunday).

Calendar will utilize this information and update the calendar UI accordingly.
 2011-10-19 12:42:22 -04:00
Yuchen Wang d2fe46baf0 CC-2436: Save pulldown settings 
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.

When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
 2011-10-18 10:10:35 -04:00
Yuchen Wang 8b2a23b88a CC2646: Set a calendar view default (Day/week/month) that's remembered 
Updated the calendar page so that when user chooses a different time scale to display(day/week/month),
the new setting is stored in the pref database. Each user id has its own entry in the database.

When visiting the calendar, we retrieves the entry from database for current user
and show that time scale; defaults to monthly view if no entry found.
 2011-10-14 14:17:06 -04:00
Martin Konecny 5a83c5b81e Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
 2011-10-14 01:38:52 +02:00
Martin Konecny f1864e79d8 CC-2973: Api key is being used for downloads in the "Show Content" window + "Playlist Builder" page. 
-fixed
 2011-10-14 00:12:33 +02:00
james faba5aec57 CC-2745: Show status of liquidsoap/icecast connection on 
Stream Settings page

- commit w/o design
 2011-10-13 14:22:28 -04:00
james d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings 
page

- initial commit
 2011-10-10 20:14:27 -04:00
James c35f77a9aa CC-2932: Recorder: When show is recorded, the file name is generated 
with UTC time.

- fixed
- new pybundle is created with 'pytz' package
 2011-10-05 17:27:00 -04:00
James 3f495e7532 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- changed function name
- changed database flag name
 2011-10-04 17:38:21 -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
martin 7dd14efe27 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder
 2011-10-04 15:49:02 -04:00
martin cb3060623c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 14:01:48 -04:00
martin 5190a0c24c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 13:59:27 -04:00
James b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- fixed name of Soundcloud Model class
 2011-10-03 18:02:01 -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 dcda08e17a CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2011-10-03 14:17:56 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 5e9aec93a8 CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata
 2011-10-03 14:10:47 -04:00
Paul Baranowski 44481d2776 SAAS-41: Changed name of boolean value from disable-stream-conf to 
enable-stream-conf for easier logic.
 2011-09-29 18:11:22 -04:00
James 7e3d25eeaa CC-2795: Give option to set download flag of recorded shows 
uploaded to Soundcloud by default

- done
 2011-09-29 17:10:17 -04:00
James bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00
James 3775e5f4a7 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-29 15:02:34 -04:00
James 46146d1216 cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php
 2011-09-29 15:02:30 -04:00
James 1c652b6416 CC-2873: Soundcloud plugin doesn't log any error when there is an error 
with soundcloud uploading through api controller

- Changed constant names
- added -1 constant
 2011-09-29 10:30:40 -04:00
martin 4e105e6151 CC-2891: Unicode error with metadata that contains unicode strings 
-fixed
 2011-09-28 16:04:40 -04:00
James 28f1d885f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:46:10 -04:00
James d1542b0d89 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-28 13:45:21 -04:00
martin f697e475fd CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 
-remove icecast monitoring for now
 2011-09-28 12:45:19 -04:00
James b1fa8901ca cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit
 2011-09-27 14:49:03 -04:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files 
-autoload DateHelper class
 2011-09-26 15:29:12 -04:00
martin b8838a5bda CC-2833: Use ClassLoaders for PHP Files 
-autoload AtSoundcloud class
 2011-09-26 15:25:03 -04:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files 
-autoload RabbitMq class
 2011-09-26 15:19:23 -04:00
james e1fe877ac6 CC-2873: Use PHP constants 
- done
 2011-09-25 17:29:57 -04:00
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 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 9bb901945e CC-2833: Use ClassLoaders for PHP Files 
-shows.php
 2011-09-23 10:54:20 -04:00
James e722ff8c36 CC-2873: soundcloud error log to DB 
- fixed
 2011-09-22 16:59:13 -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 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 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 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 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
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-13 18: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
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
James 0591c9d76f CC-2790: Stream type "OGG" should be "OGG/VORBIS" 
- fixed
 2011-09-12 13:16:34 -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 b73016550b CC-2265: Date Start is not updated after dragging show to new day 
- fixed
 2011-09-07 17:30:25 -04:00
Paul Baranowski 37415f33d4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-06 15:28:57 -04:00
Paul Baranowski 7379da83c6 CC-2049: Log in/out versus sign in/out of admin interface 
Fixed by removing "Sign in" terminology.

Moved "About" link to underneath the "Help" menu.
Simplified the upper right hand corner of the Admin interface.
 2011-09-02 17:29:08 -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 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 c460519a88 Merge branch '1.9.1' into devel 2011-08-31 10:15:00 -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
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 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 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 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
martin 4ca480ba5e Merge branch '1.9.1' into devel 2011-08-19 17:07:59 -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 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
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 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 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 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
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 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 5124fa67d3 CC-2626: long numbers after the dot should be truncated 
- fixed
 2011-08-05 15:09:04 -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 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 96284a2a44 CC-2562 : Allow users to convert linked files into watched directories 2011-07-25 16:21:42 +02: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 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 ba0458c442 CC-2558 : Delete all files from disk, only allow admins to delete. 2011-07-19 11:00:32 +02: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 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 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 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
martin 8574eb7063 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-07 16:05:47 -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
james 25725c5ce2 CC-2520:Phone Home stat:Popup doesn't get disapeared 
- fixed
 2011-07-07 14:09:55 -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 f8b8a6bada Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 13:56:51 -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
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
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 883cacd220 CC-2509:Phone Home stat: not able to upload logo via popup 
- fixed
 2011-07-05 14:21:32 -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 c67e711a05 cc-2419: media monitor import on startup 
-fixed syntax errors, added more logging.
 2011-07-04 15:40:09 -04:00
martin d260c66abc cc-2419: media monitor import on startup 
-added multiple dir support
 2011-07-04 15:08:02 -04:00
martin ae156c85b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:29:19 -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 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 75ea77e6a6 CC-2503: replacing UI_MDATA_KEY_TITLE with MDATA_KEY_TITLE 
-fixed
 2011-07-04 10:00:37 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X 
- fixed
 2011-07-04 09:54:44 -04:00