aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #619 from ArthurHoaro/plugins/param-descVirtualTam2016-08-138-18/+37
| |\ \
| | * | Add a description to wallabag plugin parametersArthurHoaro2016-08-021-1/+3
| | * | Plugin parameter description: Update the templates to display themArthurHoaro2016-08-022-4/+5
| | * | Parse plugin parameters description with the PluginManagerArthurHoaro2016-08-025-13/+29
| * | | Merge pull request #636 from virtualtam/fix/final-newlineVirtualTam2016-08-137-18/+18
| |\ \ \
| | * | | Fix: add missing final newlines, untabify textVirtualTam2016-08-137-18/+18
| |/ / /
| * | | Merge pull request #635 from virtualtam/fix/import/ieVirtualTam2016-08-133-2/+38
| |\ \ \
| | * | | Fix: ensure Internet Explorer bookmark dumps can be importedVirtualTam2016-08-123-2/+38
| |/ / /
| * | | Merge pull request #634 from virtualtam/composer/gitattributesVirtualTam2016-08-121-1/+0
| |\ \ \
| | * | | Fix: keep composer.json in release archivesVirtualTam2016-08-121-1/+0
| |/ / /
| * | | Merge pull request #612 from virtualtam/refactor/bookmark-parserArthur2016-08-1010-122/+779
| |\ \ \
| | * | | Refactor bookmark import using a generic Netscape parserVirtualTam2016-08-1010-122/+779
| |/ / /
| * | | Merge pull request #632 from virtualtam/composer/shaarli/netscape-bookmark-pa...VirtualTam2016-08-101-7/+1
| |\ \ \
| | * | | Composer: reference shaarli/netscape-bookmark-parser from PackagistVirtualTam2016-08-101-7/+1
| |/ / /
| * | | Merge pull request #624 from julienCXX/pr-curl-http-fetchArthur2016-08-091-10/+150
| |\ \ \
| | * | | Set cURL as default in HTTP fetching, a fallback method and consistency fixup...julienCXX2016-08-081-10/+150
| | | |/ | | |/|
| * | | Merge pull request #628 from ArthurHoaro/hotfix/default-privateArthur2016-08-071-1/+1
| |\ \ \
| | * | | Bugfix: wrong key used to get default private links settingArthurHoaro2016-08-071-1/+1
| |/ / /
| * | | Merge pull request #627 from ArthurHoaro/feature/translate-initArthur2016-08-073-0/+63
| |\ \ \
| | * | | Initialize a translation functionArthurHoaro2016-08-073-0/+63
| |/ / /
| * | | Merge pull request #625 from ArthurHoaro/tokenVirtualTam2016-08-072-9/+1
| |\ \ \
| | * | | Generate a token for every pagesArthurHoaro2016-08-062-9/+1
| | |/ /
| * | | Merge pull request #626 from ArthurHoaro/hotfix/changepasswordVirtualTam2016-08-071-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Bugfix: enable change password if open shaarli is disabledArthurHoaro2016-08-061-1/+1
| |/ /
| * | Merge pull request #621 from ArthurHoaro/hotfix/update-escape-configVirtualTam2016-08-022-2/+26
| |\ \
| | * | Fix update method escapeUnescapedConfigArthurHoaro2016-08-022-2/+26
| * | | Merge pull request #618 from ArthurHoaro/tagcleanVirtualTam2016-08-023-3/+7
| |\ \ \ | | |/ / | |/| |
| | * | Better whitespace handling in tagsArthurHoaro2016-08-023-28/+6
| | * | add unit testChris Kuethe2016-08-021-0/+26
| | * | Better whitespace handling in tags. Fixes #571Chris Kuethe2016-08-021-2/+2
| |/ /
| * | Merge pull request #608 from virtualtam/refactor/bookmark-parserVirtualTam2016-07-263-8/+47
| |\|
| | * Makefile: generate release archives including 3rd-party librariesVirtualTam2016-07-252-7/+39
| | * Composer: add shaarli/netscape-bookmark-parserVirtualTam2016-07-231-1/+8
| |/
| * Merge pull request #605 from ArthurHoaro/clean-phpunitArthur2016-07-232-0/+6
| |\
| | * Hide expected 'error_log' while running TU (clean PHPUnit log)ArthurHoaro2016-07-232-0/+6
| * | Merge pull request #604 from ArthurHoaro/no-deliciousArthur2016-07-232-2/+2
| |\ \
| | * | Remove Delicious in project description in commentsArthurHoaro2016-07-232-2/+2
| | |/
| * | Merge pull request #601 from ArthurHoaro/hotfix/title-missingArthur2016-07-232-15/+7
| |\ \
| | * | Fixes #600 - Shaarli's title is not set with the new config managerArthurHoaro2016-07-192-15/+7
| | |/
| * | Merge pull request #603 from julienCXX/pr-fix-test-method-nameArthur2016-07-211-2/+2
| |\ \
| | * | Fix typo in test method namejulienCXX2016-07-211-2/+2
| |/ /
| * | Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-varArthur2016-07-102-1/+2
| |\ \ | | |/ | |/|
| | * Fix variable in configure.phpArthurHoaro2016-07-102-1/+2
| |/
| * Merge pull request #558 from ArthurHoaro/hashtag4Arthur2016-07-0910-103/+270
| |\
| | * Hashtag systemArthurHoaro2016-06-0610-104/+271
| * | Merge pull request #570 from ArthurHoaro/config-managerArthur2016-07-0941-1130/+2096
| |\ \
| | * | Add closing PHP tags to JSON config filesArthurHoaro2016-06-204-2/+18
| | * | Pass the configuration manager to templatesArthurHoaro2016-06-151-0/+2
| | * | Rename configuration key for better sectionsArthurHoaro2016-06-1110-167/+173
| | * | PluginManager no longer uses singleton patternArthurHoaro2016-06-119-94/+63