Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fold/Expand shaares | ArthurHoaro | 2016-08-07 | 2 | -0/+53 |
| | |||||
* | Linklist template | ArthurHoaro | 2016-08-07 | 3 | -75/+270 |
| | |||||
* | Linklist paging | ArthurHoaro | 2016-08-07 | 3 | -26/+135 |
| | |||||
* | Desktop search fields | ArthurHoaro | 2016-08-07 | 8 | -26/+57 |
| | |||||
* | Shaarli header template | ArthurHoaro | 2016-08-07 | 3 | -96/+144 |
| | |||||
* | Shaarli header template | ArthurHoaro | 2016-08-07 | 1 | -0/+0 |
| | |||||
* | Work on the menu | ArthurHoaro | 2016-08-07 | 13 | -1/+2807 |
| | |||||
* | Initialize default template with Pure CSS and Font Awesome | ArthurHoaro | 2016-08-07 | 13 | -0/+2773 |
| | |||||
* | 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 | ||||
| * | 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 | ||||
| * | Initialize a translation function | ArthurHoaro | 2016-08-07 | 3 | -0/+63 |
|/ | | | | It matches the API of ngettext(). | ||||
* | Merge pull request #625 from ArthurHoaro/token | VirtualTam | 2016-08-07 | 2 | -9/+1 |
|\ | | | | | Generate a token for every pages | ||||
| * | 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 | ||||
| * | 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 | ||||
| * | Fix update method escapeUnescapedConfig | ArthurHoaro | 2016-08-02 | 2 | -2/+26 |
| | | | | | | | | | | | | | | * Actually run it * unit tests Fixes #611 | ||||
* | | Merge pull request #618 from ArthurHoaro/tagclean | VirtualTam | 2016-08-02 | 3 | -3/+7 |
|\ \ | |/ |/| | Better whitespace handling in tags | ||||
| * | Better whitespace handling in tags | ArthurHoaro | 2016-08-02 | 3 | -28/+6 |
| | | | | | | | | | | | | Correct PR #573 to work properly with hidden tags, and add ReferenceLinkDB UT. Fixes #571 - Closes #573 | ||||
| * | 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 |
|\ | | | | | 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 |
| | | |