aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #491 from ArthurHoaro/markdown-escape2Arthur2016-02-253-16/+58
|\ | | | | Markdown: don't escape content + sanitize sensible tags
| * Markdown: don't escape content + sanitize sensible tagsArthurHoaro2016-02-193-16/+58
| | | | | | | | Instead of trying to fix broken content for Markdown parsing, parse it unescaped, then sanatize sensible tags such as scripts, etc.
* | Merge pull request #495 from nicolasdanelon/patch-3Arthur2016-02-242-8/+12
|\ \ | | | | | | Fixes #494: inputs & labels with plugin name
| * | Update shaarli.cssNicolas Danelon2016-02-231-0/+4
| | |
| * | Fixes #494: inputs & labels with plugin nameNicolas Danelon2016-02-231-8/+8
| | |
* | | Merge pull request #492 from ArthurHoaro/locale-sort-fixArthur2016-02-242-25/+31
|\ \ \ | |/ / |/| | Fixes #481: tag cloud fatal error
| * | Fixes #481: tag cloud fatal errorArthurHoaro2016-02-191-4/+5
| | | | | | | | | | | | Only send LC_COLLATE to Collator and check that no error occured.
| * | Apply the locale to all categories and move autolocale to Utils.phpArthurHoaro2016-02-192-21/+26
| |/
* | Merge pull request #490 from nicolasdanelon/patch-2Arthur2016-02-191-0/+29
|\ \ | | | | | | adding styles for code & pre tags
| * | adding styles for code & pre tagsNicolas Danelon2016-02-191-0/+29
|/ /
* | Merge pull request #486 from virtualtam/refactor/datetimeArthur2016-02-183-43/+29
|\ \ | | | | | | cleanup: use DateTime to format dates
| * | cleanup: use DateTime to format datesVirtualTam2016-02-173-43/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #270 Modifications: - replace custom date parsing by DateTime calls - use proper date formatting for RSS feeds Deletions: - linkdate2timestamp() - linkdate2rfc822 - linkdate2iso8601 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #470 from ArthurHoaro/description-trimArthur2016-02-181-1/+1
|\ \ | |/ |/| Fixes #468: don't trim description
| * Fixes #468: don't trim descriptionArthurHoaro2016-02-181-1/+1
|/ | | | | | Spaces at the start of shaares can be intended. Eg: markdown plugin. #468
* Merge pull request #455 from ArthurHoaro/improved-search-454Arthur2016-02-154-46/+138
|\ | | | | Improved search: combine AND, exact terms and exclude search.
| * Support text search across link fields.ArthurHoaro2016-02-154-35/+73
| |
| * Improved search: combine AND, exact terms and exclude search.ArthurHoaro2016-02-154-29/+83
|/
* Merge pull request #461 from ArthurHoaro/tagcloud-sortArthur2016-02-151-3/+17
|\ | | | | Fixes #456: Tag cloud does not sort tags (fully) alphabetically
| * Fixes #456: Tag cloud does not sort tags (fully) alphabeticallyArthurHoaro2016-02-051-3/+17
| | | | | | | | | | | | | | * Use Collator class to sort tags using the locale (in PECL intl, included in most PHP installation). * Use strcasecmp if Collator is not found. Both sorts are case insensitive.
* | Merge pull request #447 from ArthurHoaro/hidden-tagsArthur2016-02-154-2/+27
|\ \ | | | | | | Private/Hidden tags
| * | Private/Hidden tagsArthurHoaro2016-02-154-2/+27
|/ / | | | | | | | | | | | | Tags starting with a dot '.' are now private. They can only be seen and searched when logged in. Fixes #315
* | Merge pull request #446 from ArthurHoaro/search-tag-excludeArthur2016-02-158-12/+79
|\ \ | | | | | | Add exclusion in tag search
| * | Remove first '-' char when saving tagsArthurHoaro2016-02-151-0/+2
| | |
| * | Add exclusion in tag searchArthurHoaro2016-02-157-12/+77
|/ / | | | | | | | | | | | | | | | | | | | | * Searching '-mytag' will now exlude all shaares with 'mytag' tag. * All tags starting with a '-' are renamed without it (through the Updater). * Unit tests. Minor code changes: * LinkDB->filter() can now take no parameters (get all link depending on logged status). * tagsStrToArray() is now static and filters blank tags.
* | Merge pull request #479 from ArthurHoaro/pluginsadmin-error-urlArthur2016-02-151-1/+1
|\ \ | | | | | | Fixes typo in plugin admin redirection URL
| * | Fixes typo in plugin admin redirection URLArthurHoaro2016-02-151-1/+1
| | |
* | | Merge pull request #460 from ArthurHoaro/440-editlink-404Arthur2016-02-151-13/+34
|\ \ \ | | | | | | | | Fixes #440 - 404 error after editing a link
| * | | Fixes #440 - 404 error after editing a linkArthurHoaro2016-02-041-1/+1
| | | | | | | | | | | | | | | | Remove unnecessary escape().
| * | | Code cleanup: index.php - save_editArthurHoaro2016-02-041-12/+33
| | |/ | |/|
* | | Merge pull request #442 from ArthurHoaro/updaterArthur2016-02-158-86/+550
|\ \ \ | |_|/ |/| | Introduce the Updater class which
| * | Introduce the Updater class whichArthurHoaro2016-02-158-86/+550
| |/ | | | | | | | | | | | | * contains methods designed to be run once. * is able to upgrade the datastore or the configuration. * is based on methods names, stored in a text file with ';' separator (updates.txt). * begins with existing function 'mergeDeprecatedConfigFile()' (options.php).
* | Merge pull request #473 from ArthurHoaro/commonhook-orderArthur2016-02-111-1/+1
|\ \ | | | | | | Common hooks: process includes before header/footer
| * | Common hooks: process includes before header/footerArthurHoaro2016-02-101-1/+1
|/ /
* | Merge pull request #472 from ArthurHoaro/wallabag-version-parameterArthur2016-02-101-1/+1
|\ \ | | | | | | Wallabag plugin: add version parameter in the meta file
| * | Wallabag plugin: add version parameter in the meta fileArthurHoaro2016-02-101-1/+1
|/ /
* | Merge pull request #458 from ArthurHoaro/plugins-init-parametersArthur2016-02-041-1/+2
|\ \ | | | | | | Initialize plugin parameters array to avoid unnecessary warning.
| * | Initialize plugin parameters array to avoid unnecessary warning.ArthurHoaro2016-02-021-1/+2
| |/
* | Merge pull request #457 from ArthurHoaro/updatecheck-warningArthur2016-02-041-0/+3
|\ \ | |/ |/| Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning
| * Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning.ArthurHoaro2016-02-021-0/+3
|/
* Merge pull request #453 from ArthurHoaro/pr450Arthur2016-02-012-14/+48
|\ | | | | Implemented a little more sophisticated searching (squashed)
| * Implemented searching for a phrase in double-quotes or all words in no ↵Florian Voigt2016-02-012-14/+48
| | | | | | | | | | | | particular order. + unit tests
* | Merge pull request #452 from ArthurHoaro/v0.6.3v0.6.3Arthur2016-01-312-3/+3
|\ \ | | | | | | Bump version to v0.6.3
| * | Bump version to v0.6.3ArthurHoaro2016-01-312-3/+3
|/ /
* | Merge pull request #451 from ArthurHoaro/markdown-gitdiffArthur2016-01-313-57/+57
|\ \ | | | | | | Fixes forced git changes
| * | Fixes forced git changesArthurHoaro2016-01-313-57/+57
|/ / | | | | | | Probably related to the introduction of .gitattribute with forced line ending.
* | Merge pull request #388 from ArthurHoaro/pluginadminArthur2016-01-3120-7/+636
|\ \ | | | | | | Fixes #378 - Plugin administration UI.
| * | Fixes #378 - Plugin administration UI.ArthurHoaro2016-01-3120-7/+636
| | |
* | | Merge pull request #379 from ArthurHoaro/plugin-markdownArthur2016-01-3110-9/+1996
|\ \ \ | |/ / |/| | PLUGIN Markdown
| * | PLUGIN MarkdownArthurHoaro2016-01-0310-9/+1996
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse link description in Markdown (HTML) before rendering. * hard remove of Shaarli's HTML before parsing. * Using Parsedown <https://github.com/erusev/parsedown> PHP lib. * Includes basic markdown CSS. * Style: removed 400px height max limit for shaares. * Unit tests.
* | | Merge pull request #448 from shaarli/whitespaceArthur2016-01-311-1/+1
|\ \ \ | |_|/ |/| | remove whitespace