| Commit message (Expand) | Author | Age | Files | Lines |
* | failover if theme folder doesn't exist | Nicolas Lœuillet | 2014-11-24 | 52 | -1348/+1 |
* | Merge pull request #942 from wallabag/carrot | Thomas Citharel | 2014-11-21 | 11 | -33/+63 |
|\ |
|
| * | Merge pull request #945 from jsit/carrot | Thomas Citharel | 2014-11-21 | 1 | -2/+2 |
| |\ |
|
| | * | Fixing icon text on unread page | Jay Sitter | 2014-11-21 | 1 | -2/+2 |
| * | | Merge pull request #944 from jsit/carrot | Thomas Citharel | 2014-11-21 | 6 | -33/+52 |
| |\| |
|
| | * | Globalizing and creating two variants of Carrot.org icon; tidying up some CSS | Jay Sitter | 2014-11-21 | 6 | -33/+52 |
| |/ |
|
| * | fix merge confict | Thomas Citharel | 2014-11-19 | 4 | -5/+5 |
| |\
| |/
|/| |
|
* | | Merge pull request #943 from wallabag/fixFlattrs | Thomas Citharel | 2014-11-19 | 4 | -6/+4 |
|\ \ |
|
| * | | fix Flattrs | Thomas Citharel | 2014-11-19 | 4 | -6/+4 |
|/ / |
|
| * | default deactivated | Thomas Citharel | 2014-11-19 | 1 | -2/+2 |
| * | implementing carrot into wallabag | Thomas Citharel | 2014-11-19 | 10 | -6/+15 |
|/ |
|
* | Merge pull request #938 from jsit/firefoxiconfix | Thomas Citharel | 2014-11-18 | 3 | -6/+6 |
|\ |
|
| * | Fix for favicons in Firefox (FF only uses the last declared favicon, not the ... | Jay Sitter | 2014-11-18 | 3 | -6/+6 |
|/ |
|
* | Merge pull request #937 from jsit/favicons | Thomas Citharel | 2014-11-17 | 21 | -15/+83 |
|\ |
|
| * | Adjusting Template class so that _global is ignored as a theme | Jay Sitter | 2014-11-17 | 1 | -2/+2 |
| * | Modifying Courgette theme to comply with new app icon image location | Jay Sitter | 2014-11-17 | 5 | -4/+27 |
| * | Fixing earlier commit wherein I lowercased some JS calls | Jay Sitter | 2014-11-17 | 1 | -4/+4 |
| * | Removing app icons from previous locations | Jay Sitter | 2014-11-17 | 13 | -0/+0 |
| * | Moving app icon images to /themes/_global/img/appicon/, updating Baggy and De... | Jay Sitter | 2014-11-17 | 11 | -25/+47 |
| * | Adding/fixing favicon <link>s in Baggy theme header | Jay Sitter | 2014-11-17 | 1 | -4/+27 |
|/ |
|
* | update constant version | Thomas Citharel | 2014-11-16 | 1 | -2/+2 |
* | add DS_Store in gitignore | Nicolas Lœuillet | 2014-11-08 | 1 | -0/+1 |
* | Merge pull request #926 from jsit/aboutlink | Nicolas Lœuillet | 2014-11-05 | 2 | -2/+2 |
|\ |
|
| * | Fixing URL typo on about page | Jay Sitter | 2014-11-05 | 2 | -2/+2 |
|/ |
|
* | Merge pull request #921 from wallabag/about-page | Thomas Citharel | 2014-11-03 | 6 | -1/+153 |
|\ |
|
| * | add about page | Nicolas Lœuillet | 2014-11-03 | 6 | -1/+153 |
* | | Merge pull request #920 from jsit/uifixes | Nicolas Lœuillet | 2014-11-03 | 8 | -137/+236 |
|\ \ |
|
| * | | Applying changes to config.twig to default theme as well | Jay Sitter | 2014-11-03 | 1 | -58/+71 |
| * | | Removing title text from bookmarklet | Jay Sitter | 2014-11-03 | 1 | -1/+1 |
| * | | Restoring change password section in config | Jay Sitter | 2014-11-03 | 1 | -0/+21 |
| * | | Many small UI changes/fixes to Baggy theme and English translation files. May... | Jay Sitter | 2014-11-02 | 7 | -73/+138 |
| * | | Removing spaces before colons on config screen | Jay Sitter | 2014-11-02 | 1 | -4/+4 |
| * | | Merge branch 'dev' into uitextcase | Jay Sitter | 2014-11-01 | 1 | -0/+3 |
| |\ \ |
|
| * | | | Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epub | Jay Sitter | 2014-10-31 | 4 | -10/+10 |
* | | | | Merge pull request #922 from jsit/menuhiding | Nicolas Lœuillet | 2014-11-03 | 2 | -1/+4 |
|\ \ \ \ |
|
| * | | | | Improving class names for menu hiding | Jay Sitter | 2014-11-03 | 2 | -2/+2 |
| * | | | | Fixing menu hiding behavior when switching from mobile width to desktop width | Jay Sitter | 2014-11-03 | 2 | -1/+4 |
|/ / / / |
|
* | | | | Merge pull request #919 from jsit/popupjs_ | Nicolas Lœuillet | 2014-11-03 | 2 | -25/+71 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Improving JavaScript for popup forms | Jay Sitter | 2014-11-02 | 2 | -25/+71 |
|/ / / |
|
* | | | Merge pull request #917 from jsit/menuopacity | Thomas Citharel | 2014-10-31 | 1 | -0/+3 |
|\ \ \
| |/ /
|/| | |
|
| * | | Changing my tabs to spaces :) | Jay Sitter | 2014-10-31 | 1 | -3/+3 |
| * | | Fixing opacity issue when using mobile menu | Jay Sitter | 2014-10-31 | 1 | -0/+3 |
|/ / |
|
* | | Merge pull request #913 from jsit/hotfix | Thomas Citharel | 2014-10-31 | 1 | -1/+1 |
|\ \ |
|
| * | | Fixing regression in popup close button styling | Jay Sitter | 2014-10-31 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'jsit-duplicateformstyles' into dev | tcit | 2014-10-31 | 2 | -3/+3 |
|\ \ |
|
| * \ | fix merge errors | tcit | 2014-10-31 | 2 | -3/+3 |
| |\ \ |
|
| | * \ | Merging changes with dev | Jay Sitter | 2014-10-31 | 5 | -28/+36 |
| | |\ \ |
|
* | | | | | Merge branch 'jsit-duplicateformstyles' into dev | tcit | 2014-10-31 | 3 | -56/+20 |
|\| | | |
| |_|/ /
|/| | | |
|
| * | | | merge | tcit | 2014-10-31 | 3 | -56/+20 |
|/| | |
| |/ / |
|
| * | | Making visual styling of search and bag it popup forms more consistent | Jay Sitter | 2014-10-31 | 3 | -19/+9 |