Shaarli - The personal, minimalist, super-fast, database free, bookmarking service

	Commit message (Expand)	Author	Age	Files	Lines
*	README: fix link address typo	VirtualTam	2016-08-20	1	-1/+1
*	update link to install instuctions in README	nodiscc	2016-08-17	1	-1/+1
*	Merge pull request #638 from virtualtam/docker/stable/composer	VirtualTam	2016-08-14	1	-4/+19
\|\
\| *	Docker: update dependencies, introduce Composer	VirtualTam	2016-08-14	1	-4/+19
* \|	Merge pull request #633 from virtualtam/docker/composer	VirtualTam	2016-08-14	2	-15/+38
\|\ \ \| \|/ \|/\|
\| *	Docker: update dependencies, introduce Composer	VirtualTam	2016-08-14	2	-15/+38
\|/
*	Merge pull request #619 from ArthurHoaro/plugins/param-desc	VirtualTam	2016-08-13	8	-18/+37
\|\
\| *	Add a description to wallabag plugin parameters	ArthurHoaro	2016-08-02	1	-1/+3
\| *	Plugin parameter description: Update the templates to display them	ArthurHoaro	2016-08-02	2	-4/+5
\| *	Parse plugin parameters description with the PluginManager	ArthurHoaro	2016-08-02	5	-13/+29
* \|	Merge pull request #636 from virtualtam/fix/final-newline	VirtualTam	2016-08-13	7	-18/+18
\|\ \
\| * \|	Fix: add missing final newlines, untabify text	VirtualTam	2016-08-13	7	-18/+18
\|/ /
* \|	Merge pull request #635 from virtualtam/fix/import/ie	VirtualTam	2016-08-13	3	-2/+38
\|\ \
\| * \|	Fix: ensure Internet Explorer bookmark dumps can be imported	VirtualTam	2016-08-12	3	-2/+38
\|/ /
* \|	Merge pull request #634 from virtualtam/composer/gitattributes	VirtualTam	2016-08-12	1	-1/+0
\|\ \
\| * \|	Fix: keep composer.json in release archives	VirtualTam	2016-08-12	1	-1/+0
\|/ /
* \|	Merge pull request #612 from virtualtam/refactor/bookmark-parser	Arthur	2016-08-10	10	-122/+779
\|\ \
\| * \|	Refactor bookmark import using a generic Netscape parser	VirtualTam	2016-08-10	10	-122/+779
\|/ /
* \|	Merge pull request #632 from virtualtam/composer/shaarli/netscape-bookmark-pa...	VirtualTam	2016-08-10	1	-7/+1
\|\ \
\| * \|	Composer: reference shaarli/netscape-bookmark-parser from Packagist	VirtualTam	2016-08-10	1	-7/+1
\|/ /
* \|	Merge pull request #624 from julienCXX/pr-curl-http-fetch	Arthur	2016-08-09	1	-10/+150
\|\ \
\| * \|	Set cURL as default in HTTP fetching, a fallback method and consistency fixup...	julienCXX	2016-08-08	1	-10/+150
* \| \|	Merge pull request #628 from ArthurHoaro/hotfix/default-private	Arthur	2016-08-07	1	-1/+1
\|\ \ \
\| * \| \|	Bugfix: wrong key used to get default private links setting	ArthurHoaro	2016-08-07	1	-1/+1
\|/ / /
* \| \|	Merge pull request #627 from ArthurHoaro/feature/translate-init	Arthur	2016-08-07	3	-0/+63
\|\ \ \
\| * \| \|	Initialize a translation function	ArthurHoaro	2016-08-07	3	-0/+63
\|/ / /
* \| \|	Merge pull request #625 from ArthurHoaro/token	VirtualTam	2016-08-07	2	-9/+1
\|\ \ \
\| * \| \|	Generate a token for every pages	ArthurHoaro	2016-08-06	2	-9/+1
\| \|/ /
* \| \|	Merge pull request #626 from ArthurHoaro/hotfix/changepassword	VirtualTam	2016-08-07	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Bugfix: enable change password if open shaarli is disabled	ArthurHoaro	2016-08-06	1	-1/+1
\|/ /
* \|	Merge pull request #621 from ArthurHoaro/hotfix/update-escape-config	VirtualTam	2016-08-02	2	-2/+26
\|\ \
\| * \|	Fix update method escapeUnescapedConfig	ArthurHoaro	2016-08-02	2	-2/+26
* \| \|	Merge pull request #618 from ArthurHoaro/tagclean	VirtualTam	2016-08-02	3	-3/+7
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Better whitespace handling in tags	ArthurHoaro	2016-08-02	3	-28/+6
\| * \|	add unit test	Chris Kuethe	2016-08-02	1	-0/+26
\| * \|	Better whitespace handling in tags. Fixes #571	Chris Kuethe	2016-08-02	1	-2/+2
\|/ /
* \|	Merge pull request #608 from virtualtam/refactor/bookmark-parser	VirtualTam	2016-07-26	3	-8/+47
\|\\|
\| *	Makefile: generate release archives including 3rd-party libraries	VirtualTam	2016-07-25	2	-7/+39
\| *	Composer: add shaarli/netscape-bookmark-parser	VirtualTam	2016-07-23	1	-1/+8
\|/
*	Merge pull request #605 from ArthurHoaro/clean-phpunit	Arthur	2016-07-23	2	-0/+6
\|\
\| *	Hide expected 'error_log' while running TU (clean PHPUnit log)	ArthurHoaro	2016-07-23	2	-0/+6
* \|	Merge pull request #604 from ArthurHoaro/no-delicious	Arthur	2016-07-23	2	-2/+2
\|\ \
\| * \|	Remove Delicious in project description in comments	ArthurHoaro	2016-07-23	2	-2/+2
\| \|/
* \|	Merge pull request #601 from ArthurHoaro/hotfix/title-missing	Arthur	2016-07-23	2	-15/+7
\|\ \
\| * \|	Fixes #600 - Shaarli's title is not set with the new config manager	ArthurHoaro	2016-07-19	2	-15/+7
\| \|/
* \|	Merge pull request #603 from julienCXX/pr-fix-test-method-name	Arthur	2016-07-21	1	-2/+2
\|\ \
\| * \|	Fix typo in test method name	julienCXX	2016-07-21	1	-2/+2
\|/ /
* \|	Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-var	Arthur	2016-07-10	2	-1/+2
\|\ \ \| \|/ \|/\|
\| *	Fix variable in configure.php	ArthurHoaro	2016-07-10	2	-1/+2
\|/
*	Merge pull request #558 from ArthurHoaro/hashtag4	Arthur	2016-07-09	10	-103/+270
\|\