Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove autoload section in composer.json | Nicolas Lœuillet | 2015-01-16 | 1 | -5/+0 |
| | |||||
* | Merge pull request #1004 from wallabag/packagist | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+28 |
|\ | | | | | Fixed #993: add wallabag to packagist | ||||
| * | Fixed #993: add wallabag to packagist | Nicolas Lœuillet | 2015-01-16 | 1 | -0/+28 |
|/ | |||||
* | Merge pull request #986 from goofy-bz/patch-2 | Nicolas Lœuillet | 2015-01-02 | 1 | -1/+1 |
|\ | | | | | Update fr_FR.utf8.po | ||||
| * | Update fr_FR.utf8.po | goofy-bz | 2015-01-02 | 1 | -1/+1 |
|/ | | | formulation (trivial) | ||||
* | Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import | Thomas Citharel | 2014-12-26 | 1 | -1/+4 |
|\ | | | | | Make call to FTRSS silent to avoid warnings which can break import | ||||
| * | Make call to FTRSS silent to avoid warnings which can break import | Jean Baptiste Favre | 2014-12-21 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #933 from wallabag/dev1.8.1old1.8.1bis1.8.1b | Nicolas Lœuillet | 2014-11-16 | 1 | -2/+2 |
|\ | | | | | 1.8.1b | ||||
| * | update constant version | Thomas Citharel | 2014-11-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #932 from wallabag/dev1.8.1 | Nicolas Lœuillet | 2014-11-15 | 103 | -501/+2186 |
|\| | | | | | 1.8.1 | ||||
| * | 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 | ||||
| | * | 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 | ||||
| | * | 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 |
| |\ \ | | | | | | | | | Many small UI changes/fixes to Baggy theme and English translation files | ||||
| | * | | 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. ↵ | Jay Sitter | 2014-11-02 | 7 | -73/+138 |
| | | | | | | | | | | | | | | | | May need review. | ||||
| | * | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Fixing menu hiding behavior when switching from mobile width to desktop width | ||||
| | * | | | | 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 | ||||
| | * | | | 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 |
| |\ \ \ | | |/ / | |/| | | Fixing opacity issue when using mobile menu (#912) | ||||
| | * | | 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 | ||||
| | * | | 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 |
| | | | | |||||
| | * | | 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) |