Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #506 from kalvn/master | Arthur | 2016-03-01 | 1 | -1/+4 |
|\ | | | | | Avoids populating a markdown empty container if there's no description. | ||||
| * | Avoids populating a markdown empty container if there's no description. | kalvn | 2016-02-28 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #505 from ArthurHoaro/hotfix/multi-reverse-proxy | Arthur | 2016-03-01 | 2 | -2/+25 |
|\ \ | |/ |/| | Fixes #477: support multi reverse proxy with comma syntax | ||||
| * | Fixes #477: support multi reverse proxy with comma syntax | ArthurHoaro | 2016-02-28 | 2 | -2/+25 |
|/ | | | | Going through multiple reverse proxy will store multiple scheme and port in HTTP header separated by a comma. Shaarli will use the first one to generate server_url. | ||||
* | Merge pull request #501 from ArthurHoaro/v0.6.4v0.6.4 | Arthur | 2016-02-28 | 2 | -3/+3 |
|\ | | | | | Bump version to v0.6.4 | ||||
| * | Bump version to v0.6.4 | ArthurHoaro | 2016-02-28 | 2 | -3/+3 |
|/ | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | ||||
* | Merge pull request #500 from ArthurHoaro/plugin-icon-style | Arthur | 2016-02-28 | 5 | -4/+9 |
|\ | | | | | Fixes #411: remove hardcoded plugin icon size | ||||
| * | Fixes #411: remove hardcoded plugin icon size | ArthurHoaro | 2016-02-28 | 5 | -4/+9 |
| | | |||||
* | | Merge pull request #496 from ArthurHoaro/cross-search | Arthur | 2016-02-28 | 6 | -65/+178 |
|\ \ | |/ |/| | Allow crossed search between terms and tags | ||||
| * | Allow crossed search between terms and tags | ArthurHoaro | 2016-02-28 | 6 | -65/+178 |
| | | | | | | | | | | | | | | * Partial fix of #449 * Current use case: search term + click on tag. * LinkFilter now returns all links if no filter is given. * Unit tests. | ||||
* | | Merge pull request #491 from ArthurHoaro/markdown-escape2 | Arthur | 2016-02-25 | 3 | -16/+58 |
|\ \ | | | | | | | Markdown: don't escape content + sanitize sensible tags | ||||
| * | | Markdown: don't escape content + sanitize sensible tags | ArthurHoaro | 2016-02-19 | 3 | -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-3 | Arthur | 2016-02-24 | 2 | -8/+12 |
|\ \ \ | | | | | | | | | Fixes #494: inputs & labels with plugin name | ||||
| * | | | Update shaarli.css | Nicolas Danelon | 2016-02-23 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fixes #494: inputs & labels with plugin name | Nicolas Danelon | 2016-02-23 | 1 | -8/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #492 from ArthurHoaro/locale-sort-fix | Arthur | 2016-02-24 | 2 | -25/+31 |
|\ \ \ | |/ / |/| | | Fixes #481: tag cloud fatal error | ||||
| * | | Fixes #481: tag cloud fatal error | ArthurHoaro | 2016-02-19 | 1 | -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.php | ArthurHoaro | 2016-02-19 | 2 | -21/+26 |
| |/ | |||||
* | | Merge pull request #490 from nicolasdanelon/patch-2 | Arthur | 2016-02-19 | 1 | -0/+29 |
|\ \ | | | | | | | adding styles for code & pre tags | ||||
| * | | adding styles for code & pre tags | Nicolas Danelon | 2016-02-19 | 1 | -0/+29 |
|/ / | |||||
* | | Merge pull request #486 from virtualtam/refactor/datetime | Arthur | 2016-02-18 | 3 | -43/+29 |
|\ \ | | | | | | | cleanup: use DateTime to format dates | ||||
| * | | cleanup: use DateTime to format dates | VirtualTam | 2016-02-17 | 3 | -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-trim | Arthur | 2016-02-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixes #468: don't trim description | ||||
| * | Fixes #468: don't trim description | ArthurHoaro | 2016-02-18 | 1 | -1/+1 |
|/ | | | | | | Spaces at the start of shaares can be intended. Eg: markdown plugin. #468 | ||||
* | Merge pull request #455 from ArthurHoaro/improved-search-454 | Arthur | 2016-02-15 | 4 | -46/+138 |
|\ | | | | | Improved search: combine AND, exact terms and exclude search. | ||||
| * | Support text search across link fields. | ArthurHoaro | 2016-02-15 | 4 | -35/+73 |
| | | |||||
| * | Improved search: combine AND, exact terms and exclude search. | ArthurHoaro | 2016-02-15 | 4 | -29/+83 |
|/ | |||||
* | Merge pull request #461 from ArthurHoaro/tagcloud-sort | Arthur | 2016-02-15 | 1 | -3/+17 |
|\ | | | | | Fixes #456: Tag cloud does not sort tags (fully) alphabetically | ||||
| * | Fixes #456: Tag cloud does not sort tags (fully) alphabetically | ArthurHoaro | 2016-02-05 | 1 | -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-tags | Arthur | 2016-02-15 | 4 | -2/+27 |
|\ \ | | | | | | | Private/Hidden tags | ||||
| * | | Private/Hidden tags | ArthurHoaro | 2016-02-15 | 4 | -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-exclude | Arthur | 2016-02-15 | 8 | -12/+79 |
|\ \ | | | | | | | Add exclusion in tag search | ||||
| * | | Remove first '-' char when saving tags | ArthurHoaro | 2016-02-15 | 1 | -0/+2 |
| | | | |||||
| * | | Add exclusion in tag search | ArthurHoaro | 2016-02-15 | 7 | -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-url | Arthur | 2016-02-15 | 1 | -1/+1 |
|\ \ | | | | | | | Fixes typo in plugin admin redirection URL | ||||
| * | | Fixes typo in plugin admin redirection URL | ArthurHoaro | 2016-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #460 from ArthurHoaro/440-editlink-404 | Arthur | 2016-02-15 | 1 | -13/+34 |
|\ \ \ | | | | | | | | | Fixes #440 - 404 error after editing a link | ||||
| * | | | Fixes #440 - 404 error after editing a link | ArthurHoaro | 2016-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Remove unnecessary escape(). | ||||
| * | | | Code cleanup: index.php - save_edit | ArthurHoaro | 2016-02-04 | 1 | -12/+33 |
| | |/ | |/| | |||||
* | | | Merge pull request #442 from ArthurHoaro/updater | Arthur | 2016-02-15 | 8 | -86/+550 |
|\ \ \ | |_|/ |/| | | Introduce the Updater class which | ||||
| * | | Introduce the Updater class which | ArthurHoaro | 2016-02-15 | 8 | -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-order | Arthur | 2016-02-11 | 1 | -1/+1 |
|\ \ | | | | | | | Common hooks: process includes before header/footer | ||||
| * | | Common hooks: process includes before header/footer | ArthurHoaro | 2016-02-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #472 from ArthurHoaro/wallabag-version-parameter | Arthur | 2016-02-10 | 1 | -1/+1 |
|\ \ | | | | | | | Wallabag plugin: add version parameter in the meta file | ||||
| * | | Wallabag plugin: add version parameter in the meta file | ArthurHoaro | 2016-02-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #458 from ArthurHoaro/plugins-init-parameters | Arthur | 2016-02-04 | 1 | -1/+2 |
|\ \ | | | | | | | Initialize plugin parameters array to avoid unnecessary warning. | ||||
| * | | Initialize plugin parameters array to avoid unnecessary warning. | ArthurHoaro | 2016-02-02 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #457 from ArthurHoaro/updatecheck-warning | Arthur | 2016-02-04 | 1 | -0/+3 |
|\ \ | |/ |/| | Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning | ||||
| * | Add a default value to ENABLE_UPDATECHECK to avoid unnecessary warning. | ArthurHoaro | 2016-02-02 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #453 from ArthurHoaro/pr450 | Arthur | 2016-02-01 | 2 | -14/+48 |
|\ | | | | | Implemented a little more sophisticated searching (squashed) |