Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #608 from virtualtam/refactor/bookmark-parser | VirtualTam | 2016-07-26 | 3 | -8/+47 | |
|\| | | | | | Reference netscape-bookmark-parser & allow generating custom release archives | |||||
| * | Makefile: generate release archives including 3rd-party libraries | VirtualTam | 2016-07-25 | 2 | -7/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | Relates to #607 Archive creation process (tar, zip): - let Composer resolve functional (no-dev) dependencies - call git-archive to generate a release archive - include 3rd-party dependencies to the generated archive Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
| * | Composer: add shaarli/netscape-bookmark-parser | VirtualTam | 2016-07-23 | 1 | -1/+8 | |
|/ | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/607 Relates to https://github.com/kafene/netscape-bookmark-parser/issues/6 The Shaarli-forked version is checked out as a VCS repository. Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | 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) | |||||
| * | 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 | |||||
| * | | 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 | |||||
| * | | Fixes #600 - Shaarli's title is not set with the new config manager | ArthurHoaro | 2016-07-19 | 2 | -15/+7 | |
| |/ | | | | | | | | | - Fixed title config key - Page title (in head tag) is no longer set through the config manager | |||||
* | | Merge pull request #603 from julienCXX/pr-fix-test-method-name | Arthur | 2016-07-21 | 1 | -2/+2 | |
|\ \ | | | | | | | Fix typo in test method name | |||||
| * | | 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 session_protection_disabled variable in configure.php | |||||
| * | 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 | |
|\ | | | | | Hashtag system | |||||
| * | Hashtag system | ArthurHoaro | 2016-06-06 | 10 | -104/+271 | |
| | | | | | | | | | | | | * Hashtag are auto-linked with a filter search * Supports unicode * Compatible with markdown (excluded in code blocks) | |||||
* | | Merge pull request #570 from ArthurHoaro/config-manager | Arthur | 2016-07-09 | 41 | -1130/+2096 | |
|\ \ | | | | | | | Introduce a configuration manager | |||||
| * | | Add closing PHP tags to JSON config files | ArthurHoaro | 2016-06-20 | 4 | -2/+18 | |
| | | | ||||||
| * | | Pass the configuration manager to templates | ArthurHoaro | 2016-06-15 | 1 | -0/+2 | |
| | | | ||||||
| * | | Rename configuration key for better sections | ArthurHoaro | 2016-06-11 | 10 | -167/+173 | |
| | | | ||||||
| * | | PluginManager no longer uses singleton pattern | ArthurHoaro | 2016-06-11 | 9 | -94/+63 | |
| | | | ||||||
| * | | ConfigManager no longer uses singleton pattern | ArthurHoaro | 2016-06-11 | 9 | -275/+342 | |
| | | | ||||||
| * | | Remove remaining settings initialization in index.php | ArthurHoaro | 2016-06-11 | 3 | -78/+42 | |
| | | | | | | | | | | | | Except for those which require external data (timezone and $_SERVER). | |||||
| * | | Rename configuration keys and fix GLOBALS in templates | ArthurHoaro | 2016-06-11 | 18 | -323/+350 | |
| | | | ||||||
| * | | Use the configuration manager for wallabag and readityourself plugin | ArthurHoaro | 2016-06-11 | 4 | -23/+22 | |
| | | | ||||||
| * | | Set the default timezone in index.php | ArthurHoaro | 2016-06-11 | 2 | -3/+2 | |
| | | | ||||||
| * | | Adds ConfigJson which handle the configuration in JSON format. | ArthurHoaro | 2016-06-11 | 13 | -25/+462 | |
| | | | | | | | | | | | | Also use the Updater to make the transition | |||||
| * | | Replace $GLOBALS configuration with the configuration manager in the whole ↵ | ArthurHoaro | 2016-06-11 | 23 | -856/+422 | |
| | | | | | | | | | | | | code base | |||||
| * | | Introduce a configuration manager (not plugged yet) | ArthurHoaro | 2016-06-11 | 8 | -0/+872 | |
| | | | ||||||
| * | | Configuration template indenting | ArthurHoaro | 2016-06-11 | 1 | -36/+78 | |
| | | | ||||||
* | | | Merge pull request #592 from virtualtam/composer-metadata | VirtualTam | 2016-06-16 | 1 | -3/+9 | |
|\ \ \ | | | | | | | | | Update composer metadata | |||||
| * | | | Update composer metadata | VirtualTam | 2016-06-15 | 1 | -3/+9 | |
|/ / / | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | / | Firefox Share: Use selected text as description | nodiscc | 2016-06-12 | 1 | -1/+1 | |
| |/ |/| | | | https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Share | |||||
* | | Merge pull request #582 from ArthurHoaro/hotfix/nomarkdown | Arthur | 2016-06-06 | 2 | -5/+20 | |
|\ \ | | | | | | | The "nomarkdown" tag is no longer private | |||||
| * | | The tag is no longer private | ArthurHoaro | 2016-05-30 | 2 | -5/+20 | |
| |/ | | | | | | | A private tag is never loaded for visitor, making this feature useless. | |||||
* | | Merge pull request #583 from ArthurHoaro/enhance/tag-case | Arthur | 2016-06-03 | 4 | -6/+15 | |
|\ \ | | | | | | | Fixes #497: ignore case difference between tags | |||||
| * | | Fixes #497: ignore case difference between tags | ArthurHoaro | 2016-05-31 | 4 | -6/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | While retrieving all tags, case differences will be ignored. This affects: * tag cloud * tag autocompletion | |||||
* | | | Merge pull request #576 from virtualtam/readme/link-upgrade | VirtualTam | 2016-05-20 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | README: add link to the upgrade and migration wiki page | |||||
| * | | | README: add link to the upgrade and migration wiki page | VirtualTam | 2016-05-20 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | | | | | | | Relates to #575 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* | | | Merge pull request #574 from shaarli/urlparams-phpsessid | VirtualTam | 2016-05-20 | 2 | -0/+2 | |
|\ \ \ | | | | | | | | | Url.php: remove unwanted ?PHPSESSID= URL parameters | |||||
| * | | | Url.php: remove unwanted ?PHPSESSID= URL parameters, | nodiscc | 2016-05-20 | 2 | -0/+2 | |
|/ / / | | | | | | | | | | update test case | |||||
* | | | Merge pull request #568 from ArthurHoaro/master | Arthur | 2016-05-14 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | PHP endtag in shaarli_version.php | |||||
| * | | PHP endtag in shaarli_version.php | ArthurHoaro | 2016-05-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #567 from ArthurHoaro/v0.7.0v0.7.0 | Arthur | 2016-05-14 | 47 | -197/+73 | |
|\ \ | | | | | | | V0.7.0 | |||||
| * | | Doc update | ArthurHoaro | 2016-05-14 | 45 | -194/+70 | |
| | | | | | | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | |||||
| * | | Version bump: v0.7.0 | ArthurHoaro | 2016-05-14 | 2 | -3/+3 | |
|/ / | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | |||||
* | | Merge pull request #560 from ArthurHoaro/nb-private-shaare | Arthur | 2016-05-14 | 5 | -138/+177 | |
|\ \ | | | | | | | Private links counter in the header | |||||
| * | | Add private link counter | ArthurHoaro | 2016-05-13 | 4 | -15/+30 | |
| | | | ||||||
| * | | Extract PageBuilder class from index.php | ArthurHoaro | 2016-05-13 | 2 | -123/+147 | |
| | | | ||||||
* | | | Merge pull request #556 from ArthurHoaro/login-refill | Arthur | 2016-05-14 | 2 | -20/+33 | |
|\ \ \ | | | | | | | | | Prefill the login field when the authentication has failed | |||||
| * | | | Prefill the login field when the authentication has failed | ArthurHoaro | 2016-05-06 | 2 | -5/+17 | |
| | | | |