aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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 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
| | |
* | | Merge pull request #861 from wallabag/fix-query-sqlite-installThomas Citharel2014-10-081-3/+5
|\ \ \ | |/ / |/| | query for populate mysql/postgres was called when we choosed sqlite
| * | query for populate mysql/postgres was called when we choosed sqliteNicolas Lœuillet2014-10-081-3/+5
|/ /
* | Merge pull request #787 from wallabag/data-for-mysqlThomas Citharel2014-10-081-0/+19
|\ \ | | | | | | Add data for mysql installation, see #624
| * | Fix bug for #787tcit2014-10-081-4/+4
| | |