Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'axelsimon-patch-1' into dev | Nicolas Lœuillet | 2015-07-31 | 1 | -1/+1 |
|\ | |||||
| * | fix documentation url | Nicolas Lœuillet | 2015-07-31 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'patch-1' of https://github.com/axelsimon/wallabag into ↵ | Nicolas Lœuillet | 2015-07-31 | 2 | -1/+8 |
| |\ | | | | | | | | | | axelsimon-patch-1 | ||||
| | * | fix link to documentation | Axel Simon | 2015-07-24 | 1 | -1/+1 |
| | | | | | | | | | fix link to Save your first article (no capital letters in documentation pages) | ||||
* | | | Merge pull request #1257 from freddyb/dev-autoclose | Thomas Citharel | 2015-07-30 | 1 | -2/+11 |
|\ \ \ | | | | | | | | | Dev autoclose | ||||
| * | | | Merge branch 'autoclose-postmessage' into dev | Frederik B | 2015-07-30 | 1 | -2/+11 |
|/| | | | |||||
| * | | | Send postMessage to opener before autoclose | Frederik B | 2015-07-30 | 1 | -2/+11 |
| | |/ | |/| | |||||
* | | | Merge pull request #1252 from wallabag/securityfix | Thomas Citharel | 2015-07-30 | 2 | -13/+1 |
|\ \ \ | | | | | | | | | fix security bug with PHP_AUTH_USER | ||||
| * | | | fix security bug with PHP_AUTH_USER | Thomas Citharel | 2015-07-28 | 2 | -13/+1 |
| | | | | |||||
* | | | | Merge pull request #1226 from wallabag/MoriTanosuke-dev | Thomas Citharel | 2015-07-29 | 3 | -2/+21 |
|\ \ \ \ | | | | | | | | | | | Enable base_url for proxies | ||||
| * | | | | delete the debug call | Thomas Citharel | 2015-06-29 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fix BASE_URL | Thomas Citharel | 2015-06-29 | 2 | -7/+14 |
| | | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into ↵ | Thomas Citharel | 2015-06-29 | 2 | -2/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | MoriTanosuke-dev | ||||
| | * | | | | Use config option BASE_URL in getPocheUrl() | Carsten Ringe | 2015-06-09 | 1 | -2/+8 |
| | | |/ / | | |/| | | |||||
| | * | | | Update README.md | Nicolas Lœuillet | 2015-04-02 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Merge pull request #1081 from wallabag/dev1.9 | Thomas Citharel | 2015-02-18 | 289 | -2699/+74751 |
| | |\ \ \ | | | | | | | | | | | | | Version 1.9.0 | ||||
* | | | | | | remove call to google fonts because privacy ! | Thomas Citharel | 2015-07-27 | 1 | -1/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | add mark as read and next to keyboard shortcuts | Thomas Citharel | 2015-07-27 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | fix #1237, display a message instead of button when connections are not ↵ | Thomas Citharel | 2015-07-27 | 7 | -78/+144 |
| |_|_|/ |/| | | | | | | | | | | | through https | ||||
* | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2015-07-19 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | fix #1238 (yes, again !) | Thomas Citharel | 2015-07-19 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | fixed a postgresql-related bug, more database functions secured and add an ↵ | Thomas Citharel | 2015-07-18 | 2 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | exception for sqlite at installation | ||||
* | | | | | fixed bug for #1242 | Thomas Citharel | 2015-07-17 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | secure database functions | Thomas Citharel | 2015-07-17 | 2 | -72/+85 |
| | | | | |||||
* | | | | fix #1238 | Thomas Citharel | 2015-07-10 | 1 | -0/+7 |
| | | | | | | | | | | | | thanks @qwertygc | ||||
* | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2015-07-08 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1234 from jmlrt/dev | Thomas Citharel | 2015-07-08 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | | | add site config for des-livres-pour-changer-de-vie.fr | ||||
| | * | | | | add site config for des-livres-pour-changer-de-vie.fr | jmlrt | 2015-07-08 | 1 | -0/+6 |
| | | | | | | |||||
* | | | | | | new config files | Thomas Citharel | 2015-07-08 | 5 | -0/+33 |
| | | | | | | |||||
* | | | | | | another siteconfig file | Thomas Citharel | 2015-07-08 | 2 | -2/+10 |
| | | | | | | |||||
* | | | | | | fix saving URL with enter key | Thomas Citharel | 2015-07-07 | 1 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2015-07-07 | 2 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Merge pull request #1228 from jmlrt/dev | Thomas Citharel | 2015-07-06 | 2 | -0/+12 |
| |\| | | | | | | | | | | | | | | | | add site_config for cloudacademy.com and cyrille-borne.com | ||||
| | * | | | | add site_config for cloudacademy.com and cyrille-borne.com | jmlrt | 2015-07-06 | 2 | -0/+12 |
| |/ / / / | |||||
* / / / / | Revert "[1005] fixing redirection when deleting archived article" | Thomas Citharel | 2015-07-07 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | This reverts commit 63fc40ff8465cd14b6221636ccbd2d9d9c07787e. | ||||
* | | | | added a lot of siteconfig files | Thomas Citharel | 2015-07-06 | 13 | -0/+84 |
| | | | | |||||
* | | | | fix #1224 | Thomas Citharel | 2015-07-06 | 1 | -2/+6 |
| | | | | |||||
* | | | | fix #1209 | Thomas Citharel | 2015-07-06 | 1 | -0/+9 |
|/ / / | |||||
* | | | deleted the js console logs calls | Thomas Citharel | 2015-06-20 | 1 | -6/+0 |
| | | | |||||
* | | | new config file | Thomas Citharel | 2015-06-17 | 1 | -0/+5 |
| | | | | | | | | | Taken from https://github.com/ebal/confs/blob/master/wallabag/inc/3rdparty/site_config/standard/n0where.net.txt | ||||
* | | | Merge branch 'dev' of http://github.com/wallabag/wallabag into dev | Thomas Citharel | 2015-06-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #1217 from wallabag/fix-#1215 | Nicolas Lœuillet | 2015-06-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Fix #1215 | ||||
| | * | | | Fix #1215 | Thomas Citharel | 2015-06-11 | 1 | -0/+1 |
| |/ / / | |||||
* / / / | bring back long lasting session...maybe | Thomas Citharel | 2015-06-11 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #1211 from goofy-bz/patch-41.9.1beta3 | Thomas Citharel | 2015-06-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update fr_FR.utf8.po | ||||
| * | | | Update fr_FR.utf8.po | goofy-bz | 2015-06-07 | 1 | -1/+1 |
|/ / / | | | | | | | minor typofix "utilisateur" | ||||
* | | | Merge pull request #1207 from vpmalley/dev | Thomas Citharel | 2015-06-06 | 2 | -2/+17 |
|\ \ \ | | | | | | | | | issue #1203: fixing tag export | ||||
| * | | | [1005] fixing redirection when deleting archived article | Vincent Malley | 2015-06-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into dev | Vincent Malley | 2015-06-02 | 8 | -19/+60 |
| |\ \ \ | |||||
| * | | | | [1203] fixing tag export | Vincent Malley | 2015-06-02 | 2 | -1/+16 |
| | | | | |