aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / /
* | | Merge pull request #539 from daniellowtw/bugfix/array_filter-messes-with-keysArthur2016-04-141-1/+1
|\ \ \ | | | | | | | | Fix error when filtering search tags
| * | | Fix error when filtering search tagsD Low2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arrays are key-value maps. We should reindex the array after a filter since we are using the key and count to do array access in filterTags. An example would be searching for "foo, bar", after the array filter, our array is actually (0 -> foo, 2 -> bar) which will cause an error when trying to access $searchtags[1].
* | | | Merge pull request #540 from ArthurHoaro/doc/update20160414Arthur2016-04-1461-626/+3433
|\ \ \ \ | |/ / / |/| | | Update docs from Wiki
| * | | Update docs from WikiArthurHoaro2016-04-1461-626/+3433
|/ / /
* | | Merge pull request #538 from virtualtam/fix/bookmark-exportVirtualTam2016-04-125-42/+202
|\ \ \ | | | | | | | | Refactor Netscape bookmark exporting
| * | | Refactor Netscape bookmark exportingVirtualTam2016-04-105-42/+202
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/netscape-bookmark-parser/issues/5 Fixes: - respect the Netscape bookmark format "specification" Modifications: - [application] introduce the NetscapeBookmarkUtils class - [template] export - improve formatting, rename export selection parameter - [template] export.bookmarks - template for Netscape exports - [tests] bookmark filtering, additional field generation Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #537 from virtualtam/tests/dependenciesVirtualTam2016-04-101-1/+1
|\ \ \ | |_|/ |/| | Tests: update PHPUnit to 4.8.x
| * | Tests: update PHPUnit to 4.8.xVirtualTam2016-04-101-1/+1
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #524 from ArthurHoaro/hotfix/redirectorurlArthur2016-04-093-25/+47
|\ \ | | | | | | Fixes #480: add an option to urlencode redirector URL
| * | Fixes #480: add an option to urlencode redirector URLArthurHoaro2016-04-093-25/+47
|/ / | | | | | | | | | | | | | | * New config: `$GLOBALS['config']['REDIRECTOR_URLENCODE']` (default `true`). * Parameter added to LinkDB constructor. * Fixes a bug with urlencode and escaped url. * In `index.php`, LinkDB is now instanciate once for `importFile()` and `showDaily()`. * TU
* | Merge pull request #525 from ArthurHoaro/plugins/feeds-markdown2Arthur2016-04-091-0/+19
|\ \ | | | | | | Process feeds content with Markdown
| * | Process feeds content with MarkdownArthurHoaro2016-03-261-0/+19
| | |
* | | Merge pull request #527 from ArthurHoaro/hotfix/tagcloud-sizeArthur2016-04-092-7/+12
|\ \ \ | |_|/ |/| | Fixes #526: bad font size separator in tagcloud with some locale
| * | Fixes #526: bad font size separator in tagcloud with some localeArthurHoaro2016-03-312-7/+12
| |/ | | | | | | | | * Force the number format with number_format(). * Reduce the size deciment number to 2.
* | Merge pull request #522 from ArthurHoaro/hotfix/readershaareVirtualTam2016-03-302-1/+38
|\ \ | |/ |/| Refactor and rebase #380: Firefox reader view links
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:49:47 +0000