Squash Redesign

Squashed commit of the following:

commit 702d28b26ee6c4f6573bb33312ff7bde60f2a3e8
Merge: 95d8ad2 cd5a7ff
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Dec 6 17:33:33 2012 +0100

    Merge branch 'next' into redesign

    Conflicts:
    	Gemfile.lock
    	app/controllers/application_controller.rb
    	app/models/media_file.rb

commit 95d8ad250d1da18986366aa8f020b562eeeefed9
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Dec 6 17:06:13 2012 +0100

    minor fixes + full PDF preview implementation

commit e1f5cf1a51c5437a775f0f622aee7d17ee4d2e4b
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 13:05:06 2012 +0100

    PLUpload small fixes.

commit 9539e9360bd935d7de6ad6e9b1a381c56e92727c
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 12:18:32 2012 +0100

    Thumb catalog fixes. Updating assets file.

commit 334b82fd714d0fd279bf900379e5f16efde31d65
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 12:11:58 2012 +0100

    Fixing body title actions ellipsis effect.

commit 1b4d28cd2f7a1f3c78d91d85c4dc3f72b85d396c
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 12:06:12 2012 +0100

    Sharper magnifier icon. Collage opacity adjustments.

commit ff728ad97193484080043619f29cc0680d79c9ce
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:53:37 2012 +0100

    Z-index adjustments.

commit 80c140d91a1b796e9efc7ff8c31f3c6dfac80fc8
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:48:14 2012 +0100

    Workaround for making Bootstrap dropdowns work in Chrome.

commit d10ccb16839c960b5697666157f7b0012225a548
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:40:22 2012 +0100

    spacing tweaks for katalog thumbs.

commit b882d5ab47c1f3eea92995583fc9fe35a45a110c
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:40:07 2012 +0100

    media entries thumbs images no longer overlap privacy icons

commit ac78cfa3ace506d25429d96bc7a7c3334085339a
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:39:35 2012 +0100

    clipboard set thumbs have now hi contrast background.

commit 3d6b13ed2ace436b525c43a3f6d54b860b903a45
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 6 11:39:08 2012 +0100

    Erkunden collage images are now semitransparent in normal state.

commit 68364c4660b447523bf04f4afb88a65fc1a3df28
Merge: 1f86716 417e05d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Dec 6 11:27:21 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

    Conflicts:
    	app/assets/stylesheets/redesign/components/_ui-drop-menus.scss

commit 417e05d01504e50986be4aea49444ec8c187f720
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 23:45:47 2012 +0100

    Side filter search is now slightly separated. Has correct placeholder text. Search button removed also from the docs.

commit 55cec54252329d98c3e85c1f09ab93f28e41a6d7
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 23:29:19 2012 +0100

    More list view mode tweaks.

commit 634b74e351d58fac237730e63bec7dd310a9e05b
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 23:21:16 2012 +0100

    Cleaning up list view mode css. Moving stuff around there. Thumbnails are now top-left cornered with titles following on the right hand side.

commit c7b364d64cce1e1e87872eb2187176299390f3ae
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 23:17:10 2012 +0100

    Drop menu properties no longer should mess with dropdown toggles' original display mode.

commit 62f3142bcd729e4bc396e4370e9661a909f9c96e
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 22:48:33 2012 +0100

    Set Overlay: Show the correct media entry thumbnails regarding their file format, optimize for dark background

commit 732ac5b487d929024739d78da1590600b1153168
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 22:10:01 2012 +0100

    Fixing missing actions in the featured entries documentation

commit 1f86716a23715eb930ec3fee6941b441d0664edb
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 20:14:53 2012 +0100

    keep inlineblock fix only for dropdowns ( to fix clipboard dropup )

commit 576f2966a7b7f0af7622bc1861c820f4833f75ee
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 20:00:25 2012 +0100

    create data tag for favor functionality

commit 40d05c945e0042376ece6f256c2c2526c31040e2
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 19:37:06 2012 +0100

    fix audio preview

commit 8e110a51a7c4f5b8aa1561ba075883ff73ec9098
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 19:27:19 2012 +0100

    fix video previews

commit 690dba38356084f683c6a10958d494f18fdfd5db
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 19:25:38 2012 +0100

    media entry video and audio preview

commit 0868b502f6a6fcf64c5a4dd3f7bebd57f4e8e86d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 18:05:30 2012 +0100

    media entry video preview

commit 35d02be8681b1c9c3c54729bab3c42906718e924
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 15:11:53 2012 +0100

    continue media entry preview

commit a2a4e67ccac53840788f7205e2c0ee32b35b661c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 13:45:12 2012 +0100

    Correct placement of SELECT ALL in the toolbar (10m)

commit 5d7f6f499f86a95a7215cf4a022241c4ff627316
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 13:33:44 2012 +0100

    media entry image zoom

commit 47a0f234697d15702436d104f50c4eaf2d5d9d28
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:32:49 2012 +0100

    show login call to action in content section

commit e9b2b55b8414fd271d65db35a8fa40e962ccc2c6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:32:02 2012 +0100

    fix resources list actions visiblility

commit d16d3ef38fb0fa109be6d26c7270edca6300edea
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:21:05 2012 +0100

    we dont want to prevent clicking on active tabs… like explore ...

commit 353b5a6b8e47a15aaf0319d45ca1130c32e7f353
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:16:55 2012 +0100

    link the header brand to the root

commit 906e270cb1df328563463052459ad9468fc7ba6b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:07:26 2012 +0100

    force placeholder color (for non Chrome browsers)

commit 4ef3ca651c0bab5674e12bd6aa9d99358d690983
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:05:05 2012 +0100

    correct filter searchterm input placeholder text

commit 19d300e617ccb8a4350981caa15802e30dae0463
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:04:47 2012 +0100

    show actions on media entry only when logged in

commit ad7017f819ebc32c2e423323293c48c6d7232b1b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:04:29 2012 +0100

    open media entries tabs for the public

commit baf468c14c650673e195eeea895a32435e1d17ca
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:04:13 2012 +0100

    show actions in list only when list is active

commit 3cb68dd30345dd0427d82880fbf065e5523d1648
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Dec 5 09:02:24 2012 +0100

    only show active lvl3 items in explore sidebar

commit 203e8d0e5a4ddacd176e15b25d9aec80806dfb9a
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 02:36:47 2012 +0100

    More minor dropdown fixes.

commit 663ab2df46fb430a0966913955e8f80682b2cfaa
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 02:32:25 2012 +0100

    Minor fixes on dropdowns.

commit ba738423eaa8dd45f6b6319aa6bb8080f3da19c1
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 01:54:16 2012 +0100

    Tag cloud and tooltip redux. Tooltip toggle is now binded to body by selector.

commit 4349193f661a41ea2087ec54179a466a791a4116
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 5 00:22:59 2012 +0100

    Revamping drop-downs and drop-ups. Fingers crossed.

commit 038a3407bccab679e7890655474e7d64e48e7bea
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 21:53:31 2012 +0100

    Drop menus revamped.

commit b5a8f5fba5e22f0b932360d0108b22aae7078afe
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 21:35:00 2012 +0100

    Bringing back actions in list view.

commit a62e870666dcd3a882ff0af7b48b32940409a9f3
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 20:56:24 2012 +0100

    Fixed star icon.

commit f97cd32cf5e435a4c654d01e89bfe38dc26dcd34
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 20:06:24 2012 +0100

    List view tweaks.

commit 643c83c032945933ef02a46ede64e30f36d06eeb
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 20:06:08 2012 +0100

    Organize actions separated onto 2 lines.

commit 0a2e85e148fd85ae2fa185d8939af308203f27e5
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 20:05:54 2012 +0100

    Import page 1 buttons diversified.

commit 522bbd25554270d3d296c7fe62176af8abe21a87
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 20:05:12 2012 +0100

    erkunden collage has semi-transparent meta on hover.

commit 8b6a5cba8877377fb79315db3f5d487c6aad71f6
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 19:20:13 2012 +0100

    adding spaces/borders in the list view mode.

commit b56b698467ad6998838e6fa180d61514fc1a921f
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 19:02:11 2012 +0100

    adjusting spacing of columns in the list view mode

commit c9067f88f5400603f1fd30ea1e066746526fc380
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 18:44:57 2012 +0100

    add magnifier icon

commit a3b4ab39ed0b0afa7347434433d4dd8bc4336aba
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:36:55 2012 +0100

    Added title within side filter search input.

commit 27b558c279114c1a14d693515ba26d26ab17c55b
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:23:47 2012 +0100

    Filterbar: Remove search button

commit 8d417b6a31cd217368e2b57fddd2f292749e0dcc
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:20:35 2012 +0100

    Hiding list item extension on smaller screens.

commit ec0cc5f9e4e8d72126227b6a2bdbaf59b42909f7
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:20:19 2012 +0100

    Vis list mode now has correct markup (added .description class)

commit b589d973bff18a5e6ca223c18e097146491ed869
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:17:39 2012 +0100

    Resource header now max to 800px

commit cdaf9b7732bacec972a8b1462d1691ccd354639b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 18:16:18 2012 +0100

    finish media entry

commit eb019a6f22bade57017074ca87542dacdbfa5749
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 18:15:59 2012 +0100

    dashboard: show only blocks that have content

commit d924904ad0de02e08582fc16ad10a3e12f3c39d0
Merge: d7dffa4 935d998
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 18:12:49 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit d7dffa45508eb6a2be7551325dabc95eed3a1a9b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 18:12:37 2012 +0100

    prevent call of thumb_base64 on nil

commit 935d9981bbb1ed306dfb358ffab16706b226107f
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 18:04:13 2012 +0100

    Search page: Make search input field smaller an align it right

commit 60b70473fee540fd07dcf5972d7c87b5ef96c7eb
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Dec 4 17:56:32 2012 +0100

    Search page: Place a title on the top left: "Suche" or "Suchresultate"

commit fdfb188c008af1a4c809aed683bf3dd3400791a4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 13:00:17 2012 +0100

    start media entry show

commit 07c0de435e8bc754cbf12c74c90834dc8e3bc798
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 13:00:02 2012 +0100

    fix to call is guest on nil

commit 46f6169fec189a928670dbb45a706028f7f12d38
Merge: 1b12f63 94d253b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Dec 4 12:52:46 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 94d253b6da21f539f2ff0fd9a07269a767786ce7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Dec 4 12:19:44 2012 +0100

    [#39450245] serve image for filter_sets and sections

commit 21348da40d28adb611b97ff035372fb9b68110af
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Dec 4 12:18:48 2012 +0100

    don't force id 0 on guest user anymore, skip permissions filters based on the guest user

commit 1b12f63a0b79bab3d23aa4691843e4ecc479ac62
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Dec 3 18:16:04 2012 +0100

    finish clipboard

commit 1141096f3289f947ce55ac5315d1f8a13597e718
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 14:14:00 2012 +0100

    Groups table now has correct spacing around. Table heads no longer have background (lets see how it looks)

commit 032c447f9126fd88cc4033b01f7f921ed7d4eebd
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 12:53:00 2012 +0100

    Quick fix for some featured items not displaying actions on hover.

commit 8275e1fc13b91b0e3694a11e414549823a09aea3
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 12:50:39 2012 +0100

    Featured items now support actions on hover. Require .active on the parent container.

commit 5c8b11af51dc72064555d18e925e12854c003165
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 12:12:45 2012 +0100

    Documenting side filter.

commit e2dc0c82b0316a4ddde0177bcf5e49d0d15abd5e
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 11:00:19 2012 +0100

    Separating header dropdown admin/logout items from the rest. Revising dropdown styling.

commit f8d68c30954e5762912c12b042e4cd54fbdf04ee
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 10:45:32 2012 +0100

    Adding power-off and admin icons. Swapping header dropdown icons with .mid variations.

commit bf87e314826bb84be2a70d53b623b30fcb5b3f74
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Dec 3 10:20:06 2012 +0100

    Fixing padding issues on the different vis modes.

commit d824892b923c6815e8e227554796836ac33c2637
Author: Piotr F <piotr@piotrf.pl>
Date:   Sun Dec 2 23:34:41 2012 +0100

    More padding adjustments.

commit 8429c23ab0d266fecb9e07f164b4b16565d28aa4
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 16:10:37 2012 +0100

    Search page fixes.

commit 9b55bf633d92d111bb1be3e0d2355da829646631
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Sat Dec 1 17:57:33 2012 +0100

    strip jqueryui, we only need position

commit 28c4a83fcfe5e048e4673a4f2f127177d9f390d4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Sat Dec 1 17:50:22 2012 +0100

    finish clipboard

commit 383fb81f348bebc5fd8f82181ede19ef3dff770e
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 15:37:53 2012 +0100

    More padding fixes.

commit 88cb9893e2f57b8988794451f8baffd9491b4a90
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 15:30:09 2012 +0100

    Correcting paddings/margins throughout.

commit 25937dfe18eb75aef41cb5a18f6b9cf177815f02
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:42:50 2012 +0100

    import/organize tmpl up-to-date.

commit a84dc6c600d31520c3079338538e01986173f078
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:38:42 2012 +0100

    import/meta-data tmpl up-to-date.

commit 756e81143dd9482efe93351a1bd50c86b7a89e58
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:38:24 2012 +0100

    import/permission tmpl up-to-date.

commit 03b6c6396af0abc739568dea90ebc6d0b77604fc
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:20:15 2012 +0100

    Documenting search form and search field. Search home is now done.

commit b9c2048a9ac436f66b83d1f699eacaeb24e06619
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:14:52 2012 +0100

    Search tmpl up-to-date

commit 419d5b4cd6d8709ddde72efd621eaafb79d9396c
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:12:06 2012 +0100

    Set view tmpl up-to-date

commit 35e43d6935717a1d0ec684d1989733246fb58bbf
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 13:11:46 2012 +0100

    Documenting search input field.

commit c977f8199328d8c416023bd2289f584a15aeed57
Author: Piotr F <piotr@piotrf.pl>
Date:   Sat Dec 1 12:37:29 2012 +0100

    Documenting highlight icon.

commit 9430590d812572693d45481613370d4b4dbffae3
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 17:35:48 2012 +0100

    finish clipboard actions ui

commit 583bc7b1f935108e5aafbc7a6f849f97da658423
Merge: 37f406b b4fa62d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 15:32:34 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 37f406bd33303613cbd4e02518dfafffd04b0464
Merge: ea2146a 07a1562
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 15:10:30 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit b4fa62d0d553b28eecc8852a90eb3c20ce960be3
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 15:07:04 2012 +0100

    Removing dropdown arrows.

commit 07a156267ac5105e1c1631c240d34b4d6686c910
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 15:06:00 2012 +0100

    Adding 2 sample forms to the Styleguide/4.

commit ea2146ab6a9cd3caf3a83720701f1d9cea0de1e0
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 14:59:38 2012 +0100

    dropup + continue clipboard

commit 5ae646d9ec4c0ab268991c229ab49bf2910845e3
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 13:30:37 2012 +0100

    Extending documentation for alerts (also form errors) in styleguide/6.

commit 3d733db9887f44b1462702f9184abde9b161360d
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 13:12:01 2012 +0100

    Nu move to set icon. Updated assets file.

commit a27d83a799c1eef431c6770f4130bf46a37e2c58
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 12:51:56 2012 +0100

    Set and media icons documented.

commit bfd494a78dc1a1b14ab1a6af165ee678785fe97b
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 12:43:33 2012 +0100

    Restoring privacy icons in active grid viz mode.

commit da8b98277bfa70161479f716e986bb51c3b3ffad
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:55:20 2012 +0100

    continue clipboard + unkwon placeholder image is centered now

commit 99981740de6b319689c8b7110805d223c7eba50f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:20:48 2012 +0100

    correct layout on user show

commit ff08c9373ff6c7815483bef03209cd4a504e7fdc
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:19:36 2012 +0100

    type + media_type on media set popup items (level down and level up items)

commit 4e2ef3756516dd9fb8f7f56ef99a98f6408b9238
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:14:35 2012 +0100

    [HOT FIX] stop reloading on chrome

commit f95dfdc74ce45dc117470fdf66e1bfe2e74fccd9
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:06:47 2012 +0100

    start clipboard

commit c5c1c78a17be0c8d333abd737020d6e056088390
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 30 11:06:38 2012 +0100

    thumbnail placeholders

commit 6e8aeabd0834a471e6b467948a9d32d7a27440b4
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 30 10:14:49 2012 +0100

    Added assets source PNG file.

commit a072c90700524fc943c6ecf1f58d871ad6dd3f07
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 23:21:38 2012 +0100

    reenable thumnail placeholder on styleguide

commit 154dc7d14534fa71ac608811ac762da1e87d30f5
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 22:09:13 2012 +0100

    replace miniature popup target with clone, in the case of favorite change or selection change

commit b1536e2d6746e3d99f279f92d8659531692e9f50
Merge: 67a571a e3e5c11
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 19:21:48 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 67a571ab7218ae43cf4caeb65e2a1f24160c3045
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 19:21:42 2012 +0100

    finish filter panel

commit e3e5c115ca55208ba5b4925dd17ca4373deb661c
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 18:36:40 2012 +0100

    Search form documented. Search page now features search form if results=empty.

commit 143e5865b6408608770e03e444cedf2a3993fd62
Merge: 709ad41 ac543b4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 18:26:52 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit ac543b47980d7943876312b51eb6d7c412f1b5a7
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 18:11:58 2012 +0100

    Fixing missing header icon properties.

commit 709ad41c72c00fc5cd101794135e64a377d41705
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 17:56:27 2012 +0100

    adding the first icons to the user menu

commit 1bf46c541c15cf4eefdd437cf5f3e22f9d6c6f28
Merge: 7925c72 60fbbd6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 17:54:40 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 60fbbd63433d863ce762358da1c6f99bf59fd127
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 17:50:37 2012 +0100

    Hiding privacy flag on inactive resources lists

commit 234467af980437d3b6191babc26052aad5353ab1
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 17:50:20 2012 +0100

    New graph icon.

commit 7925c7264cf5484090294f87daefc14ea4475744
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 17:45:13 2012 +0100

    implement ResetFilter and ResetAllFilter

commit e5301008015c06beed2e24ec4624344d2c453e7f
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 17:43:20 2012 +0100

    Small fixes.

commit caa14f32b9337e87ba3c35e1c1b9ba146f22575f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 17:40:47 2012 +0100

    remove href => "#" from toolbar

commit 57d72764fe28a151b101d8cc6d0c11c946943a8c
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 17:14:22 2012 +0100

    FIX FILTER PANEL - activating filter properly

commit b6e2e8b669929bbffd47261a54b84041f7e2a8da
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 17:01:42 2012 +0100

    Hiding privacy marker in miniature mode.

commit 0c448499d5c392773d823ae0674e166578738018
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 16:56:21 2012 +0100

    Adding $darken-subtle to config. More side filter adjustments.

commit 296d506088bc399d7221b7fe881a53978815ad4d
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 16:51:39 2012 +0100

    Further side filter adjustments.

commit b92b11517e18b92a4d0b01ef949d64b4c889cd8a
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 16:51:21 2012 +0100

    Documenting small arrow icons.

commit 2acbf054dbf73e1d2bd062bf001df13d18805eeb
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 16:25:34 2012 +0100

    Another batch of side filter adjustments.

commit ff7b1a03ace4d7be34bf1bfa871a4c7e27addbd5
Merge: 53cdb55 81c1446
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 16:20:08 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 53cdb55b41dc3eabe7abc7b766e7300e65660a8d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 16:20:00 2012 +0100

    the filterPanelToggle stays with "active"

commit d6049c0c6e20e09d5a0a1a5c38fe0f73f21c36b6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 16:19:22 2012 +0100

    start search value for filter panel

commit 81c1446a75aba9af66ae85c7b2ed97eb7cfec31e
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 15:59:03 2012 +0100

    Side-filter .open fix.

commit 2f2b61e7499903fd5e3c2b4c7955998290d78518
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 15:57:51 2012 +0100

    open search route

commit 6b5e788f12b73f8c705fd1b7318ca8a5e5ac64d8
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 15:49:50 2012 +0100

    add has-active also to level1 + move level1 form a to parent to parent li

commit 27f3406a49a8ea57ea98832996e55f85e1c57c17
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 15:42:08 2012 +0100

    renamed "active" class of accordion toggle to "open" to stop confusion

commit 550710c46fbbdbdf4d70828d2a3d2f78c6ab4490
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 15:16:19 2012 +0100

    miniature popup always have a background

commit ab4953a23ec1fd3843f123c121007f630711ba58
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 15:16:06 2012 +0100

    blocking state of filter panel

commit 43c9570453b899d086f3d5036c4f9a3fab63cbb2
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 15:04:33 2012 +0100

    Fixing Styleguide/7 table bug.

commit 506009d3f56449fffb3ddc60746707dee7d2d699
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 14:40:12 2012 +0100

    Cleaning up general, library, vendor, overrides and / styles.

commit 9bd5304237d16970e4364f5784b67a20be201e25
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 12:22:59 2012 +0100

    Reorganizing Styleguide/6

commit 149c77d3061e91e7ff9e1f061ec5b4f3e7c5fa29
Merge: 7d41e4b 235d60c
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 12:05:30 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

    Conflicts:
    	app/views/redesign/media_resources/list/_filter.html.haml

commit 7d41e4bfb94fe5a984dbbfd82496423f965d7ad2
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 12:04:54 2012 +0100

    filter panel search + filter panel URL peristing

commit d27869fdcab121f8d8a0dc8c2f944520144bdf44
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 12:04:33 2012 +0100

    introduce delayed change $plugin

commit ed44c03b2589e06216423874efc3131b5b6aefff
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 12:04:18 2012 +0100

    remove some href=>"#"

commit 235d60cc3cd82f7c9c190dccec3ab7652d68fe46
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 11:48:53 2012 +0100

    More side filter adjustments. Styling .unknown

commit 6bf6c1a9dea669ec551af7b60a73a7b6135d5d37
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 11:36:08 2012 +0100

    First batch of side filter adjustments.

commit b170aa4ec48a5d9d4711f07ded01b17c75dc9727
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 10:53:07 2012 +0100

    Fixing side filter positioning.

commit 428e854af84bf8c4b84777d14c06f72ea8d2b4c7
Merge: 128fa62 834fa07
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 10:39:51 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 128fa62c031b64f09dfbc3ecccf31f44e6f8dfb7
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 10:39:35 2012 +0100

    make filter working + make filtertoggle url persisting

commit 834fa078891237175818edd4446bc46900376c06
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 29 10:39:17 2012 +0100

    Documenting tag cloud buttons with counters.

commit fb20d9998c04e5ba087096adf5e3ca97f047a40c
Merge: 817a70a 4653695
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 10:05:57 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 817a70a4f1f6354be159b63d368c452087a54bf6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 29 10:05:48 2012 +0100

    update filter panel

commit 4653695d404a8deebb59e0842f4881bd9dd4abd3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 19:05:24 2012 +0100

    Home page space adjustments.

commit 634656a32dc56989cc906f8b7bd0d4a9cd0883c3
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 19:03:19 2012 +0100

    interactive filter panel

commit 1010035d46b60f622f2bc7a83e708cb7a457562f
Merge: 1b572ab f9eb845
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 18:44:57 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 1b572abda0d3e8f40f35369b26c7205cd1dbb20d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 18:44:42 2012 +0100

    Filter panel 3rd level + seperating search and list

commit f9eb845ff68d5f0588c207383901c1693973b7fe
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 18:08:14 2012 +0100

    Fixing privacy icons not displaying borders correclty.

commit f0cd60ba22878808359df923aa3013190fe6818b
Merge: fc648cf 0e8cd76
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 18:03:23 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit fc648cf17c950c773e459a85d473e1308e69d928
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 18:03:10 2012 +0100

    first level of filterpanel

commit 0e8cd76dcb96042468ae728a9af5590b1aa9b9d3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 18:00:18 2012 +0100

    Featured Entries now display correctly also in FF.

commit d5818e2c8db317398ff7472651173f902e9e732c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:42:54 2012 +0100

    More paddings/margins fixes.

commit 064a48a92e5cdfd907b49296bdec5d1b151f0df7
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 17:42:20 2012 +0100

    fix start layout of media resource list

commit e8c70443392d44f7f6bb27b10ab6228030c2fa79
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:35:16 2012 +0100

    Fixing miniature hover bug.

commit eaa7d999cae8d45befedd53a68d8ee4d3f24689e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 17:35:10 2012 +0100

    remove grid here it is already provided

commit 07f3c473033caf02fa856a6ad325d793eb95ab63
Merge: 8717069 06f831b
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:25:54 2012 +0100

    Merge branch 'redesign' of https://github.com/zhdk/madek into redesign

    Conflicts:
    	app/views/redesign/explore/media_resources.html.haml

commit 06f831b0aa28be60f550645164ee6e396339f5f1
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 17:18:16 2012 +0100

    start filter panel

commit 8717069ad4f284b2a9be7314b7cba9e19cd11b36
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:14:55 2012 +0100

    Adjusting paddings and margings throughout.

commit f0fc3bdcf323a7800f6f1bb8888f4cd40886a573
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:14:30 2012 +0100

    Updating filterbar documentation.

commit 2463b1b7676f22e3eaa73a9374d29c60bebbd920
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 17:00:07 2012 +0100

    UI-Summary table now has a max width set inside its own stylesheet and not in the layout.scss

commit d1389c23a6ca1087edbe7269a36c26711870cfd6
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 16:59:07 2012 +0100

    Cleaning up Layout.scss

commit 171eee545a5c71b06878f444de773455137fcc4c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 16:58:57 2012 +0100

    Filter-set fix.

commit 94de6f4929aae9f2f89c65691a386c15e330cd81
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 16:58:36 2012 +0100

    Removing padding and margin classes from the markup.

commit e687652a69eadf4070dd4e5d03dfa839e8964c57
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 16:52:58 2012 +0100

    fix miniature popup in chrome

commit edc2f374825e56fa36f880725aae60858aff6db7
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 16:35:34 2012 +0100

    fix LayoutSwitcher

commit f911fcc89034e297c63cf08846ddeb34f2795cc7
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 16:02:29 2012 +0100

    persist layout in URL

commit 26e415d46e180c8986ffe7a464d0780682e1eb12
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 15:31:44 2012 +0100

    finish renaming of tiles -> grid and grid -> miniature

commit 7439220352d2d4c9a040d175836a8bc4d7c2130e
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 15:19:45 2012 +0100

    Renaming tiles and grid in Icons and icon file names.

commit f862e93415250136287be832b14b02ce9bf9d565
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 15:06:39 2012 +0100

    Styleguide section 7 reorganization.

commit 247b3225755508b8f02968dc6b82c40e0ad72d0c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:59:19 2012 +0100

    Documented set-overview combo.

commit 38f689acf8ae2799e3f14b5496daa7289e1d1c0b
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:51:25 2012 +0100

    Browse static template updated.

commit 38f699e38a34b36529e49322b88035facd493b30
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:40:43 2012 +0100

    Tiles-like thumb style is now default for all ui-thumbnail unless wrapped in grid or list element.

commit c8b692fe2142cbe8e7a1ec0efa88a782bc6bb6be
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:23:17 2012 +0100

    Tweaking featured entries small variation.

commit 1abfb188e6b89ef412fe38a5deb373ec7533dc5a
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:22:56 2012 +0100

    Documenting resource summary.

commit de2121b4d367796c5295cb7c953f8dfd573b840d
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 14:18:10 2012 +0100

    Green color variations generated with compass.

commit efa42ffd224a2a1451d7be5f2f9e702d3a4613a6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 14:45:28 2012 +0100

    List actions

commit 0a27f9c920d47c527f01a2ea96cc287da208fb31
Merge: 8b837a7 14ecf76
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 14:39:27 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 8b837a7a0a25039d99b7de7d99f03bd501566b67
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 14:39:15 2012 +0100

    fix media resources partial to fit list actions + fix media set popup level items

commit 14ecf760ae631c510ef8eeeda54c29be6f94e941
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 12:29:49 2012 +0100

    Documenting small featured items.

commit 473e883f8cb4b22c989b8737d43c980c36a2ff31
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 12:02:09 2012 +0100

    Documenting full width tables.

commit 102bf6b49ec4c93054b68ec262acb7bdde515aad
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 11:58:37 2012 +0100

    Documenting micro thumbnails and resource selection module.

commit 6ef13e2ac0466c344b7b120fc9d46579c0ca0e55
Merge: d6fdf35 ff4151d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 11:57:47 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit d6fdf359231a53bba8316464993b23421a5840b2
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 11:57:36 2012 +0100

    implement type filter

commit ff4151d952846b74f46aa77b3dff07e84b6ae2a3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 11:32:00 2012 +0100

    Home page grid adjustments.

commit f4d1be6177df686eb8a9d3ef89a5b331cd684c66
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 11:20:58 2012 +0100

    Compacgt form-groups to cater for smaller forms (ie. home page login)

commit 872539611575f6967a354bf37504c8a332d703fb
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 11:06:27 2012 +0100

    Inverted toolbar (ui-toolbar) is now scalable. No longer relies on colXofX classes.

commit 73756c5d324b6fff2fb1a834b1be8a512bacc2de
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 10:55:20 2012 +0100

    Clipboard toggle tweaks.

commit 804f63b2bea66fe839632327056ce7a083a4d8d3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 10:36:58 2012 +0100

    Level up/down items now use new preloader.

commit 2624dbee2bce18094a328bb9fb97fe75cbad98c2
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 28 10:31:49 2012 +0100

    We now have dark preloaders too. Documented in 6.19.

commit f701f136f6047d0a7dc0dce63dc89df7a7ccfa75
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Nov 28 09:15:18 2012 +0100

    detach minature clone on mouseleave on resource not resources

commit e32a99b5e27d426925527def879be7f5347cdea1
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 19:53:40 2012 +0100

    implement metadata context fetcher for list view

commit d7f19d5feea36ddcd3b687625b66fc1fbd060588
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 19:12:23 2012 +0100

    add miniature popup

commit 5328e237559a4e6a65e56fbae83e59ef5904d564
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 18:43:19 2012 +0100

    implement inview pagination for media resource list

commit 36df709de5c74d0aaca86bc3a91064af0bbef81a
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 17:37:18 2012 +0100

    Documenting new rights management module. Styleguide/7

commit 56cd2c3e9fd878025a77d49eadcaa35428e225f1
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 17:16:07 2012 +0100

    Documenting form errors and highlights. Styleguide/4

commit 42583b2618b94af28a09fd13dea026cb12076a4b
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 17:14:52 2012 +0100

    Hiding privacy icons on inactive lists.

commit 200862d73cdbf72b3b3354e53255effae45cae54
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 17:13:29 2012 +0100

    remove explicit with_permissions - they are controlled through active state of the list container

commit 9c36e2cf8c69209960ac71fba9dcf302fd55b9fc
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 17:12:58 2012 +0100

    explore media resources is only active for logged in users

commit 8d5972ae705d3ef26182c87c8f3622c89811fc9f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 17:12:44 2012 +0100

    make media set popup available for jquery templates

commit 49a144894fee72ece68c56b724da315cb95ce32d
Merge: 430cb37 afa5a9f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 16:43:10 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 430cb37824e205c474d0725b0b578da45566deaf
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 16:43:05 2012 +0100

    move toolbar/layout switcher logic to MediaResourceController

commit afa5a9f02f118bef56e1cca60f310539a8851814
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 16:29:37 2012 +0100

    Resource Page combo documented in Styelguide/7

commit bcc60b3b8238015fa1fe6d85c61d7ebb974a82ea
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 16:17:40 2012 +0100

    start media resorces list on explore page

commit d47a7d80f7ef50330b73b662cff89ec4ba8dfd42
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 15:59:30 2012 +0100

    Grid/List/Tiles switch now works.

commit 41d2fe85c8d380899a47f96948042d5224328ce0
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 13:57:33 2012 +0100

    translate datpicker months and days

commit 55162ce6101b9414316a99a110b7d0ab90e609ed
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 12:47:19 2012 +0100

    Doc 7: Quick fix tables within list view mode.

commit 90f937e24e43c6d4e25e978da86dbaa97b13bb7c
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 12:42:18 2012 +0100

    Documenting confirmation modals. Section 7.

commit a0565b30b2f06362950ed9dde638da9cf6536875
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 12:37:34 2012 +0100

    Form groups are now components thorughout the app.

commit 5dff0f3d3b0f48aef84e675d946f21e2d5ac83a8
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 12:35:32 2012 +0100

    Documenting forms.

commit 1fa1ad8501e0c31886936baaf1fe383b22bca61b
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 12:12:53 2012 +0100

    Datepicker documented and styled.

commit f53c1c083f9dcf085536e97a13e2c026fd2f1775
Merge: e2b9bb5 c831ed4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 11:56:13 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit e2b9bb5fb5ed35e03ff5e5043cee63a7fa2c2e86
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 11:56:04 2012 +0100

    explore sections

commit c831ed433ae1c49212c7f3ccda2a25600800c5b7
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 11:47:01 2012 +0100

    Pickadate updated, now displays month/year selectors.

commit 22a2260f1575bd5f5971695b58783a628480ba23
Merge: 710d30d 35dbec5
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 11:10:27 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 710d30d3461fd86245cb701705e513f5177670e8
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 11:10:21 2012 +0100

    explore categories

commit 35dbec573b729c0c6f2733464bf029422cd17626
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 11:07:14 2012 +0100

    Removing waypoints.js. Adding pickadate.js. Documenting datepicker.

commit 51f11578466b0edafe2171f9f3f1be4e6e1ed888
Merge: 1e746ce 99cdd8e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 10:45:57 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 1e746ceefb0f42136f6392c3ecba8d1b4f884ea1
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 10:45:49 2012 +0100

    finish first page of explore + minor

commit c7da596b87d70692746d0f172e9e6e8e7eb2c29a
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 10:45:26 2012 +0100

    open some more functionalities for guest users

commit 99cdd8e73892843e802615832ff2b29ff8accb00
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 10:21:44 2012 +0100

    Pickadate correct css.

commit 3af6ddff587c834bfd542be802d86468db12f60d
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 10:17:52 2012 +0100

    Added pickadate.js.

commit 4b1fe6bd98a51bfa8037de75c1973c07c09e8dd9
Merge: 63b9eaa cf6b03f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 10:14:18 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 63b9eaae8d528393b6ae581f030f15f3d3620b79
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 10:14:00 2012 +0100

    split all_keywords and user_keywords view

commit cf6b03f3734aea5a2225fe0587724386b674a2e9
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 27 10:12:00 2012 +0100

    Documented MediaResources list view + necessary adjustments to the other vis modes.

commit 5e31c93589968578a91c2adebf4838ae6338eb15
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 27 09:35:49 2012 +0100

    reenable ptl and pbm for homepage wrappers

commit 520f506ee3e453e4564acf65cd26c7610ee04245
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 18:52:29 2012 +0100

    simplify header

commit 6736b5755d6191a8e01e2b2fa9963a30edac974e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 18:21:46 2012 +0100

    rename browse view folder to explore

commit f5696e16572cb74b0de4f243e9f2308328c67d2f
Merge: 92cad97 6038f6a
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 18:21:11 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 92cad97a5969869ccca6bd8313dd9d69a0b9adbf
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 18:21:03 2012 +0100

    change browse routes to explore

commit 6038f6a3fedcb57cba74571da104f8776781d01f
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 18:19:42 2012 +0100

    Adding back old Question Mark icon. Placing it in the header.

commit 367d898ba9446270cb88d55530f719ccbbaf45ce
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 18:17:28 2012 +0100

    use miniature on user dashboard for favorites and entrusted

commit 40b23e00553b3242b9ef876651a558a3781a0a47
Merge: 851143a 9a52e23
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 17:45:34 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 851143a02ea688c29f24089eaee37913cee1c06e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 17:45:26 2012 +0100

    activate parents/children for filter-set

commit 9a52e236f981f43a83698c60d6fced56c3a97b11
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 17:42:52 2012 +0100

    Cleaning up some ui-thumbs related stuff.

commit 298250bf2888330c630bf22627720e0a340cba12
Merge: 3c032b0 5a26dc0
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 17:40:03 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 3c032b0365073f1f72b2957d8f250ada61bcb6e2
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 17:39:51 2012 +0100

    implement create set dialog

commit 5a26dc0f0b7f4603c0d0db1970723935ef50d71d
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 16:55:53 2012 +0100

    Browse section looks now right.

commit df4d3c5096434c633b237bed49d276701cdbef34
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 16:16:44 2012 +0100

    Browse path adjustments.

commit 65fd8b2efbbc54c7a973a3a6e287469b56c158df
Merge: bbf046b abb6c29
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 15:37:38 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit bbf046b0243c0b0c3f76512dc1fcf6f3fcf60eba
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 15:37:30 2012 +0100

    [FIX] Dashboard, is now loading the correct media resource types

commit abb6c2977ecef82d8e88da13a5d3f6deab877c1d
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 15:17:58 2012 +0100

    primary buttons now have bright icons as default.

commit b0ccfd4f0cb1623c0e24d5531e634efa093b1aba
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 15:14:45 2012 +0100

    correct size for media_resource delete dialog

commit 8c63af4021a311455b5db74c23f12beef4fc6c11
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 15:08:56 2012 +0100

    implement delete action

commit b72e3d2c9e9e04719676adb1a0b9fd819cf908be
Merge: d437fec f55b488
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 14:24:32 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit d437fecd3771a1fd6dd0efa2c335503e448d1bb7
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 14:24:27 2012 +0100

    implement favor/disfavor

commit f55b4884fab998803798b76dab0901d40e9e9f5f
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 13:59:16 2012 +0100

    Browse / Media Resources page now has the proper title bar with vis switch working.

commit eaab69979d6f0659c25b3714ba5d19665ff405b8
Merge: dbfd09c a582b76
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 13:57:30 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit a582b769b91a75f2ac7b5d2473bb7daf78df85fb
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 13:56:51 2012 +0100

    Making things sweet for the feedback group. Mainly adding partials to static templates.

commit 649cff7627d2020a8b6d2e22a819e010ad9f17c1
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 13:48:36 2012 +0100

    Icons back to using .active and not .pressed

commit dbfd09cdb96dbe090d7b5d300e208c8157531d3e
Merge: 562e0fa e43950f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 13:37:56 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 562e0fa772dfba5116889fd9404c316e5cf4ab68
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 13:37:44 2012 +0100

    show keywords count seperatly on each keyword

commit e43950f73c32af1af175dc2939a2200a3ad05c1c
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 13:32:48 2012 +0100

    Fixing dummy Media Sets page.

commit 15a6abddee026a764cf7744d8a7d05108e35949c
Merge: 6fcb3ca bdaf0b0
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 13:15:41 2012 +0100

    Merge branch 'redesign' of github.com:zhdk/madek into redesign

commit 6fcb3ca549efcdb6b9000ec742259544ce890e15
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 13:15:37 2012 +0100

    Move Clipboard login to clipboard_controller

commit bdaf0b09466100f7625f2528617f44a118f3efbe
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Nov 26 12:46:19 2012 +0100

    Fixing clipboard spacing and overflow.

commit 11bd82ce9eca457625388c8630972f8c0916e98d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 12:21:18 2012 +0100

    [FIX] Clipboard + MediaSetPopup

commit dc339e97f5ea5d6b09ae72616f712fbb92907607
Merge: 62b8504 5732d3e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 11:54:05 2012 +0100

    Merge branch 'next' into redesign_dashboard

    Conflicts:
    	app/assets/images/redesign/backgrounds/preloader-large.gif
    	app/assets/images/redesign/backgrounds/preloader-small.gif
    	app/assets/images/redesign/icons/icon-arrow_down-bright.png
    	app/assets/images/redesign/icons/icon-arrow_down-dark.png
    	app/assets/images/redesign/icons/icon-arrow_down-green.png
    	app/assets/images/redesign/icons/icon-arrow_down-mid.png
    	app/assets/images/redesign/icons/icon-arrow_left-bright.png
    	app/assets/images/redesign/icons/icon-arrow_left-dark.png
    	app/assets/images/redesign/icons/icon-arrow_left-green.png
    	app/assets/images/redesign/icons/icon-arrow_left-mid.png
    	app/assets/images/redesign/icons/icon-arrow_right-bright.png
    	app/assets/images/redesign/icons/icon-arrow_right-dark.png
    	app/assets/images/redesign/icons/icon-arrow_right-green.png
    	app/assets/images/redesign/icons/icon-arrow_right-mid.png
    	app/assets/images/redesign/icons/icon-arrow_up-bright.png
    	app/assets/images/redesign/icons/icon-arrow_up-dark.png
    	app/assets/images/redesign/icons/icon-arrow_up-green.png
    	app/assets/images/redesign/icons/icon-arrow_up-mid.png
    	app/assets/images/redesign/icons/icon-check_mark-bright.png
    	app/assets/images/redesign/icons/icon-check_mark-dark.png
    	app/assets/images/redesign/icons/icon-check_mark-mid.png
    	app/assets/images/redesign/icons/icon-clipboard-bright.png
    	app/assets/images/redesign/icons/icon-clipboard-dark.png
    	app/assets/images/redesign/icons/icon-clipboard-mid.png
    	app/assets/images/redesign/icons/icon-cover_image-bright.png
    	app/assets/images/redesign/icons/icon-cover_image-dark.png
    	app/assets/images/redesign/icons/icon-cover_image-mid.png
    	app/assets/images/redesign/icons/icon-dload-bright.png
    	app/assets/images/redesign/icons/icon-dload-dark.png
    	app/assets/images/redesign/icons/icon-dload-mid.png
    	app/assets/images/redesign/icons/icon-eye-bright.png
    	app/assets/images/redesign/icons/icon-eye-dark.png
    	app/assets/images/redesign/icons/icon-eye-mid.png
    	app/assets/images/redesign/icons/icon-home-bright.png
    	app/assets/images/redesign/icons/icon-home-dark.png
    	app/assets/images/redesign/icons/icon-home-mid.png
    	app/assets/images/redesign/icons/icon-lens-bright.png
    	app/assets/images/redesign/icons/icon-lens-dark.png
    	app/assets/images/redesign/icons/icon-lens-mid.png
    	app/assets/images/redesign/icons/icon-lock-bright.png
    	app/assets/images/redesign/icons/icon-lock-dark.png
    	app/assets/images/redesign/icons/icon-lock-mid.png
    	app/assets/images/redesign/icons/icon-man_silhouette-bright.png
    	app/assets/images/redesign/icons/icon-man_silhouette-dark.png
    	app/assets/images/redesign/icons/icon-man_silhouette-mid.png
    	app/assets/images/redesign/icons/icon-man_small_silhouette-bright.png
    	app/assets/images/redesign/icons/icon-new_group-bright.png
    	app/assets/images/redesign/icons/icon-new_group-dark.png
    	app/assets/images/redesign/icons/icon-new_group-mid.png
    	app/assets/images/redesign/icons/icon-new_set-bright.png
    	app/assets/images/redesign/icons/icon-new_set-dark.png
    	app/assets/images/redesign/icons/icon-new_set-mid.png
    	app/assets/images/redesign/icons/icon-pen-bright.png
    	app/assets/images/redesign/icons/icon-pen-dark.png
    	app/assets/images/redesign/icons/icon-pen-mid.png
    	app/assets/images/redesign/icons/icon-plus-bright.png
    	app/assets/images/redesign/icons/icon-plus-dark.png
    	app/assets/images/redesign/icons/icon-plus-mid.png
    	app/assets/images/redesign/icons/icon-question_mark-bright.png
    	app/assets/images/redesign/icons/icon-question_mark-dark.png
    	app/assets/images/redesign/icons/icon-question_mark-mid.png
    	app/assets/images/redesign/icons/icon-sidebar-bright.png
    	app/assets/images/redesign/icons/icon-sidebar-dark.png
    	app/assets/images/redesign/icons/icon-sidebar-mid.png
    	app/assets/images/redesign/icons/icon-tag-bright.png
    	app/assets/images/redesign/icons/icon-tag-dark.png
    	app/assets/images/redesign/icons/icon-tag-mid.png
    	app/assets/images/redesign/icons/icon-to_set-bright.png
    	app/assets/images/redesign/icons/icon-to_set-dark.png
    	app/assets/images/redesign/icons/icon-to_set-mid.png
    	app/assets/images/redesign/icons/icon-trash-bright.png
    	app/assets/images/redesign/icons/icon-trash-dark.png
    	app/assets/images/redesign/icons/icon-trash-mid.png
    	app/assets/images/redesign/icons/icon-upload-bright.png
    	app/assets/images/redesign/icons/icon-upload-dark.png
    	app/assets/images/redesign/icons/icon-upload-mid.png
    	app/assets/images/redesign/icons/icon-vis_graph-bright.png
    	app/assets/images/redesign/icons/icon-vis_graph-dark.png
    	app/assets/images/redesign/icons/icon-vis_graph-mid.png
    	app/assets/images/redesign/icons/icon-vis_grid-bright.png
    	app/assets/images/redesign/icons/icon-vis_grid-dark.png
    	app/assets/images/redesign/icons/icon-vis_grid-mid.png
    	app/assets/images/redesign/icons/icon-vis_list-bright.png
    	app/assets/images/redesign/icons/icon-vis_list-dark.png
    	app/assets/images/redesign/icons/icon-vis_list-mid.png
    	app/assets/images/redesign/icons/icon-vis_tiles-bright.png
    	app/assets/images/redesign/icons/icon-vis_tiles-dark.png
    	app/assets/images/redesign/icons/icon-vis_tiles-mid.png
    	app/assets/images/redesign/icons/icon-x-bright.png
    	app/assets/images/redesign/icons/icon-x-dark.png
    	app/assets/images/redesign/icons/icon-x-mid.png
    	app/assets/images/redesign/thumbnails/base_audio.mpega.png
    	app/assets/javascripts/redesign/application.js.coffee
    	app/assets/javascripts/redesign/combos/clipboard.js.coffee
    	app/assets/stylesheets/redesign/_config.scss
    	app/assets/stylesheets/redesign/_layout.scss
    	app/assets/stylesheets/redesign/application.scss
    	app/assets/stylesheets/redesign/combos/_media-resources-grid.scss
    	app/assets/stylesheets/redesign/combos/_media-resources-list.scss
    	app/assets/stylesheets/redesign/combos/_ui-clipboard.scss
    	app/assets/stylesheets/redesign/combos/_ui-featured-entries.scss
    	app/assets/stylesheets/redesign/combos/_ui-media-overview.scss
    	app/assets/stylesheets/redesign/combos/_ui-metadata-summary.scss
    	app/assets/stylesheets/redesign/combos/_ui-rights-management.scss
    	app/assets/stylesheets/redesign/components/_media-resources.scss
    	app/assets/stylesheets/redesign/components/_thumbnail-wrappers.scss
    	app/assets/stylesheets/redesign/components/_ui-modals.scss
    	app/assets/stylesheets/redesign/components/_ui-preloaders.scss
    	app/assets/stylesheets/redesign/components/_ui-set-list.scss
    	app/assets/stylesheets/redesign/general/_icons.scss
    	app/models/media_file.rb
    	app/views/redesign/application/_login.html.haml
    	app/views/redesign/application/_navigation.html.haml
    	app/views/redesign/browse/categories.html.haml
    	app/views/redesign/browse/index.html.haml
    	app/views/redesign/browse/media_resources.html.haml
    	app/views/redesign/browse/sections.html.haml
    	app/views/redesign/groups/_wrapper.html.haml
    	app/views/redesign/groups/index.html.haml
    	app/views/redesign/import/meta_data.html.haml
    	app/views/redesign/import/organize.html.haml
    	app/views/redesign/import/permissions.html.haml
    	app/views/redesign/import/start.html.haml
    	app/views/redesign/keywords/_wrapper.html.haml
    	app/views/redesign/keywords/index.html.haml
    	app/views/redesign/media_entries/browse.html.haml
    	app/views/redesign/media_entries/edit.html.haml
    	app/views/redesign/media_entries/edit_multiple.html.haml
    	app/views/redesign/media_entries/show.html.haml
    	app/views/redesign/media_resources/_actions.html.haml
    	app/views/redesign/media_resources/_group-resources.html.haml
    	app/views/redesign/media_resources/_media_resource.html.haml
    	app/views/redesign/media_resources/_privacy.html.haml
    	app/views/redesign/media_resources/_search-results.html.haml
    	app/views/redesign/media_resources/_wrapper.html.haml
    	app/views/redesign/media_resources/index.html.haml
    	app/views/redesign/media_sets/_category.html.haml
    	app/views/redesign/media_sets/_thumbnail_level_down.html.haml
    	app/views/redesign/media_sets/_thumbnail_level_up.html.haml
    	app/views/redesign/media_sets/show.html.haml
    	app/views/redesign/users/show.html.haml
    	app/views/styleguides/5.html.erb
    	app/views/styleguides/7.html.erb
    	app/views/styleguides/8.html.erb
    	lib/tasks/app/thumbnails.rake

commit 62b850413b4019a3cad6f7254b2a7e2e3048cb3d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Nov 26 09:40:11 2012 +0100

    implement loading animation for level down/up for media set

commit 605e62341785872bc0eaf6a62e871bb90dd992cc
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 23 22:44:13 2012 +0100

    make clipboard sticky on footer

commit f2466274e76e7eb1bfa27ca84622f136598c1d1b
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Nov 23 06:11:06 2012 +0100

    small placeholder icons + media set popup

commit ff03602d795e3368da507f0dc0762cd0b936778a
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 22 17:09:18 2012 +0100

    extend palceholder thumbnails, reactivate lorem pixum in dev, minor fixes

commit d40540cf51f0b602cb401999d2ca48892de4781d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 22 15:01:30 2012 +0100

    small adaption of redesign changes

commit e5246f505e53b005fff188b00254661720b4018e
Merge: ee30067 d436e20
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 22 14:51:17 2012 +0100

    Merge branch 'further_redesign_stuff' into redesign_dashboard

    Conflicts:
    	app/views/redesign/application/root.html.haml
    	app/views/redesign/users/show.html.haml

commit ee3006715cbe34b3f3e06cbc966cfbcec6a20bd6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Nov 22 14:18:41 2012 +0100

    go on with media resource rendering

commit d436e204c222dc131426ef292351b4964fba7d80
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 22 12:39:23 2012 +0100

    Styleguide section 7 revised.

commit 0189ddc86e7a11b6e6ac71b57da44787d9ff1b7d
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 22 12:29:21 2012 +0100

    Styleguide: Icons revamp.

commit fbb7d6f12e45d9275d35b2b5471c5948ad2de6e5
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 22 11:25:05 2012 +0100

    Rights management revamp.

commit f3b796087bc5106f004d9145f143401c5467d6b9
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 18:03:21 2012 +0100

    Flickering backgrounds.

commit bf5b20fadeac972f6d72f6fda48896320d5933fa
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 17:59:59 2012 +0100

    Search result to be up to date with new styleguide list view item.

commit 7d7e87d148d704f31bb7ab11dc04d6b7a51996a1
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 17:58:18 2012 +0100

    List View: fav and select icons closer to the title

commit 60ed052f3a9acfb8206b33ff8338767e749041ac
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 17:51:42 2012 +0100

    Clipboard revamp.

commit aa91bc1c0aa3ff804b002e26f4bf6d2be51d02ae
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 17:51:07 2012 +0100

    Metadata edit: remove rights management tab

commit a9eb5d3d43fa029a415d234cf1a5be5b09f521ce
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 17:25:22 2012 +0100

    Container revamp. Metadata summary in set view limited in width.

commit 0b3b79b73a4b0794066d0efcbdb6366a887b0f4a
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 15:21:59 2012 +0100

    Actions bar: adjust spacing

commit 9faec667c4c700401202c003fb6592705a54fb7c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 15:11:28 2012 +0100

    Dashboard: add in number of tags to the title. Same for TAG CLOUD page

commit 7c78b8c4950cda9dc87a5d67015a8d46ccff48d5
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 15:07:53 2012 +0100

    Side filter icon specificity issue.

commit 285b452b295600e67ec499669f12c1c0e5ef107d
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 14:18:38 2012 +0100

    Dropdown menu items are now separated with borders.

commit 73c7024810a639e76dfcbca865f3dcd97aa37caa
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 14:13:26 2012 +0100

    Footer is now sticky again.

commit 8098a1f205919e108b6db4b53e3763375b43c4ef
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 13:53:45 2012 +0100

    Home page collage gets overlay and transparency treatment.

commit 87ebc780e9cd01325a21f04185cf7672cb83344e
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 13:35:07 2012 +0100

    Collage now works in Firefox too.

commit b44668ea90e9420135fe0c72613b8fc70f2f3fd3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 13:34:56 2012 +0100

    Filter toggle gets sidebar icon.

commit 89cd62e05d08801a14ee4dcb7c6d8abb1a718005
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 13:03:57 2012 +0100

    Side filter arrows now change on active.

commit 82f8ab625de5435d4842c4fd7a79572bddf1902d
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 21 12:50:51 2012 +0100

    Side navigation gets 3rd level.

commit c35d4d14cfd3cc365103e778c340d4e2262c8d1a
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:55:47 2012 +0100

    Home claim revamped and documented properly.

commit ab74478a4103c37a95205025e8e2a59e00c3af94
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:46:47 2012 +0100

    Side filter no longer using bootstrap for accordion.

commit da982660b5f827d49840a922c5d39f60c8084813
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:18:23 2012 +0100

    Modal titles are now centered.

commit f87c1c4e0a2edd0b3c4296b1efa26b8d02182444
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:17:11 2012 +0100

    Buttons in action bar are now centered.

commit a1c6c03fd3892100835f860faa213fe64c3de450
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:04:16 2012 +0100

    Adding tag widget to media entries edit pages.

commit c0a74a69ba3a919a6c19666f51adc3c766d93a65
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:00:14 2012 +0100

    Adding group resources page.

commit fb1ae104be342b4cc7c50872707a432311e39005
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 18:00:01 2012 +0100

    Fixing side filter toggle.

commit b0cb3cc9f66f4f140a636d1baadd194c4517b492
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:44:27 2012 +0100

    Collage styles revamped.

commit 288d627ad08a4600828503b6f48638093c150a9e
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:37:25 2012 +0100

    Fixing footer and header documentations.

commit 274c84d71596b19d42928dace3627e868873d6f5
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:37:01 2012 +0100

    Documenting new crooked collage.

commit 4751c2a8dce3732fe0c0c08e11abca694c612be0
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:25:45 2012 +0100

    Keyword page gets main nav fix.

commit 1932913d25ad33ea5ac129e9ef7c7c5476e91478
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:16:33 2012 +0100

    Revert "Thumbnails and thumbnail wrappers revamped."

    This reverts commit 4b9e280a35b0e1ba3a3aff7050d437ec61c7ff65.

commit 719287dbc9f17ea7d4bfd807aebb8376febf4dca
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 17:09:09 2012 +0100

    Adding Keywords page. Side navigation now supports .active state.

commit 4b9e280a35b0e1ba3a3aff7050d437ec61c7ff65
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:53:59 2012 +0100

    Thumbnails and thumbnail wrappers revamped.

commit ab6f023f8c0ec6249a5cf356445953e88fea8a2f
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:48:53 2012 +0100

    Media overview revamp.

commit 389535dc3f8b4415b8d8a6f40d771b81548ed888
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:39:46 2012 +0100

    Documenting new Footer combo.

commit d24c1f6e2ee79a91ef005658b82acb92a6c6f280
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:37:52 2012 +0100

    Documenting new Workgroups combo.

commit ca3d77565befa6191c0f4ebaedb85bf4e79e2336
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:36:36 2012 +0100

    Documenting new header.

commit 7b620c3322eed94a1ed0601e48feb23ad2ae9a75
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:32:55 2012 +0100

    Side filter revamp.

commit 4dce27ab2ab7468804d1289f44149f64ce4f3faa
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:31:10 2012 +0100

    Tag cloud revamp

commit d9c1f6a1fb88c0a2fced6ad50d58edf7226438d4
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:30:40 2012 +0100

    Tabs revamp

commit fded78e9048139084243f0139b9f0ad0eeb0bb84
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:26:50 2012 +0100

    Alerts revamp.

commit 5be3f8379b3b4f83cf68a3536207b211ba125108
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:22:41 2012 +0100

    Stepline and Action Bar revamp.

commit 085c7837af4496e4fa054f55738e15428a7c3344
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 16:16:38 2012 +0100

    Modal revamp.

commit 9f68191c4c4fa2d673ee3966628b9309607afee8
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 15:04:07 2012 +0100

    Removed from Dashboard: Inhalte meiner arbeitsgruppen, Recent upload as My Entries is now ordered by date.

commit 7b6931e11480e15680f1c77b43c7bbee02c1fbf3
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 15:00:28 2012 +0100

    Documenting preloaders.

commit 7688ada7bce9fe9f76067a65f231581409fe6324
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 14:18:13 2012 +0100

    .media-entries are now called .media-resources

commit 15a78e8e912571ed9b007e4eed07b18ee26a90d3
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Nov 20 14:13:30 2012 +0100

    <body> is again forced to min-width 940px.

commit bd5ac859d9c254e0ce51071cb0ff563f21bb50e9
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Nov 20 10:55:18 2012 +0100

    prepare more static pages
[FIX] merge conflict for is_api_request
Merge branch 'next' into redesign

Conflicts:
	app/controllers/application_controller.rb