-
Revert "Merge branch '1139514_media_browser_fat' of git.drupal.org:project/media into 1139514_media_browser_fat" This reverts commit 6b439909ec4b4296311a3f16ce1bb91abf90a361, reversing changes made to 8dd28ed1d496f966cb5ea8b917a7173a9ed5b1a4.
-
Merge branch '1139514_media_browser_fat' of git.drupal.org:project/media into 1139514_media_browser_fat
-
Still needs polish probably but everything seems to be working.
-
intermediary commit - Still need to handle passing back data to invoking element - For some reason, switching displays in the library tab doesn't load all CSS and JS assets.
-
Merge remote-tracking branch 'remotes/origin/7.x-2.x' into 1139514_media_browser_fat Conflicts: css/media.css includes/media.admin.inc includes/media.browser.inc includes/media.pages.inc js/media.admin.js js/media.browser.js js/media.popups.js js/plugins/media.library.js js/plugins/media.upload_multiple.js media.api.php media.module modules/media_internet/media_internet.module
-
#1198128 by james.elliott, ericduran: Convert fivestar/node_type() pairings into fivestar field widgets.
-
#1198128 by james.elliott, ericduran: Convert fivestar/node_type() pairings into fivestar field widgets.
-
Issue #1205166: Field settings should be an instance specific settings.
-
Issue #1205166: Field settings should be an instance specific settings.
-
update fivestar.info