Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1226 from wallabag/MoriTanosuke-dev | Thomas Citharel | 2015-07-29 | 2 | -2/+14 |
|\ | | | | | 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 | 1 | -2/+8 |
| |\ | | | | | | | | | | MoriTanosuke-dev | ||||
| | * | Use config option BASE_URL in getPocheUrl() | Carsten Ringe | 2015-06-09 | 1 | -2/+8 |
| | | | |||||
* | | | fix #1237, display a message instead of button when connections are not ↵ | Thomas Citharel | 2015-07-27 | 1 | -1/+3 |
| | | | | | | | | | | | | 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 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | 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 |
|/ / / / | |||||
* | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2015-07-07 | 2 | -0/+12 |
|\| | | | |||||
| * | | | 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 |
|/ / | |||||
* | | 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 |
|\ \ | |||||
| * | | Fix #1215 | Thomas Citharel | 2015-06-11 | 1 | -0/+1 |
| | | | |||||
* | | | bring back long lasting session...maybe | Thomas Citharel | 2015-06-11 | 1 | -2/+2 |
|/ / | |||||
* | | [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 | 3 | -17/+58 |
|\ \ | |||||
| * | | check that URL are real ones before importing them (for instance, avoid ↵ | Thomas Citharel | 2015-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | bookmarklets) | ||||
| * | | declare function correctly | Thomas Citharel | 2015-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | added commentsand fixed something forgotten | Thomas Citharel | 2015-05-22 | 2 | -1/+9 |
| | | | |||||
| * | | added Firefox-bookmarks format import mode | Thomas Citharel | 2015-05-22 | 2 | -15/+48 |
| | | | |||||
| * | | fix restart of import | Nicolas Lœuillet | 2015-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | [1203] fixing tag export | Vincent Malley | 2015-06-02 | 2 | -1/+16 |
|/ / | |||||
* | | redo the whole lot of commits I've deleted while trying Gitlab/Framasoft ↵ | Thomas Citharel | 2015-03-14 | 2 | -3/+3 |
| | | | | | | | | mirroring | ||||
* | | fix #1154 | Thomas Citharel | 2015-03-13 | 1 | -2/+5 |
| | | |||||
* | | fix little problems and bring previous features to all themes | Thomas Citharel | 2015-03-13 | 1 | -1/+1 |
| | | |||||
* | | fix for #1153, a couple of improvements and fixed bugs | Thomas Citharel | 2015-03-13 | 2 | -6/+20 |
| | | |||||
* | | tag cloud is present, #1122 is implemented | Thomas Citharel | 2015-03-08 | 1 | -0/+20 |
| | | |||||
* | | implement #11221.9.1alpha1 | Thomas Citharel | 2015-03-08 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'dev' of github.com:wallabag/wallabag into dev | Thomas Citharel | 2015-03-08 | 2 | -7/+8 |
|\ \ | |||||
| * | | remove unnecessary lines (again) | Thomas Citharel | 2015-03-07 | 1 | -6/+7 |
| | | | |||||
| * | | remove unnecessary line | Thomas Citharel | 2015-03-07 | 1 | -1/+0 |
| | | | |||||
| * | | autoclose was not declared | Thomas Citharel | 2015-03-07 | 1 | -0/+1 |
| | | | |||||
* | | | mark read and go to next now in the right direction | Thomas Citharel | 2015-03-08 | 1 | -1/+1 |
|/ / | |||||
* | | implement #1123 | Thomas Citharel | 2015-03-02 | 2 | -3/+43 |
| | | |||||
* | | fix pdf being saved at root, now in cache/ folder | Thomas Citharel | 2015-03-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of github.com:wallabag/wallabag into dev | Thomas Citharel | 2015-02-19 | 1 | -1/+1 |
|\| | |||||
| * | Change message type from success to error | Thomas Citharel | 2015-02-18 | 1 | -1/+1 |
| | | | | | | See #1096 |