aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #939 from ArthurHoaro/hotfix/firefox-social-titleArthurHoaro2017-09-024-4/+69
|\ | | | | Firefox Social title: Use document.title instead of RainTPL variable
| * Firefox Social title: Use document.title instead of RainTPL variableArthurHoaro2017-09-021-1/+2
| | | | | | | | Fixes #929
| * Make work behind a reverse proxyArthurHoaro2017-09-023-3/+67
| | | | | | | | Without HTTP_X_FORWARDED_PORT check, might be set to false even though the user is using HTTPS, thus disabling Firefox Social block display
* | Merge pull request #956 from virtualtam/fix/make-authorsVirtualTam2017-09-022-10/+10
|\ \ | | | | | | Documentation+Makefile: update AUTHORS generation
| * | Documentation+Makefile: update AUTHORS generationVirtualTam2017-08-292-10/+10
| | | | | | | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/935 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #950 from thewilli/delete-fixArthurHoaro2017-09-012-6/+13
|\ \ \ | | | | | | | | fixed link deletion
| * | | fixed link deletionWilli Eggeling2017-08-302-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting links, the js of the default theme separated ids by an escaped space ('+'). There was a trailing '+' after the ids which led to the php code detecting multiple values even for single values. In combination with the id '0' this could led to no id found at all and a resulting php error. this commit fixes the behavior and adds an additional error handling and trimming to the php code.
* | | | Merge pull request #951 from thewilli/fix-dailyArthurHoaro2017-09-011-23/+31
|\ \ \ \ | |_|/ / |/| | | fixed daily links if there are no links
| * | | fixed daily links if there are no linksWilli Eggeling2017-08-301-23/+31
| |/ / | | | | | | | | | | | | | | | - the previous code tried to use links from a previous day if there are no one for the current one - the new code skips this part if there are no entries (i.e. days) at all - modified showDaily() to fit PSR-1 and PSR-2
* | | Merge pull request #944 from thewilli/configure-remembermeVirtualTam2017-08-275-3/+13
|\ \ \ | |/ / |/| | new setting: default value for 'remember me' checkbox
| * | new setting: default value for 'remember me' checkboxWilli Eggeling2017-08-275-3/+13
| | | | | | | | | | | | | | | | | | - the default state for the login page's 'remember me' checkbox can now be configured - adapted the default and vintage theme to consider the new setting - added documentation for the new setting
* | | Merge pull request #940 from ArthurHoaro/hotfix/empty-urlsVirtualTam2017-08-271-0/+3
|\ \ \ | | | | | | | | Generates a permalink URL if the URL is set to blank
| * | | Generates a permalinks URL if the URL is set to blankArthurHoaro2017-08-251-0/+3
| | |/ | |/| | | | | | | Fixes #926
* | | Merge pull request #942 from thewilli/fix-wiki-linksVirtualTam2017-08-2710-14/+14
|\ \ \ | | | | | | | | migrated Github wiki links to readthedocs
| * | | migrated Github wiki links to readthedocsWilli Eggeling2017-08-2610-14/+14
| | |/ | |/|
* | | Merge pull request #946 from thewilli/cleanVirtualTam2017-08-272-54/+43
|\ \ \ | |/ / |/| | small code cleanup
| * | code clean: cookie expirationWilli Eggeling2017-08-261-42/+43
| | | | | | | | | | | | | | | | | | - unified code style (spaces around operators) - prevented expiration time to be calculated twice - replaced tabs with spaces
| * | removed doc and code references to magic quotesWilli Eggeling2017-08-262-12/+0
|/ / | | | | | | | | | | - removed all references to magic quotes - magic quotes are not supported on PHP >= 5.4 (https://secure.php.net/manual/en/security.magicquotes.php) - Shaarli does not support PHP < 5.5
* | Merge pull request #938 from ArthurHoaro/hotfix/tagcloud-orderArthurHoaro2017-08-251-1/+1
|\ \ | | | | | | Sort tag cloud in alphabetical order
| * | Sort tag cloud in alphabetical orderArthurHoaro2017-08-251-1/+1
| |/ | | | | | | Fixes #932
* | Merge pull request #934 from thewilli/fix-note-bookmarkletArthurHoaro2017-08-251-1/+1
|\ \ | |/ |/| fixed note bookmarklet
| * fixed note bookmarkletWilli Eggeling2017-08-241-1/+1
|/ | | | - the double quotes used in the alert() call of the note bookmarklet in the default template collided with the ones of the href tag - replaced the double quotes with single ones (just like the link bookmarklet)
* Merge pull request #928 from virtualtam/documentation/v0.9.1VirtualTam2017-08-233-7/+7
|\ | | | | documentation: update installation instructions for 0.9.1
| * documentation: update installation instructions for 0.9.1VirtualTam2017-08-233-7/+7
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #927 from virtualtam/changelogVirtualTam2017-08-232-0/+52
|\ | | | | Update Changelog for 0.9.1
| * Update CHANGELOG.md for 0.9.1VirtualTam2017-08-231-0/+51
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: fix list formattingVirtualTam2017-08-231-0/+1
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #925 from ArthurHoaro/theme/remove-2nd-sort-byArthurHoaro2017-08-191-2/+0
|\ | | | | Remove the 2nd green 'sort by' row in link list
| * Remove the 2nd green 'sort by' row in link listArthurHoaro2017-08-191-2/+0
| | | | | | | | It isn't really useful and doesn't look good if there isn't enough tags
* | Merge pull request #924 from ArthurHoaro/feature/hide-list-searchArthurHoaro2017-08-191-3/+5
|\ \ | | | | | | Hide the search link if no tag has been searched in tag list
| * | Hide the search link if no tag has been searched in tag listArthurHoaro2017-08-191-3/+5
| |/
* | Merge pull request #923 from ArthurHoaro/hotfix/untaggedArthurHoaro2017-08-191-1/+1
|\ \ | |/ |/| Fix untagged only button
| * Fix untagged only buttonArthurHoaro2017-08-191-1/+1
|/
* Merge pull request #920 from virtualtam/documentation/rest-3rdVirtualTam2017-08-082-18/+30
|\ | | | | documentation: update 3rd-party resources
| * documentation: update 3rd-party resourcesVirtualTam2017-08-082-18/+30
|/ | | | | | Relates to https://github.com/shaarli/Shaarli/issues/915 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #918 from Lucas-C/masterVirtualTam2017-08-071-1/+1
|\ | | | | Adding missing empty() as spotted in #889 code review
| * Adding missing empty() as spotted in #889 code reviewLucas Cimon2017-08-061-1/+1
|/
* Merge pull request #917 from virtualtam/documentation/fixes+improvementsVirtualTam2017-08-0630-378/+445
|\ | | | | Documentation fixes, improvements and additions
| * documentation: elaborate on REST API server & client prerequisitesVirtualTam2017-08-052-4/+19
| | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/903 Relates to https://github.com/shaarli/Shaarli/issues/905 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: remove obsolete doc release instructionsVirtualTam2017-08-051-20/+1
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: add links to example REST API clientsVirtualTam2017-08-051-1/+14
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: rewrite the REST API PHP client exampleVirtualTam2017-08-051-20/+37
| | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/905 Relates to https://github.com/shaarli/Shaarli/pull/751 See https://shaarli.github.io/api-documentation/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: update release download and usage informationVirtualTam2017-08-052-6/+4
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: remove duplicate "Coding guidelines" pageVirtualTam2017-08-052-7/+0
| | | | | | | | | | | | The information is already present under "Static analysis" Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * documentation: fix rendering and internal referencesVirtualTam2017-08-0529-323/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly cleanup after switching from Github-flavoured Markdown rendered by Github Pages, to standard Markdown rendered by MkDocs. Changed: - rephrase some section titles Fixed: - list rendering (items, sub-items)) - code rendering - quotes - dead links Removed: - extraneous navigational elements Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #916 from ArthurHoaro/hotfix/fix-composer-php-versionArthurHoaro2017-08-052-94/+119
|\ \ | |/ |/| Fix PHP version configuration in composer.json
| * Fix PHP version configuration in composer.jsonArthurHoaro2017-08-052-94/+119
| | | | | | | | | | Without this setting, composer would download dependencies depending on the PHP version installed on the system. E.G. I was getting doctrine/instantiator 1.1, which requires at least PHP 7.1.
* | Merge pull request #910 from virtualtam/documentation/improvementsVirtualTam2017-08-0571-19938/+10
|\ \ | | | | | | Include generated doc in release archives, remove HTML from SCM
| * | documentation: include generated HTML in release archivesVirtualTam2017-08-021-4/+6
| | | | | | | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/908 Relates to https://github.com/shaarli/Shaarli/pull/772 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: set edit_uriVirtualTam2017-08-021-0/+1
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>