Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix markdown plugin color overriding | ArthurHoaro | 2017-02-27 | 1 | -1/+1 |
| | |||||
* | Improve plugin_admin.js to support multiple ordered rows | ArthurHoaro | 2017-02-27 | 1 | -7/+15 |
| | |||||
* | Introduce the new default Shaarli template | ArthurHoaro | 2017-02-27 | 45 | -0/+8751 |
| | |||||
* | Move default template to vintage folder | ArthurHoaro | 2017-02-27 | 39 | -0/+1 |
| | |||||
* | Merge pull request #783 from Sbgodin/spaceInBookmarklets | ArthurHoaro | 2017-02-24 | 1 | -9/+3 |
|\ | | | | | Removes spaces before bookmarklet's name | ||||
| * | Removes spaces before and after bookmarklet's name | Christophe HENRY | 2017-02-22 | 1 | -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/getLink | ArthurHoaro | 2017-02-19 | 5 | -10/+195 |
|\ | | | | | REST API: implements getLink by ID service | ||||
| * | REST API: implements getLink by ID service | ArthurHoaro | 2017-02-19 | 5 | -10/+195 |
|/ | | | | See http://shaarli.github.io/api-documentation/#links-link-get | ||||
* | Merge pull request #769 from ArthurHoaro/api/getlinks-visibility | ArthurHoaro | 2017-02-13 | 2 | -31/+24 |
|\ | | | | | REST API - getLinks: support the visibility parameter | ||||
| * | REST API - getLinks: support the visibility parameter | ArthurHoaro | 2017-01-17 | 2 | -31/+24 |
| | | |||||
* | | Merge pull request #776 from ArthurHoaro/hotfix/linkdb-update | ArthurHoaro | 2017-02-04 | 1 | -15/+15 |
|\ \ | | | | | | | Fixes #775: LinkDB do not access LinkDB before ID system migration | ||||
| * | | Fixes #775: LinkDB do not access LinkDB before ID system migration | ArthurHoaro | 2017-02-04 | 1 | -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/master | ArthurHoaro | 2017-01-20 | 3 | -2/+8 |
|\ \ | |/ |/| | v0.8.3 version bump in master | ||||
| * | Bump version to v0.8.3 | ArthurHoaro | 2017-01-20 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | ||||
| * | Changelog v0.8.3 | ArthurHoaro | 2017-01-20 | 1 | -0/+6 |
|/ | |||||
* | Merge pull request #768 from ArthurHoaro/feature/get-public-links | ArthurHoaro | 2017-01-17 | 5 | -39/+107 |
|\ | | | | | Update LinkFilter to be able to filter only public links | ||||
| * | Update LinkFilter to be able to filter only public links | ArthurHoaro | 2017-01-16 | 5 | -39/+107 |
| | | | | | | | | | | | | No update regarding the UI or the API for now Fixes #758 | ||||
* | | Merge pull request #767 from ArthurHoaro/feature/delete-tag-redirect | ArthurHoaro | 2017-01-17 | 3 | -3/+3 |
|\ \ | | | | | | | Stay on the changetag page after tag deletion | ||||
| * | | Stay on the changetag page after tag deletion | ArthurHoaro | 2017-01-16 | 3 | -3/+3 |
| |/ | | | | | | | | | | | + fix changetag CSS alignement relates to #756 | ||||
* | | Merge pull request #766 from ArthurHoaro/hotfix/deletion-redirect | ArthurHoaro | 2017-01-17 | 1 | -25/+9 |
|\ \ | | | | | | | Fix redirection after link deletion | ||||
| * | | Fix redirection after link deletion | ArthurHoaro | 2017-01-16 | 1 | -25/+9 |
| |/ | | | | | | | relates to #756 | ||||
* | | Merge pull request #765 from ArthurHoaro/master | ArthurHoaro | 2017-01-16 | 3 | -3/+8 |
|\| | | | | | Cherry-pick version bump from v0.8 branch | ||||
| * | Bump version to v0.8.2 | ArthurHoaro | 2017-01-16 | 2 | -3/+3 |
| | | |||||
| * | v0.8.2 Changelog | ArthurHoaro | 2017-01-16 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #761 from ArthurHoaro/hotfix/referrer-warning | ArthurHoaro | 2017-01-16 | 1 | -3/+13 |
|\ | | | | | Prevent warning if HTTP_REFERER isn't set | ||||
| * | Prevent warning if HTTP_REFERER isn't set | ArthurHoaro | 2017-01-15 | 1 | -3/+13 |
| | | | | | | | | Fixes #723 | ||||
* | | Merge pull request #760 from ArthurHoaro/plugins/addlink-css-404 | ArthurHoaro | 2017-01-16 | 2 | -56/+0 |
|\ \ | | | | | | | Remove CSS call for addlink toolbar plugin | ||||
| * | | Remove CSS call for addlink toolbar plugin | ArthurHoaro | 2017-01-15 | 2 | -56/+0 |
| |/ | | | | | | | Fixes #724 | ||||
* | | Merge pull request #759 from ArthurHoaro/hotfix/dup-tags | ArthurHoaro | 2017-01-16 | 1 | -7/+7 |
|\ \ | | | | | | | Prevent tag duplicate when renaming | ||||
| * | | Prevent tag duplicate when renaming | ArthurHoaro | 2017-01-15 | 1 | -7/+7 |
| |/ | | | | | | | Fixes #757 | ||||
* | | Update Changelog | VirtualTam | 2017-01-16 | 1 | -4/+36 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Bump expected minimal PHP version to 5.5 | VirtualTam | 2017-01-16 | 1 | -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/getlinks | ArthurHoaro | 2017-01-15 | 5 | -0/+576 |
|\ | | | | | REST API: implement getLinks service | ||||
| * | REST API: implement getLinks service | ArthurHoaro | 2017-01-15 | 5 | -0/+576 |
| | | | | | | | | See http://shaarli.github.io/api-documentation/#links-links-collection-get | ||||
* | | Merge pull request #746 from ArthurHoaro/hotfix/delete-button | ArthurHoaro | 2017-01-15 | 2 | -4/+16 |
|\ \ | | | | | | | Fix delete button in editlink | ||||
| * | | Fix delete button in editlink | ArthurHoaro | 2017-01-07 | 2 | -4/+16 |
| | | | | | | | | | | | | This one was forgotten in #682 | ||||
* | | | API: expect JWT in the Authorization header | VirtualTam | 2017-01-15 | 2 | -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/usercss | ArthurHoaro | 2017-01-14 | 2 | -1/+17 |
|\ \ \ | | | | | | | | | Move user.css to data folder | ||||
| * | | | Move user.css to data folder | ArthurHoaro | 2017-01-14 | 2 | -1/+17 |
|/ / / | |||||
* | | | Add an AUTHORS file, simplify COPYING, bump year to 2017 | VirtualTam | 2017-01-07 | 5 | -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 comparisons | VirtualTam | 2017-01-07 | 4 | -4/+6 |
|/ / | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #732 from ArthurHoaro/feature/theme-manager | Arthur | 2017-01-06 | 52 | -16/+215 |
|\ \ | | | | | | | Theme manager: improvements | ||||
| * | | Fix permalink image alignement in daily page | ArthurHoaro | 2017-01-05 | 1 | -0/+4 |
| | | | |||||
| * | | Updater: keep custom theme preference with the new theme setting | ArthurHoaro | 2017-01-05 | 8 | -69/+163 |
| | | | |||||
| * | | Minor improvements regarding #705 (coding style, unit tests, etc.) | ArthurHoaro | 2017-01-05 | 20 | -28/+92 |
| | | | |||||
| * | | Change templates set through administration UI | Knah Tsaeb | 2017-01-05 | 41 | -14/+52 |
| |/ | |||||
* | | Cleanup: explicit method visibility | VirtualTam | 2017-01-05 | 16 | -69/+65 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Cleanup: remove unused variables | VirtualTam | 2017-01-05 | 2 | -5/+1 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | API+Docker: enable nginx URL rewriting | VirtualTam | 2017-01-05 | 3 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/668 Changed: - let nginx rewrite API URLs See: - https://www.slimframework.com/docs/start/web-servers.html - https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #739 from virtualtam/fix/api/jwt-signature | VirtualTam | 2017-01-05 | 4 | -13/+49 |
|\ \ | |/ |/| | API: fix JWT signature verification |