Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #1301 from wallabag/fixFFSocial | Thomas Citharel | 2015-08-08 | 2 | -2/+0 | |
| |\ | | | | | | | Fix ff social | |||||
| | * | and another one | Thomas | 2015-08-08 | 1 | -1/+0 | |
| | | | ||||||
| | * | remove a console.log() call | Thomas | 2015-08-07 | 1 | -1/+0 | |
| |/ | ||||||
* | | Merge pull request #1415 from sridharrajs/patch-1 | Jeremy Benoist | 2015-09-11 | 1 | -3/+3 | |
|\ \ | | | | | | | Update CONTRIBUTING.md | |||||
| * | | Update CONTRIBUTING.md | SridharrajS | 2015-09-11 | 1 | -3/+3 | |
|/ / | | | | | Corrected typo "dedicaced" to "dedicated" | |||||
* | | Merge pull request #1274 from wallabag/dev1.9.1-b | Nicolas Lœuillet | 2015-08-04 | 1 | -1/+1 | |
|\| | | | | | 1.9.1-b | |||||
| * | Merge pull request #1272 from wallabag/nicosomb-patch-1 | Jeremy Benoist | 2015-08-04 | 1 | -1/+1 | |
| |\ | | | | | | | remove new syntax for array | |||||
| | * | remove new syntax for array | Nicolas Lœuillet | 2015-08-04 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #1267 from wallabag/dev1.9.1 | Nicolas Lœuillet | 2015-08-03 | 350 | -7103/+15542 | |
|\| | | | | | 1.9.1 | |||||
| * | Merge pull request #1266 from wallabag/fix-site-config | Jeremy Benoist | 2015-08-02 | 113 | -119/+742 | |
| |\ | | | | | | | Fix site config | |||||
| | * | update config from @fivefilters | Nicolas Lœuillet | 2015-08-01 | 112 | -121/+734 | |
| | | | ||||||
| | * | fix #982: config for quechoisir.org | Nicolas Lœuillet | 2015-08-01 | 1 | -0/+10 | |
| | | | ||||||
| | * | fix #1090: add config for computerworld.com | Nicolas Lœuillet | 2015-08-01 | 1 | -5/+2 | |
| | | | ||||||
| | * | fix #1264: config for tofugu.com | Nicolas Lœuillet | 2015-08-01 | 1 | -0/+3 | |
| |/ | ||||||
| * | 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 | |
| | | | |/ / | | | |/| | | ||||||
| * | | | | | 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 | |
| |/ / |