Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into dev | Nicolas Lœuillet | 2014-10-10 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: index.php | ||||
| * | Merge branch 'fix/securityMaster'1.7.2 | Nicolas Lœuillet | 2014-07-24 | 1 | -42/+42 |
| |\ | |||||
| | * | 1.7.2 | Nicolas Lœuillet | 2014-07-24 | 1 | -34/+34 |
| | | | |||||
| | * | security fix | Maryana Rozhankivska | 2014-07-24 | 1 | -41/+41 |
| |/ | |||||
| * | Merge pull request #761 from wallabag/dev1.7.1 | Nicolas Lœuillet | 2014-07-15 | 17 | -166/+191 |
| |\ | | | | | | | 1.7.1 | ||||
| * \ | Merge pull request #712 from wallabag/dev1.7.0 | Nicolas Lœuillet | 2014-05-29 | 69 | -4591/+12244 |
| |\ \ | | | | | | | | | 1.7, call me "Premium version" | ||||
| * | | | Added PHPePub | tcitworld | 2014-05-16 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #634 from wallabag/dev1.6.1b | Nicolas Lœuillet | 2014-04-11 | 16 | -749/+814 |
| |\ \ \ | | | | | | | | | | | 1.6.1 | ||||
| * \ \ \ | Merge pull request #595 from wallabag/dev1.6.11.6.0 | Nicolas Lœuillet | 2014-04-03 | 100 | -2255/+9895 |
| |\ \ \ \ | | | | | | | | | | | | | wallabag 1.6.0 | ||||
* | \ \ \ \ | Merge pull request #860 from wallabag/compatibility_file | Thomas Citharel | 2014-10-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move compatibility file (fixes #858) | ||||
| * | | | | | | Right redirect from the new path | tcit | 2014-10-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | change href in install/index.php | Nicolas Lœuillet | 2014-10-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixes #858: move compatibility file into install folder | Nicolas Lœuillet | 2014-10-08 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #861 from wallabag/fix-query-sqlite-install | Thomas Citharel | 2014-10-08 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | query for populate mysql/postgres was called when we choosed sqlite | ||||
| * | | | | | | query for populate mysql/postgres was called when we choosed sqlite | Nicolas Lœuillet | 2014-10-08 | 1 | -3/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #787 from wallabag/data-for-mysql | Thomas Citharel | 2014-10-08 | 1 | -0/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add data for mysql installation, see #624 | ||||
| * | | | | | | Fix bug for #787 | tcit | 2014-10-08 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'dev' into data-for-mysql | tcit | 2014-10-08 | 1002 | -6904/+9381 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #855 from wallabag/fix-828 | Nicolas Lœuillet | 2014-10-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix #828 | ||||
| * | | | | | | | get full content | tcit | 2014-10-04 | 1 | -0/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #856 from wallabag/fix-826 | Nicolas Lœuillet | 2014-10-04 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix #826 | ||||
| * | | | | | | | | get content | tcit | 2014-10-04 | 1 | -0/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #854 from wallabag/saveclick2search | Nicolas Lœuillet | 2014-10-04 | 8 | -5/+14 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Saveclick2search (fix for #831) | ||||
| * | | | | | | | small fix for better width for search translations full display | tcit | 2014-10-04 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | translate search messages | tcit | 2014-10-04 | 4 | -3/+6 |
| | | | | | | | | |||||
| * | | | | | | | autofocus on all themes | tcit | 2014-10-04 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'dev' into saveclick2search | tcit | 2014-10-04 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | fixed bug in config screen for default theme | tcit | 2014-10-04 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | search field selected | tcit | 2014-10-04 | 2 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #853 from wallabag/fix-for-#797 | Thomas Citharel | 2014-10-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix for #797 | ||||
| * | | | | | | | Fix for #797 | tcitworld | 2014-08-05 | 1 | -0/+7 |
| | | | | | | | | |||||
* | | | | | | | | fix for #758 | tcit | 2014-09-28 | 1 | -48/+63 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'issue-844' of https://github.com/rros/wallabag into dev | tcit | 2014-09-28 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix the PostgreSQL install errors | Robert Ros | 2014-09-21 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | tcit | 2014-09-28 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #802 from tcitworld/traductionfix | Thomas Citharel | 2014-09-28 | 1 | -15/+15 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Traductionfix | ||||
| | * | | | | | | | | | Improved instructions | tcit | 2014-08-03 | 1 | -15/+15 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | get up to date for merge | tcit | 2014-09-28 | 11 | -33/+116 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | little fix | tcit | 2014-07-29 | 2 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | changes in all themes | tcit | 2014-07-26 | 2 | -0/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Translations | tcit | 2014-07-26 | 7 | -26/+95 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | precision | tcit | 2014-07-25 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | added email field | tcit | 2014-07-25 | 6 | -9/+16 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #841 from wallabag/fixGDdetection | tcitworld | 2014-09-27 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix #766 - GD detection | ||||
| * | | | | | | | | | | Fix #766 - GD detection | Thomas Citharel | 2014-09-17 | 1 | -1/+13 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'refactor' into dev | tcit | 2014-09-27 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | merge refactor and dev | tcit | 2014-09-27 | 32 | -449/+1129 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #839 from wallabag/fixlocalpictures | Nicolas Lœuillet | 2014-09-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fix pictures display when DOWNLOAD_PICTURES is enabled | ||||
| * | | | | | | | | | | fix pictures display when DOWNLOAD_PICTURES is enabled | Thomas Citharel | 2014-09-16 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #836 from akoenig/x-forwarded-port | Nicolas Lœuillet | 2014-09-16 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Implemented additional check for using the 'X-Forwarded-Port' header. |