aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jsit-duplicateformstyles' into devtcit2014-10-312-3/+3
|\
| * fix merge errorstcit2014-10-312-3/+3
| |\
| | * Merging changes with devJay Sitter2014-10-315-28/+36
| | |\
* | | | Merge branch 'jsit-duplicateformstyles' into devtcit2014-10-313-56/+20
|\| | | | |_|/ |/| |
| * | mergetcit2014-10-313-56/+20
|/| | | |/
| * Making visual styling of search and bag it popup forms more consistentJay Sitter2014-10-313-19/+9
| |
| * Removing duplicate popup form stylesJay Sitter2014-10-311-42/+16
| |
* | Merge pull request #909 from jsit/closebuttonThomas Citharel2014-10-313-22/+26
|\ \ | | | | | | Standardizing class names and styles for close buttons
| * | Removing left border on popup forms on mobile widthsJay Sitter2014-10-311-0/+1
| | |
| * | Fixing popup form width issue on narrow widthJay Sitter2014-10-311-1/+8
| | |
| * | Standardizing class names and styles for close buttonsJay Sitter2014-10-313-21/+17
| |/
* | Merge pull request #910 from jsit/default-theme-search-form-cssThomas Citharel2014-10-312-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.cssJay Sitter2014-10-312-6/+10
|/ /
* | Merge pull request #908 from jsit/closemessageThomas Citharel2014-10-311-1/+1
|\ \ | |/ |/| Changing close message button to use × instead of X
| * Changing close message button to use × instead of XJay Sitter2014-10-311-1/+1
|/
* Merge pull request #907 from jsit/loginThomas Citharel2014-10-313-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 Sitter2014-10-312-6/+6
| | | | | | | | input fields)
| * Some small design tweaks to the login page: Moving 'Stay signed in' label ↵Jay Sitter2014-10-312-5/+4
| | | | | | | | and removing left margin on input boxes
* | Merge pull request #894 from wallabag/change-password-fieldThomas Citharel2014-10-311-2/+2
|\ \ | | | | | | Fix #891: change type for password field in installation
| * | change type for password field in installationNicolas Lœuillet2014-10-291-2/+2
| | |
* | | Merge pull request #904 from wallabag/vagrantfileThomas Citharel2014-10-312-1/+73
|\ \ \ | | | | | | | | Vagrantfile
| * | | change database nameNicolas Lœuillet2014-10-301-1/+1
| | | |
| * | | ignore vagrant directoryNicolas Lœuillet2014-10-301-1/+2
| | | |
| * | | Vagrantfile, from @fguillot for kanboardNicolas Lœuillet2014-10-301-0/+71
| |/ /
* | | Merge pull request #906 from jsit/tagstitleNicolas Lœuillet2014-10-301-2/+2
|\ \ \ | |_|/ |/| | Uppercasing 'tags' page title
| * | Uppercasing 'tags' page titleJay Sitter2014-10-301-2/+2
|/ /
* | Merge pull request #898 from jsit/previewtextNicolas Lœuillet2014-10-301-4/+0
|\ \ | | | | | | Fixing issue #874, displaying preview text when in list mode
| * | Fixing issue #874, displaying preview text when in list modeJay Sitter2014-10-301-4/+0
| |/
* | Merge pull request #897 from jsit/displaymodeNicolas Lœuillet2014-10-302-6/+10
|\ \ | | | | | | Fixing display mode switching in Baggy theme (issue #896)
| * | Fixing display mode switching in Baggy theme (issue #896)Jay Sitter2014-10-302-6/+10
| |/
* | Merge pull request #905 from jsit/closebuttonNicolas Lœuillet2014-10-303-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 formsJay Sitter2014-10-303-29/+25
| | |
* | | Merge pull request #903 from jsit/uitextcaseNicolas Lœuillet2014-10-302-9/+8
|\ \ \ | |/ / |/| | Fixing some more text case issues
| * | Fixing some more text case issuesJay Sitter2014-10-302-9/+8
| | |
* | | Merge pull request #902 from jsit/en_usNicolas Lœuillet2014-10-303-1/+639
|\ \ \ | | | | | | | | Adding 'en_US' locale (issue #901)
| * | | Adding 'en_US' locale (issue #901)Jay Sitter2014-10-301-1/+2
| | | |
| * | | Adding 'en_US' locale (issue #901)Jay Sitter2014-10-302-0/+637
| |/ /
* | / Merge pull request #900 from jsit/uitextcaseThomas Citharel2014-10-302-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 Sitter2014-10-302-77/+77
|/
* Merge pull request #889 from wallabag/fix#871Nicolas Lœuillet2014-10-2712-25/+128
|\ | | | | Fix#871
| * translation fix finished for #871 and bring add tag from search feature to ↵tcit2014-10-279-19/+25
| | | | | | | | all themes
| * translation fix for #887 and tiny display fixtcit2014-10-277-9/+46
| |
| * fix translation issuestcit2014-10-175-2/+62
| |
* | Merge pull request #888 from wallabag/updated-site-configThomas Citharel2014-10-2764-119/+685
|\ \ | | | | | | updated site_config
| * | updated site_configNicolas Lœuillet2014-10-2764-119/+685
|/ /
* | Merge pull request #883 from wallabag/hotfixepubNicolas Lœuillet2014-10-221-1/+1
|\ \ | | | | | | fix #882
| * | fix #882tcit2014-10-221-1/+1
|/ /
* | Merge pull request #879 from Marmo/patch-1Thomas Citharel2014-10-211-0/+4
|\ \ | | | | | | update zeit.de.txt for removal of inline ads
| * | update zeit.de.txt for removal of inline adsMarmo2014-10-211-0/+4
|/ /
* | Merge pull request #878 from wallabag/greybuttonreadNicolas Lœuillet2014-10-201-0/+4
|\ \ | |/ |/| fix #873