aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| | * fix #873tcit2014-10-191-0/+4
| |/
| * Merge pull request #868 from wallabag/popupoverlapNicolas Lœuillet2014-10-152-1/+14
| |\ | | | | | | fix for #830
| | * fix for #830tcit2014-10-152-1/+14
| |/
| * Merge pull request #848 from 11mariom/devNicolas Lœuillet2014-10-142-0/+3
| |\ | | | | | | Add support for custom http port
| | * Add support for custom http portMariusz Kozakowski2014-09-232-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-utf8mb4Nicolas Lœuillet2014-10-143-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 Ros2014-09-183-11/+15
| | |/ | | | | | | | | | characters
| * | Merge pull request #867 from wallabag/zindex-menu-bugNicolas Lœuillet2014-10-141-1/+1
| |\ \ | | | | | | | | fix z-index-menu mobile view bug #834
| | * | fix z-index-menu mobile view bug #834tcit2014-10-121-1/+1
| | | |
| * | | Create adme.ru.txtThomas Citharel2014-10-121-0/+6
| | | | | | | | | | | | Siteconfig
| * | | Merge pull request #865 from Marmo/patch-1Thomas Citharel2014-10-111-2/+4
| |\ \ \ | | |/ / | |/| | update heise.de.txt
| | * | update heise.de.txtMarmo2014-10-111-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 branch 'dev'1.8.0Nicolas Lœuillet2014-10-101012-7222/+10188
|\ \ \
| * \ \ Merge branch 'master' into devNicolas Lœuillet2014-10-101-1/+2
| |\ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: index.php
* | | Merge branch 'fix/securityMaster'1.7.2Nicolas Lœuillet2014-07-241-42/+42
|\ \ \
| * | | 1.7.2Nicolas Lœuillet2014-07-241-34/+34
| | | |
| * | | security fixMaryana Rozhankivska2014-07-241-41/+41
|/ / /
* | | Merge pull request #761 from wallabag/dev1.7.1Nicolas Lœuillet2014-07-1517-166/+191
|\ \ \ | | | | | | | | 1.7.1
* \ \ \ Merge pull request #712 from wallabag/dev1.7.0Nicolas Lœuillet2014-05-2969-4591/+12244
|\ \ \ \ | | | | | | | | | | 1.7, call me "Premium version"
* | | | | Added PHPePubtcitworld2014-05-161-1/+2
| | | | |
* | | | | Merge pull request #634 from wallabag/dev1.6.1bNicolas Lœuillet2014-04-1116-749/+814
|\ \ \ \ \ | | | | | | | | | | | | 1.6.1
* \ \ \ \ \ Merge pull request #595 from wallabag/dev1.6.11.6.0Nicolas Lœuillet2014-04-03100-2255/+9895
|\ \ \ \ \ \ | | | | | | | | | | | | | | wallabag 1.6.0
| | | | | * \ Merge pull request #860 from wallabag/compatibility_fileThomas Citharel2014-10-081-2/+2
| | | | | |\ \ | | | | | | | | | | | | | | | | Move compatibility file (fixes #858)
| | | | | | * | Right redirect from the new pathtcit2014-10-081-2/+2
| | | | | | | |
| | | | | | * | change href in install/index.phpNicolas Lœuillet2014-10-081-1/+1
| | | | | | | |
| | | | | | * | Fixes #858: move compatibility file into install folderNicolas Lœuillet2014-10-081-0/+0
| | | | | | | |