aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove remaining settings initialization in index.phpArthurHoaro2016-06-113-78/+42
| | | | | | | | | | | | Except for those which require external data (timezone and $_SERVER).
| * | Rename configuration keys and fix GLOBALS in templatesArthurHoaro2016-06-1118-323/+350
| | |
| * | Use the configuration manager for wallabag and readityourself pluginArthurHoaro2016-06-114-23/+22
| | |
| * | Set the default timezone in index.phpArthurHoaro2016-06-112-3/+2
| | |
| * | Adds ConfigJson which handle the configuration in JSON format.ArthurHoaro2016-06-1113-25/+462
| | | | | | | | | | | | Also use the Updater to make the transition
| * | Replace $GLOBALS configuration with the configuration manager in the whole ↵ArthurHoaro2016-06-1123-856/+422
| | | | | | | | | | | | code base
| * | Introduce a configuration manager (not plugged yet)ArthurHoaro2016-06-118-0/+872
| | |
| * | Configuration template indentingArthurHoaro2016-06-111-36/+78
| | |
* | | Merge pull request #592 from virtualtam/composer-metadataVirtualTam2016-06-161-3/+9
|\ \ \ | | | | | | | | Update composer metadata
| * | | Update composer metadataVirtualTam2016-06-151-3/+9
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | / Firefox Share: Use selected text as descriptionnodiscc2016-06-121-1/+1
| |/ |/| | | https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Share
* | Merge pull request #582 from ArthurHoaro/hotfix/nomarkdownArthur2016-06-062-5/+20
|\ \ | | | | | | The "nomarkdown" tag is no longer private
| * | The tag is no longer privateArthurHoaro2016-05-302-5/+20
| |/ | | | | | | A private tag is never loaded for visitor, making this feature useless.
* | Merge pull request #583 from ArthurHoaro/enhance/tag-caseArthur2016-06-034-6/+15
|\ \ | | | | | | Fixes #497: ignore case difference between tags
| * | Fixes #497: ignore case difference between tagsArthurHoaro2016-05-314-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-upgradeVirtualTam2016-05-201-0/+1
|\ \ \ | | | | | | | | README: add link to the upgrade and migration wiki page
| * | | README: add link to the upgrade and migration wiki pageVirtualTam2016-05-201-0/+1
|/ / / | | | | | | | | | | | | | | | Relates to #575 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #574 from shaarli/urlparams-phpsessidVirtualTam2016-05-202-0/+2
|\ \ \ | | | | | | | | Url.php: remove unwanted ?PHPSESSID= URL parameters
| * | | Url.php: remove unwanted ?PHPSESSID= URL parameters,nodiscc2016-05-202-0/+2
|/ / / | | | | | | | | | update test case
* | | Merge pull request #568 from ArthurHoaro/masterArthur2016-05-141-1/+1
|\ \ \ | | |/ | |/| PHP endtag in shaarli_version.php
| * | PHP endtag in shaarli_version.phpArthurHoaro2016-05-141-1/+1
|/ /
* | Merge pull request #567 from ArthurHoaro/v0.7.0v0.7.0Arthur2016-05-1447-197/+73
|\ \ | | | | | | V0.7.0
| * | Doc updateArthurHoaro2016-05-1445-194/+70
| | | | | | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
| * | Version bump: v0.7.0ArthurHoaro2016-05-142-3/+3
|/ / | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
* | Merge pull request #560 from ArthurHoaro/nb-private-shaareArthur2016-05-145-138/+177
|\ \ | | | | | | Private links counter in the header
| * | Add private link counterArthurHoaro2016-05-134-15/+30
| | |
| * | Extract PageBuilder class from index.phpArthurHoaro2016-05-132-123/+147
| | |
* | | Merge pull request #556 from ArthurHoaro/login-refillArthur2016-05-142-20/+33
|\ \ \ | | | | | | | | Prefill the login field when the authentication has failed
| * | | Prefill the login field when the authentication has failedArthurHoaro2016-05-062-5/+17
| | | |
| * | | Reindent the login templateArthurHoaro2016-05-061-18/+19
| | | |
* | | | Merge pull request #559 from ArthurHoaro/startsEndWithCaseArthur2016-05-144-23/+35
|\ \ \ \ | | | | | | | | | | Fix startsWith and endsWith case
| * | | | Fix startsWith and endsWith caseArthurHoaro2016-05-104-23/+35
| | |/ / | |/| |
* | | | Merge pull request #566 from ArthurHoaro/md-inline-codeArthur2016-05-131-0/+7
|\ \ \ \ | | | | | | | | | | Markdown: inline code background color
| * | | | Markdown: inline code background colorArthurHoaro2016-05-131-0/+7
| |/ / /
* | | | Merge pull request #562 from ArthurHoaro/hotfix/561Arthur2016-05-131-6/+0
|\ \ \ \ | |/ / / |/| | | Don't redirect to ?post if ?addlink is reached while logged out
| * | | Don't redirect to ?post if ?addlink is reached while logged outArthurHoaro2016-05-111-6/+0
|/ / /
* | | Merge pull request #557 from ArthurHoaro/remove-deliciousArthur2016-05-102-2/+4
|\ \ \ | | | | | | | | Remove delicious from Shaarli description
| * | | Remove delicious from Shaarli descriptionArthurHoaro2016-05-082-2/+4
| |/ /
* | | Merge pull request #554 from virtualtam/fix/bookmark-exportVirtualTam2016-05-064-19/+74
|\ \ \ | |/ / |/| | Export: allow prepending notes with the Shaarli instance's URL
| * | Export: allow prepending notes with the Shaarli instance's URLVirtualTam2016-05-064-19/+74
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #102 Additions: - application: - export: allow prepending note permalinks with the instance's URL - test coverage Modifications: - export template: switch to an HTML form - link selection (all/private/public) - prepend note permalinks with the instance's URL Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #552 from shaarli/readme-doc-pluginsArthur2016-05-051-0/+1
|\ \ | | | | | | add link to plugins doc
| * | add link to plugins docnodiscc2016-05-051-0/+1
| | |
* | | Merge pull request #553 from ArthurHoaro/typoArthur2016-05-053-5/+5
|\ \ \ | | | | | | | | typo
| * | | typoArthurHoaro2016-05-053-5/+5
|/ / /
* | | Merge pull request #551 from ArthurHoaro/hotfix/timezoneArthur2016-05-053-13/+13
|\ \ \ | |/ / |/| | Use correct 'UTC' timezone
| * | Use correct 'UTC' timezoneArthurHoaro2016-05-033-13/+13
| | |
* | | Merge pull request #532 from ArthurHoaro/hotfix/title-retrieve-the-returnArthur2016-05-036-16/+142
|\ \ \ | | | | | | | | Fixes #531 - Title retrieving is failing with multiple use case
| * | | Fixes #531 - Title retrieving is failing with multiple use caseArthurHoaro2016-05-036-16/+142
| | |/ | |/| | | | | | | see https://github.com/shaarli/Shaarli/issues/531 for details
* | | Merge pull request #550 from kalvn/masterArthur2016-05-031-2/+2
|\ \ \ | | | | | | | | Renames Awesomeplete dollar variable to avoid conflicts with jQuery
| * | | Renames Awesomeplete dollar variable to avoid conflicts with jQuerykalvn2016-05-031-2/+2
|/ / /