Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Removing duplicate popup form styles | Jay Sitter | 2014-10-31 | 1 | -42/+16 |
| | | |||||
* | | Merge pull request #909 from jsit/closebutton | Thomas Citharel | 2014-10-31 | 3 | -22/+26 |
|\ \ | | | | | | | Standardizing class names and styles for close buttons | ||||
| * | | Removing left border on popup forms on mobile widths | Jay Sitter | 2014-10-31 | 1 | -0/+1 |
| | | | |||||
| * | | Fixing popup form width issue on narrow width | Jay Sitter | 2014-10-31 | 1 | -1/+8 |
| | | | |||||
| * | | Standardizing class names and styles for close buttons | Jay Sitter | 2014-10-31 | 3 | -21/+17 |
| |/ | |||||
* | | Merge pull request #910 from jsit/default-theme-search-form-css | Thomas Citharel | 2014-10-31 | 2 | -6/+10 |
|\ \ | | | | | | | Moving search-form style out of messages css and into style.css | ||||
| * | | Moving search-form style out of messages css and into style.css | Jay Sitter | 2014-10-31 | 2 | -6/+10 |
|/ / | |||||
* | | Merge pull request #908 from jsit/closemessage | Thomas Citharel | 2014-10-31 | 1 | -1/+1 |
|\ \ | |/ |/| | Changing close message button to use × instead of X | ||||
| * | Changing close message button to use × instead of X | Jay Sitter | 2014-10-31 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #907 from jsit/login | Thomas Citharel | 2014-10-31 | 3 | -11/+10 |
|\ | | | | | Some small design tweaks to the login page: Moving 'Stay signed in'... | ||||
| * | Adding right margin to labels (to compensate for now-missing left margin on ↵ | Jay Sitter | 2014-10-31 | 2 | -6/+6 |
| | | | | | | | | input fields) | ||||
| * | Some small design tweaks to the login page: Moving 'Stay signed in' label ↵ | Jay Sitter | 2014-10-31 | 2 | -5/+4 |
| | | | | | | | | and removing left margin on input boxes | ||||
* | | Merge pull request #894 from wallabag/change-password-field | Thomas Citharel | 2014-10-31 | 1 | -2/+2 |
|\ \ | | | | | | | Fix #891: change type for password field in installation | ||||
| * | | change type for password field in installation | Nicolas Lœuillet | 2014-10-29 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #904 from wallabag/vagrantfile | Thomas Citharel | 2014-10-31 | 2 | -1/+73 |
|\ \ \ | | | | | | | | | Vagrantfile | ||||
| * | | | change database name | Nicolas Lœuillet | 2014-10-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | ignore vagrant directory | Nicolas Lœuillet | 2014-10-30 | 1 | -1/+2 |
| | | | | |||||
| * | | | Vagrantfile, from @fguillot for kanboard | Nicolas Lœuillet | 2014-10-30 | 1 | -0/+71 |
| |/ / | |||||
* | | | Merge pull request #906 from jsit/tagstitle | Nicolas Lœuillet | 2014-10-30 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Uppercasing 'tags' page title | ||||
| * | | Uppercasing 'tags' page title | Jay Sitter | 2014-10-30 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #898 from jsit/previewtext | Nicolas Lœuillet | 2014-10-30 | 1 | -4/+0 |
|\ \ | | | | | | | Fixing issue #874, displaying preview text when in list mode | ||||
| * | | Fixing issue #874, displaying preview text when in list mode | Jay Sitter | 2014-10-30 | 1 | -4/+0 |
| |/ | |||||
* | | Merge pull request #897 from jsit/displaymode | Nicolas Lœuillet | 2014-10-30 | 2 | -6/+10 |
|\ \ | | | | | | | Fixing display mode switching in Baggy theme (issue #896) | ||||
| * | | Fixing display mode switching in Baggy theme (issue #896) | Jay Sitter | 2014-10-30 | 2 | -6/+10 |
| |/ | |||||
* | | Merge pull request #905 from jsit/closebutton | Nicolas Lœuillet | 2014-10-30 | 3 | -29/+25 |
|\ \ | | | | | | | Making the close button more visually consistent on the menu popup forms | ||||
| * | | Making the close button more visually consistent on the menu popup forms | Jay Sitter | 2014-10-30 | 3 | -29/+25 |
| | | | |||||
* | | | Merge pull request #903 from jsit/uitextcase | Nicolas Lœuillet | 2014-10-30 | 2 | -9/+8 |
|\ \ \ | |/ / |/| | | Fixing some more text case issues | ||||
| * | | Fixing some more text case issues | Jay Sitter | 2014-10-30 | 2 | -9/+8 |
| | | | |||||
* | | | Merge pull request #902 from jsit/en_us | Nicolas Lœuillet | 2014-10-30 | 3 | -1/+639 |
|\ \ \ | | | | | | | | | Adding 'en_US' locale (issue #901) | ||||
| * | | | Adding 'en_US' locale (issue #901) | Jay Sitter | 2014-10-30 | 1 | -1/+2 |
| | | | | |||||
| * | | | Adding 'en_US' locale (issue #901) | Jay Sitter | 2014-10-30 | 2 | -0/+637 |
| |/ / | |||||
* | / | Merge pull request #900 from jsit/uitextcase | Thomas Citharel | 2014-10-30 | 2 | -77/+77 |
|\| | | |/ |/| | Fixing a bunch of English translation letter casing and syntax (issue #899) | ||||
| * | Fixing a bunch of English translation letter casing and syntax (issue #899) | Jay Sitter | 2014-10-30 | 2 | -77/+77 |
|/ | |||||
* | Merge pull request #889 from wallabag/fix#871 | Nicolas Lœuillet | 2014-10-27 | 12 | -25/+128 |
|\ | | | | | Fix#871 | ||||
| * | translation fix finished for #871 and bring add tag from search feature to ↵ | tcit | 2014-10-27 | 9 | -19/+25 |
| | | | | | | | | all themes | ||||
| * | translation fix for #887 and tiny display fix | tcit | 2014-10-27 | 7 | -9/+46 |
| | | |||||
| * | fix translation issues | tcit | 2014-10-17 | 5 | -2/+62 |
| | | |||||
* | | Merge pull request #888 from wallabag/updated-site-config | Thomas Citharel | 2014-10-27 | 64 | -119/+685 |
|\ \ | | | | | | | updated site_config | ||||
| * | | updated site_config | Nicolas Lœuillet | 2014-10-27 | 64 | -119/+685 |
|/ / | |||||
* | | Merge pull request #883 from wallabag/hotfixepub | Nicolas Lœuillet | 2014-10-22 | 1 | -1/+1 |
|\ \ | | | | | | | fix #882 | ||||
| * | | fix #882 | tcit | 2014-10-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #879 from Marmo/patch-1 | Thomas Citharel | 2014-10-21 | 1 | -0/+4 |
|\ \ | | | | | | | update zeit.de.txt for removal of inline ads | ||||
| * | | update zeit.de.txt for removal of inline ads | Marmo | 2014-10-21 | 1 | -0/+4 |
|/ / | |||||
* | | Merge pull request #878 from wallabag/greybuttonread | Nicolas Lœuillet | 2014-10-20 | 1 | -0/+4 |
|\ \ | |/ |/| | fix #873 |