Commit Graph

7709 Commits

Author SHA1 Message Date
Martin Konecny e056e5ff01 correctly rename AirTime to Airtime 2012-07-16 15:33:44 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Martin Konecny 6a4fd4973e CC-4104: airtime-uninstall should not purge airtime database be default
-done
2012-07-16 14:18:40 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny 5661872034 checkAuth in init() function 2012-07-15 21:07:34 -04:00
Martin Konecny 8dcb1f8f3d CC-4101Calendar displays white on white for certain show names, making shows invisible 2012-07-13 10:28:50 -04:00
Martin Konecny f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
Martin Konecny 62287a2313 -Remove useless api_client interface 2012-07-12 16:51:11 -04:00
Martin Konecny 8f6d6058a2 CC-4100: Make number of shows displayed in widget customizable
-removed Logging message
2012-07-11 19:33:19 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
Martin Konecny b782b9a9b6 CC-4099: More stricter checking on ogg file types
-fixed
2012-07-11 18:14:03 -04:00
Martin Konecny fc1b69e1d1 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
2012-07-11 17:09:17 -04:00
Martin Konecny ba5a749073 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
2012-07-11 16:48:46 -04:00
Martin Konecny bed2a0731b fix potential exception 2012-07-11 10:39:23 -04:00
Martin Konecny 82d4ee09ae CC-4059: airtime-test-stream -h option not shown in help text
-fixed
2012-07-10 23:25:35 -04:00
Martin Konecny 35655f9462 -no longer require "cell_phone" column for 2.1.3 upgrade 2012-07-10 19:05:27 -04:00
Martin Konecny 7ce4934cdc CC-4090: Make code style PSR compliant
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
Martin Konecny d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
James 24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.
2012-07-10 17:24:57 -04:00
James f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James 39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 17:09:21 -04:00
Martin Konecny f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny 6d98cca9c3 SAAS-270: Apache2 errors on SaaS
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
James d90d83200e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 15:12:27 -04:00
James 62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 15:11:59 -04:00
denise 69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase
-removed live chat popup
2012-07-10 15:09:28 -04:00
denise 0171212e9b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:19:19 -04:00
denise 81eb751c9f - shortened height on Add/Remove content dialog window 2012-07-10 13:19:03 -04:00
James df5cc8aa38 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 13:09:12 -04:00
James 78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
context menu

- fixed
2012-07-10 13:08:36 -04:00
Martin Konecny 2e5b1d9ca8 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-fixed
2012-07-10 10:48:44 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-10 10:36:53 -04:00
Martin Konecny dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny 00a2a19833 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-09 23:41:00 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -04:00
Martin Konecny aecee0574d Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
2012-07-09 18:58:22 -04:00
James b7ca858506 CC-3921: Add mobile phone number field to user record
- added a line to upgrade.sql which takes care of db upgrade
2012-07-09 16:50:51 -04:00
Rudi Grinberg 5b16a44455 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 16:31:16 -04:00
Rudi Grinberg 32c3e877a5 fix typo 2012-07-09 16:30:54 -04:00
denise 6369c85ed1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 14:50:49 -04:00
denise c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show
-fixed
2012-07-09 14:50:35 -04:00
James c279e008d0 Merge branch '2.1.x' into devel 2012-07-06 15:52:09 -04:00
James 63856ea918 CC-4079: Apache error: missing $startDt variable
- fixed
2012-07-06 15:40:16 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
-done
2012-07-06 15:26:51 -04:00
Martin Konecny dec68649c1 code cleanup
-changed module name to correct naming convention
-remove some unused imports
2012-07-06 10:20:44 -04:00
Martin Konecny 9612adf72e CC-430: Audio normalization (Replaygain Support)
-add required package dependencies on full install
2012-07-05 23:35:51 -04:00
Martin Konecny 24349e64d8 CC-430: Audio normalization (Replaygain Support)
-some minor fixes for default value (should be 0 dB not 1dB)
2012-07-05 23:30:53 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support)
-Added support on server side
2012-07-05 22:37:40 -04:00