Commit Graph

7919 Commits

Author SHA1 Message Date
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
denise e8a2f23856 CC-84: Smart Playlists
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -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 765a739b58 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 17:10:08 -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
James 393495433f Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:17:22 -04:00
denise c27b886817 CC-84: Smart Playlists
-0-indexed form elements
2012-07-11 16:15:44 -04:00
James d52c079606 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:14:59 -04:00
James 93b34bb079 CC-84: Smart Playlists
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
denise 4842f1a5a1 CC-84: Smart Playlists
-removed limit checkbox
2012-07-11 15:52:46 -04:00
Martin Konecny ce755d409b cc-84: smart playlist
-added new database table defs
2012-07-11 15:48:11 -04:00
denise 7358b00c81 CC-84: Smart Playlists
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise 5fb0364f2d CC-84: Smart Playlists
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
Martin Konecny 646e028037 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 10:47:14 -04:00
Martin Konecny fb09149b26 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
2012-07-11 10:46:47 -04:00
denise 4bed5e647e CC-84: Smart Playlists
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise a1ceb4bfa0 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
denise b7cd90bc28 CC-84: Smart Playlists
-created form and view script
2012-07-11 10:42:51 -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
denise 4301a221b7 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -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
denise 72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -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