aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #1301 from wallabag/fixFFSocialThomas Citharel2015-08-082-2/+0
| |\ | | | | | | Fix ff social
| | * and another oneThomas2015-08-081-1/+0
| | |
| | * remove a console.log() callThomas2015-08-071-1/+0
| |/
* | Merge pull request #1415 from sridharrajs/patch-1Jeremy Benoist2015-09-111-3/+3
|\ \ | | | | | | Update CONTRIBUTING.md
| * | Update CONTRIBUTING.mdSridharrajS2015-09-111-3/+3
|/ / | | | | Corrected typo "dedicaced" to "dedicated"
* | Merge pull request #1274 from wallabag/dev1.9.1-bNicolas Lœuillet2015-08-041-1/+1
|\| | | | | 1.9.1-b
| * Merge pull request #1272 from wallabag/nicosomb-patch-1Jeremy Benoist2015-08-041-1/+1
| |\ | | | | | | remove new syntax for array
| | * remove new syntax for arrayNicolas Lœuillet2015-08-041-1/+1
| |/
* | Merge pull request #1267 from wallabag/dev1.9.1Nicolas Lœuillet2015-08-03350-7103/+15542
|\| | | | | 1.9.1
| * Merge pull request #1266 from wallabag/fix-site-configJeremy Benoist2015-08-02113-119/+742
| |\ | | | | | | Fix site config
| | * update config from @fivefiltersNicolas Lœuillet2015-08-01112-121/+734
| | |
| | * fix #982: config for quechoisir.orgNicolas Lœuillet2015-08-011-0/+10
| | |
| | * fix #1090: add config for computerworld.comNicolas Lœuillet2015-08-011-5/+2
| | |
| | * fix #1264: config for tofugu.comNicolas Lœuillet2015-08-011-0/+3
| |/
| * Merge branch 'axelsimon-patch-1' into devNicolas Lœuillet2015-07-311-1/+1
| |\
| | * fix documentation urlNicolas Lœuillet2015-07-311-1/+1
| | |
| | * Merge branch 'patch-1' of https://github.com/axelsimon/wallabag into ↵Nicolas Lœuillet2015-07-312-1/+8
| | |\ | | | | | | | | | | | | axelsimon-patch-1
| | | * fix link to documentationAxel Simon2015-07-241-1/+1
| | | | | | | | | | | | fix link to Save your first article (no capital letters in documentation pages)
| * | | Merge pull request #1257 from freddyb/dev-autocloseThomas Citharel2015-07-301-2/+11
| |\ \ \ | | | | | | | | | | Dev autoclose
| | * | | Merge branch 'autoclose-postmessage' into devFrederik B2015-07-301-2/+11
| |/| | |
| | * | | Send postMessage to opener before autocloseFrederik B2015-07-301-2/+11
| | | |/ | | |/|
| * | | Merge pull request #1252 from wallabag/securityfixThomas Citharel2015-07-302-13/+1
| |\ \ \ | | | | | | | | | | fix security bug with PHP_AUTH_USER
| | * | | fix security bug with PHP_AUTH_USERThomas Citharel2015-07-282-13/+1
| | | | |
| * | | | Merge pull request #1226 from wallabag/MoriTanosuke-devThomas Citharel2015-07-293-2/+21
| |\ \ \ \ | | | | | | | | | | | | Enable base_url for proxies
| | * | | | delete the debug callThomas Citharel2015-06-291-1/+0
| | | | | |
| | * | | | fix BASE_URLThomas Citharel2015-06-292-7/+14
| | | | | |
| | * | | | Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into ↵Thomas Citharel2015-06-292-2/+15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | MoriTanosuke-dev
| | | * | | | Use config option BASE_URL in getPocheUrl()Carsten Ringe2015-06-091-2/+8
| | | | |/ / | | | |/| |
| * | | | | remove call to google fonts because privacy !Thomas Citharel2015-07-271-1/+0
| | |_|/ / | |/| | |
| * | | | add mark as read and next to keyboard shortcutsThomas Citharel2015-07-271-0/+9
| | | | |
| * | | | fix #1237, display a message instead of button when connections are not ↵Thomas Citharel2015-07-277-78/+144
| | |_|/ | |/| | | | | | | | | | through https
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-191-0/+6
| |\ \ \
| | * | | fix #1238 (yes, again !)Thomas Citharel2015-07-191-0/+6
| | | | |
| * | | | fixed a postgresql-related bug, more database functions secured and add an ↵Thomas Citharel2015-07-182-8/+20
| | | | | | | | | | | | | | | | | | | | exception for sqlite at installation
| * | | | fixed bug for #1242Thomas Citharel2015-07-171-3/+3
| |/ / /
| * | | secure database functionsThomas Citharel2015-07-172-72/+85
| | | |
| * | | fix #1238Thomas Citharel2015-07-101-0/+7
| | | | | | | | | | | | thanks @qwertygc
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-081-0/+6
| |\ \ \
| | * \ \ Merge pull request #1234 from jmlrt/devThomas Citharel2015-07-081-0/+6
| | |\ \ \ | | | | | | | | | | | | add site config for des-livres-pour-changer-de-vie.fr
| | | * | | add site config for des-livres-pour-changer-de-vie.frjmlrt2015-07-081-0/+6
| | | | | |
| * | | | | new config filesThomas Citharel2015-07-085-0/+33
| | | | | |
| * | | | | another siteconfig fileThomas Citharel2015-07-082-2/+10
| | | | | |
| * | | | | fix saving URL with enter keyThomas Citharel2015-07-071-1/+3
| |/ / / /
| * | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-072-0/+12
| |\ \ \ \
| | * | | | Merge pull request #1228 from jmlrt/devThomas Citharel2015-07-062-0/+12
| | |\| | | | | | | | | | | | | | | add site_config for cloudacademy.com and cyrille-borne.com
| | | * | | add site_config for cloudacademy.com and cyrille-borne.comjmlrt2015-07-062-0/+12
| | |/ / /
| * / / / Revert "[1005] fixing redirection when deleting archived article"Thomas Citharel2015-07-071-1/+1
| |/ / / | | | | | | | | | | | | This reverts commit 63fc40ff8465cd14b6221636ccbd2d9d9c07787e.
| * | | added a lot of siteconfig filesThomas Citharel2015-07-0613-0/+84
| | | |
| * | | fix #1224Thomas Citharel2015-07-061-2/+6
| | | |
| * | | fix #1209Thomas Citharel2015-07-061-0/+9
| |/ /