aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2841 from Kdecherf/active-menu-searchJeremy Benoist2017-02-051-4/+16
|\ | | | | Show active list in the left menu during search
| * Show active list in the left menu during searchKevin Decherf2017-02-051-4/+16
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #2788 from Zettt/masterJeremy Benoist2017-02-051-0/+13
|\ \ | | | | | | Documentation on how to configure mobile apps to work with wallabag.it
| * | Added configuration documentation for mobile appsAndreas Zeitler2017-02-051-0/+13
| | |
* | | Merge pull request #2839 from foxmask/masterJeremy Benoist2017-02-051-1/+1
|\ \ \ | |_|/ |/| | scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
| * | scripts/update.sh: 18: scripts/update.sh: composer.phar: not foundFoxMaSk2017-02-041-1/+1
| | | | | | | | | when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.
* | | Merge pull request #2838 from wallabag/Quent-in-patch-1Jeremy Benoist2017-02-041-60/+60
|\ \ \ | | | | | | | | Update Oc version
| * | | Update Oc versionQuent-in2017-02-041-60/+60
| |/ / | | | | | | I'll be ready for next train
* | | Merge pull request #2840 from wallabag/fix-frameworkbundleJeremy Benoist2017-02-041-1/+1
|\ \ \ | |/ / |/| | Restored correct version for framework-extra-bundle
| * | Restored correct version for framework-extra-bundleNicolas Lœuillet2017-02-041-1/+1
|/ / | | | | The bundle was fixed in latest version.
* | Merge pull request #2818 from Kdecherf/fix-search-barNicolas Lœuillet2017-02-033-3/+5
|\ \ | | | | | | Fix nav-panel-search height
| * | Added minified CSS filesNicolas Lœuillet2017-02-022-2/+2
| | |
| * | Fix nav-panel-search heightKevin Decherf2017-02-021-1/+3
|/ / | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #2831 from wallabag/Quent-in-patch-1Jeremy Benoist2017-02-021-6/+6
|\ \ | | | | | | Update of CraueConfigBundle in Occitan
| * | Update of CraueConfigBundle in OccitanQuent-in2017-02-021-6/+6
|/ /
* | Merge pull request #2824 from wallabag/simplify-stringsNicolas Lœuillet2017-02-0213-72/+72
|\ \ | | | | | | Renamed Developer section to API client management
| * | Freezed sensio/framework-extra-bundle versionNicolas Lœuillet2017-02-021-1/+1
| | |
| * | Merge pull request #2829 from wallabag/mruminski-patch-1Jeremy Benoist2017-02-021-5/+5
| |\ \ | | | | | | | | Update polish strings
| | * | Update polish stringsMateusz Rumiński2017-02-011-5/+5
| |/ / | | | | | | update missing polish strings
| * | Update german strings.Julian Oster2017-02-011-5/+5
| | |
| * | Renamed Developer section to API client managementNicolas Lœuillet2017-02-0112-71/+71
| | |
* | | Merge pull request #2826 from wallabag/jlnostr-patch-1Jeremy Benoist2017-02-021-40/+40
|\ \ \ | |/ / |/| | Translate missing strings for de-DE.
| * | Translate missing strings for de-DE.Julian Oster2017-02-011-40/+40
|/ /
* | Merge pull request #2816 from wallabag/add-details-updateNicolas Lœuillet2017-01-313-0/+27
|\ \ | | | | | | Added details about upgrade from 2.1.x or 2.2.0
| * | Added details about upgrade from 2.1.x or 2.2.0Nicolas Lœuillet2017-01-313-0/+27
|/ /
* | Merge pull request #2812 from wallabag/prepare-221Nicolas Lœuillet2017-01-312-1/+5
|\ \ | | | | | | Prepare wallabag 2.2.1 :rocket:
| * | Prepare wallabag 2.2.1 :rocket:Nicolas Lœuillet2017-01-312-1/+5
|/ /
* | Merge pull request #2809 from wallabag/fix-22-migrationsNicolas Lœuillet2017-01-314-2/+325
|\ \ | | | | | | Fixed duplicate entry for share_public in craue_setting_table
| * | Added check in migration about uuid fieldNicolas Lœuillet2017-01-301-1/+1
| | |
| * | Fixed duplicate entry for share_public in craue_setting_tableNicolas Lœuillet2017-01-304-1/+324
|/ /
* | Merge pull request #2790 from wallabag/prepare-220Nicolas Lœuillet2017-01-272-5/+89
|\ \ | | | | | | Prepare wallabag 2.2.0 🚀
| * | Prepare wallabag 2.2.0 :rocket:Nicolas Lœuillet2017-01-272-5/+89
|/ /
* | Merge pull request #2789 from wallabag/add-index-starred-archivedNicolas Lœuillet2017-01-277-0/+314
|\ \ | | | | | | Added indexes on is_archived and is_starred
| * | Fixed check on indexNicolas Lœuillet2017-01-271-4/+2
| | |
| * | Added indexes on is_archived and is_starredNicolas Lœuillet2017-01-277-0/+316
|/ /
* | Merge pull request #2416 from wallabag/2.2Jeremy Benoist2017-01-27282-1079/+9826
|\ \ | |/ |/| wallabag 2.2.0
| * Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2017-01-2612-25/+31
| |\ | |/ |/|
* | Merge pull request #2759 from wallabag/prepare-2162.1.6Nicolas Lœuillet2017-01-182-3/+9
|\ \ | | | | | | Prepare wallabag 2.1.6 :rocket:
| * | Prepare wallabag 2.1.6 :rocket:Nicolas Lœuillet2017-01-172-3/+9
|/ /
* | Merge pull request #2758 from wallabag/fix-public-sharingNicolas Lœuillet2017-01-179-22/+26
|\ \ | | | | | | Fixed possible JS injection via the title edition
| * | Fixed possible JS injection via the title editionNicolas Lœuillet2017-01-179-22/+26
|/ /
* | Merge pull request #2736 from lex111/patch-1Thomas Citharel2017-01-042-2/+2
|\ \ | | | | | | Update copyright year
| * | Update copyright year in COPYING.mdAlexey Py2017-01-051-1/+1
| | |
| * | Update copyright yearAlexey Py2017-01-041-1/+1
|/ /
| * Merge pull request #2646 from wallabag/explain-migrations-in-docNicolas Lœuillet2017-01-2621-113/+2641
| |\ | | | | | | Added explanations about migrations
| | * Moved queries in a separate fileNicolas Lœuillet2017-01-256-802/+2396
| | |
| | * Fixed update scriptNicolas Lœuillet2017-01-231-1/+1
| | |
| | * Added hardcoded SQL for migration to 2.2Nicolas Lœuillet2017-01-237-17/+840
| | |
| | * Added information about latest migrationsNicolas Lœuillet2017-01-2314-3/+41
| | |
| | * Add translation for :de:Julian Oster2017-01-231-16/+16
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 22:24:09 +0000