aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * application: introduce the Shaarli\Config namespaceVirtualTam2017-03-0426-47/+62
| | | | | | | | | | | | | | | | | | | | | | Namespaces have been introduced with the REST API, and should be generalized to the whole codebase to manage object scope and benefit from autoloading. See: - https://secure.php.net/manual/en/language.namespaces.php - http://www.php-fig.org/psr/psr-4/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #789 from virtualtam/changelogVirtualTam2017-03-041-7/+18
|\ \ | |/ |/| Update CHANGELOG.md
| * Update CHANGELOG.mdVirtualTam2017-03-041-7/+18
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #785 from ArthurHoaro/hotfix/markdown-htmlVirtualTam2017-03-046-27/+181
|\ | | | | Add markdown_escape setting
| * Add markdown_escape settingArthurHoaro2017-02-286-27/+181
|/ | | | | | | | | | | | | This setting allows to escape HTML in markdown rendering or not. The goal behind it is to avoid XSS issue in shared instances. More info: * the setting is set to true by default * it is set to false for anyone who already have the plugin enabled (avoid breaking existing entries) * improve the HTML sanitization when the setting is set to false - but don't consider it XSS proof * mention the setting in the plugin README
* Merge pull request #754 from ArthurHoaro/webdesign2ArthurHoaro2017-02-2790-1775/+10721
|\ | | | | New default template
| * Set the vintage theme by default for the time beingArthurHoaro2017-02-272-0/+54
| |
| * Multiple minor improvements and bugfixes regarding the new templates:ArthurHoaro2017-02-278-42/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add API settings in `configure.html` * Fix textarea autoresize * Load user.css from data folder * Move fold/expand all button to the right and fix an issue with already folded items * Reset datetime display to international datetime * Temporarilly remove JS login panel (need improvement and integration with the plugin system) * Body background is slightly lighter * Fix an issue where thumbnails were hidden by description * Fix an issue where private orange bar wasn't displayed with thumbnails * Remove the gradient bar behind titles * Fix empty bookmarklet name in Firefox
| * Upgrade awesomplete + fix multiple autocompletion fieldsArthurHoaro2017-02-273-79/+137
| |
| * Fix markdown plugin color overridingArthurHoaro2017-02-271-1/+1
| |
| * Improve plugin_admin.js to support multiple ordered rowsArthurHoaro2017-02-271-7/+15
| |
| * Introduce the new default Shaarli templateArthurHoaro2017-02-2745-0/+8751
| |
| * Move default template to vintage folderArthurHoaro2017-02-2739-0/+1
|/
* Merge pull request #783 from Sbgodin/spaceInBookmarkletsArthurHoaro2017-02-241-9/+3
|\ | | | | Removes spaces before bookmarklet's name
| * Removes spaces before and after bookmarklet's nameChristophe HENRY2017-02-221-9/+3
|/ | | | | Carriage returns turns into space in some cases. The name of the bookmarklet, once in the browser bookmarks, is surrounded by spaces.
* Merge pull request #728 from ArthurHoaro/api/getLinkArthurHoaro2017-02-195-10/+195
|\ | | | | REST API: implements getLink by ID service
| * REST API: implements getLink by ID serviceArthurHoaro2017-02-195-10/+195
|/ | | | See http://shaarli.github.io/api-documentation/#links-link-get
* Merge pull request #769 from ArthurHoaro/api/getlinks-visibilityArthurHoaro2017-02-132-31/+24
|\ | | | | REST API - getLinks: support the visibility parameter
| * REST API - getLinks: support the visibility parameterArthurHoaro2017-01-172-31/+24
| |
* | Merge pull request #776 from ArthurHoaro/hotfix/linkdb-updateArthurHoaro2017-02-041-15/+15
|\ \ | | | | | | Fixes #775: LinkDB do not access LinkDB before ID system migration
| * | Fixes #775: LinkDB do not access LinkDB before ID system migrationArthurHoaro2017-02-041-15/+15
|/ / | | | | | | | | | | To access LinkDB items with its ArrayAccess implementation, the IDs must be consistent, which isn't the case before `updateMethodDatastoreIds()` execution. v0.6.4 method `updateMethodRenameDashTags()` was accessing it, so an upgrade <0.6.4 to >0.8.x was failing. This just move the minor update `RenameDashTags` after the IDs update.
* | Merge pull request #771 from ArthurHoaro/masterArthurHoaro2017-01-203-2/+8
|\ \ | |/ |/| v0.8.3 version bump in master
| * Bump version to v0.8.3ArthurHoaro2017-01-202-2/+2
| | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
| * Changelog v0.8.3ArthurHoaro2017-01-201-0/+6
|/
* Merge pull request #768 from ArthurHoaro/feature/get-public-linksArthurHoaro2017-01-175-39/+107
|\ | | | | Update LinkFilter to be able to filter only public links
| * Update LinkFilter to be able to filter only public linksArthurHoaro2017-01-165-39/+107
| | | | | | | | | | | | No update regarding the UI or the API for now Fixes #758
* | Merge pull request #767 from ArthurHoaro/feature/delete-tag-redirectArthurHoaro2017-01-173-3/+3
|\ \ | | | | | | Stay on the changetag page after tag deletion
| * | Stay on the changetag page after tag deletionArthurHoaro2017-01-163-3/+3
| |/ | | | | | | | | | | + fix changetag CSS alignement relates to #756
* | Merge pull request #766 from ArthurHoaro/hotfix/deletion-redirectArthurHoaro2017-01-171-25/+9
|\ \ | | | | | | Fix redirection after link deletion
| * | Fix redirection after link deletionArthurHoaro2017-01-161-25/+9
| |/ | | | | | | relates to #756
* | Merge pull request #765 from ArthurHoaro/masterArthurHoaro2017-01-163-3/+8
|\| | | | | Cherry-pick version bump from v0.8 branch
| * Bump version to v0.8.2ArthurHoaro2017-01-162-3/+3
| |
| * v0.8.2 ChangelogArthurHoaro2017-01-161-0/+5
|/
* Merge pull request #761 from ArthurHoaro/hotfix/referrer-warningArthurHoaro2017-01-161-3/+13
|\ | | | | Prevent warning if HTTP_REFERER isn't set
| * Prevent warning if HTTP_REFERER isn't setArthurHoaro2017-01-151-3/+13
| | | | | | | | Fixes #723
* | Merge pull request #760 from ArthurHoaro/plugins/addlink-css-404ArthurHoaro2017-01-162-56/+0
|\ \ | | | | | | Remove CSS call for addlink toolbar plugin
| * | Remove CSS call for addlink toolbar pluginArthurHoaro2017-01-152-56/+0
| |/ | | | | | | Fixes #724
* | Merge pull request #759 from ArthurHoaro/hotfix/dup-tagsArthurHoaro2017-01-161-7/+7
|\ \ | | | | | | Prevent tag duplicate when renaming
| * | Prevent tag duplicate when renamingArthurHoaro2017-01-151-7/+7
| |/ | | | | | | Fixes #757
* | Update ChangelogVirtualTam2017-01-161-4/+36
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Bump expected minimal PHP version to 5.5VirtualTam2017-01-161-2/+2
|/ | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/599 Relates to db6b09b69ee265a7d775924fcff9c61aaaabf1cb Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #727 from ArthurHoaro/api/getlinksArthurHoaro2017-01-155-0/+576
|\ | | | | REST API: implement getLinks service
| * REST API: implement getLinks serviceArthurHoaro2017-01-155-0/+576
| | | | | | | | See http://shaarli.github.io/api-documentation/#links-links-collection-get
* | Merge pull request #746 from ArthurHoaro/hotfix/delete-buttonArthurHoaro2017-01-152-4/+16
|\ \ | | | | | | Fix delete button in editlink
| * | Fix delete button in editlinkArthurHoaro2017-01-072-4/+16
| | | | | | | | | | | | This one was forgotten in #682
* | | API: expect JWT in the Authorization headerVirtualTam2017-01-152-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/pull/731 Added: - require the presence of the 'Authorization' header Changed: - use the HTTP Bearer Token authorization schema See: - https://jwt.io/introduction/#how-do-json-web-tokens-work- - https://tools.ietf.org/html/rfc6750 - http://security.stackexchange.com/q/108662 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #753 from ArthurHoaro/usercssArthurHoaro2017-01-142-1/+17
|\ \ \ | | | | | | | | Move user.css to data folder
| * | | Move user.css to data folderArthurHoaro2017-01-142-1/+17
|/ / /
* | | Add an AUTHORS file, simplify COPYING, bump year to 2017VirtualTam2017-01-075-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added: - AUTHORS file listing Shaarli contributors - mailmap information to group a Git author's different aliases - Makefile target to list contributors from Git commit data Changed: - Simplify COPYING by using a single "Shaarli Community" entry - Bump year to 2017 See: - man git-shortlog - https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Cleanup: use safe boolean comparisonsVirtualTam2017-01-074-4/+6
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:54:44 +0000