Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 | ||||
| * | fix #873 | tcit | 2014-10-19 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #868 from wallabag/popupoverlap | Nicolas Lœuillet | 2014-10-15 | 2 | -1/+14 |
|\ | | | | | fix for #830 | ||||
| * | fix for #830 | tcit | 2014-10-15 | 2 | -1/+14 |
|/ | |||||
* | Merge pull request #848 from 11mariom/dev | Nicolas Lœuillet | 2014-10-14 | 2 | -0/+3 |
|\ | | | | | Add support for custom http port | ||||
| * | Add support for custom http port | Mariusz Kozakowski | 2014-09-23 | 2 | -0/+3 |
| | | | | | | | | | | Now you can use wallabag behind reverse proxy (i.e Squid or Varnish) without problem with urls like wallabag.example.com:8080. | ||||
* | | Merge pull request #843 from rros/mysql-utf8mb4 | Nicolas Lœuillet | 2014-10-14 | 3 | -11/+15 |
|\ \ | | | | | | | Convert the MySQL charset to utf8mb4 to support the full range of unicode | ||||
| * | | Convert the MySQL charset to utf8mb4 to support the full range of unicode ↵ | Robert Ros | 2014-09-18 | 3 | -11/+15 |
| |/ | | | | | | | characters | ||||
* | | Merge pull request #867 from wallabag/zindex-menu-bug | Nicolas Lœuillet | 2014-10-14 | 1 | -1/+1 |
|\ \ | | | | | | | fix z-index-menu mobile view bug #834 | ||||
| * | | fix z-index-menu mobile view bug #834 | tcit | 2014-10-12 | 1 | -1/+1 |
| | | | |||||
* | | | Create adme.ru.txt | Thomas Citharel | 2014-10-12 | 1 | -0/+6 |
| | | | | | | | | | Siteconfig | ||||
* | | | Merge pull request #865 from Marmo/patch-1 | Thomas Citharel | 2014-10-11 | 1 | -2/+4 |
|\ \ \ | |/ / |/| | | update heise.de.txt | ||||
| * | | update heise.de.txt | Marmo | 2014-10-11 | 1 | -2/+4 |
|/ / | | | | | Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html). | ||||
* | | Merge pull request #860 from wallabag/compatibility_file | Thomas Citharel | 2014-10-08 | 1 | -2/+2 |
|\ \ | | | | | | | Move compatibility file (fixes #858) | ||||
| * | | Right redirect from the new path | tcit | 2014-10-08 | 1 | -2/+2 |
| | | | |||||
| * | | change href in install/index.php | Nicolas Lœuillet | 2014-10-08 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes #858: move compatibility file into install folder | Nicolas Lœuillet | 2014-10-08 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #861 from wallabag/fix-query-sqlite-install | Thomas Citharel | 2014-10-08 | 1 | -3/+5 |
|\ \ \ | |/ / |/| | | query for populate mysql/postgres was called when we choosed sqlite | ||||
| * | | query for populate mysql/postgres was called when we choosed sqlite | Nicolas Lœuillet | 2014-10-08 | 1 | -3/+5 |
|/ / | |||||
* | | Merge pull request #787 from wallabag/data-for-mysql | Thomas Citharel | 2014-10-08 | 1 | -0/+19 |
|\ \ | | | | | | | Add data for mysql installation, see #624 | ||||
| * | | Fix bug for #787 | tcit | 2014-10-08 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'dev' into data-for-mysql | tcit | 2014-10-08 | 1002 | -6904/+9381 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #855 from wallabag/fix-828 | Nicolas Lœuillet | 2014-10-04 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Fix #828 | ||||
| * | | | get full content | tcit | 2014-10-04 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #856 from wallabag/fix-826 | Nicolas Lœuillet | 2014-10-04 | 1 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Fix #826 |