Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | API: fix JWT signature verification | VirtualTam | 2017-01-04 | 4 | -13/+49 |
|/ | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/737 Added: - Base64Url utilities Fixed: - use URL-safe Base64 encoding/decoding functions - use byte representations for HMAC digests - all JWT parts are Base64Url-encoded See: - https://en.wikipedia.org/wiki/JSON_Web_Token - https://tools.ietf.org/html/rfc7519 - https://scotch.io/tutorials/the-anatomy-of-a-json-web-token - https://jwt.io/introduction/ - https://en.wikipedia.org/wiki/Base64#URL_applications - https://secure.php.net/manual/en/function.base64-encode.php#103849 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #682 from ArthurHoaro/delete-button | Arthur | 2017-01-04 | 3 | -9/+15 |
|\ | | | | | Bugfixes on link deletion, and use a GET form | ||||
| * | Bugfixes on link deletion, and use a GET form | ArthurHoaro | 2016-12-16 | 3 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Use a GET form to delete links: harmonize with edit_link and preparation for #585 Bug fixes: * LinkDB element can't be passed as reference, fix error: PHP Notice: Indirect modification of overloaded element of LinkDB has no effect * Resource cache folder setting wasn't set correctly | ||||
* | | Merge pull request #733 from ArthurHoaro/hotfix/reverse-proxy-port | Arthur | 2017-01-04 | 2 | -2/+23 |
|\ \ | | | | | | | Hide default ports in local URL behind a reverse proxy | ||||
| * | | Hide default port in local URL behind a reverse proxy | ArthurHoaro | 2017-01-03 | 2 | -2/+23 |
| | | | |||||
* | | | Merge pull request #736 from virtualtam/url/annoying/campaign | VirtualTam | 2017-01-04 | 2 | -35/+72 |
|\ \ \ | | | | | | | | | URL cleanup: add 'campaign_' to the annoying parameters | ||||
| * | | | URL cleanup: add 'campaign_' to the annoying parameters | VirtualTam | 2017-01-04 | 2 | -35/+72 |
|/ / / | | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/735 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | Merge pull request #731 from virtualtam/fix/api/namespaces | VirtualTam | 2017-01-03 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | API: fix Slim namespaces | ||||
| * | | | API: fix Slim namespaces | VirtualTam | 2017-01-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | | Merge pull request #734 from ArthurHoaro/hotfix/api-install-error | Arthur | 2017-01-03 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | Fix fatal error during the install | ||||
| * | | | Fix fatal error during the install | ArthurHoaro | 2017-01-03 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #719 from ArthurHoaro/feed-opensearch | Arthur | 2017-01-03 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Add opensearch to RSS and ATOM feeds | ||||
| * | | | Add opensearch to RSS and ATOM feeds | ArthurHoaro | 2017-01-03 | 2 | -0/+4 |
| |/ / | | | | | | | | | | Fixes #709 | ||||
* | | | Merge pull request #725 from ArthurHoaro/hotfix/privatetags-split | Arthur | 2017-01-03 | 4 | -5/+30 |
|\ \ \ | |/ / |/| | | Fixes presence of empty tags for private tags and in search results | ||||
| * | | Fixes presence of empty tags for private tags and in search results | ArthurHoaro | 2017-01-03 | 4 | -5/+30 |
|/ / | | | | | | | | | | | | | * Private tags: make sure empty tags are properly filtered * Search results: * Use preg_split instead of function combination * Add normalize_spaces to remove extra whitespaces displaying empty tags search | ||||
* | | Merge pull request #620 from ArthurHoaro/pubsubhub | Arthur | 2016-12-20 | 12 | -45/+193 |
|\ \ | | | | | | | Move Pubsubhub to a default plugin | ||||
| * | | Move PubSubHubbub code as a default plugin | ArthurHoaro | 2016-12-20 | 12 | -38/+183 |
| | | | |||||
| * | | Add plugin placeholders in RSS and ATOM feeds templates | ArthurHoaro | 2016-12-20 | 2 | -9/+12 |
|/ / | |||||
* | | Merge pull request #666 from ArthurHoaro/slim-api | Arthur | 2016-12-20 | 23 | -19/+1126 |
|\ \ | | | | | | | REST API structure using Slim framework | ||||
| * | | REST API structure using Slim framework | ArthurHoaro | 2016-12-15 | 18 | -16/+983 |
| | | | | | | | | | | | | | | | | | | * REST API routes are handle by Slim. * Every API controller go through ApiMiddleware which handles security. * First service implemented `/info`, for tests purpose. | ||||
| * | | PHP requirement increased to PHP 5.5 - See #599 | ArthurHoaro | 2016-12-15 | 3 | -3/+3 |
| | | | |||||
| * | | Prepare settings for the API in the admin page and during the install | ArthurHoaro | 2016-12-12 | 7 | -2/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | API settings: - api.enabled - api.secret The API settings will be initialized (and the secret generated) with an update method. | ||||
* | | | Fix typo in markdown plugin meta description | ArthurHoaro | 2016-12-18 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #714 from ArthurHoaro/hotfix/banlogin | Arthur | 2016-12-16 | 2 | -2/+3 |
|\ \ | | | | | | | Fixes can login function call in loginform.html | ||||
| * | | Fixes can login function call in loginform.html | ArthurHoaro | 2016-12-15 | 2 | -2/+3 |
| |/ | | | | | | | Fixes #711 | ||||
* | | Merge pull request #716 from ArthurHoaro/hotfix/editoldlinks | Arthur | 2016-12-15 | 1 | -1/+3 |
|\ \ | |/ |/| | Fix a regression: permalinks change when old links are edited | ||||
| * | Fix a regression: permalinks change when old links are edited | ArthurHoaro | 2016-12-15 | 1 | -1/+3 |
|/ | | | | fixes #713 | ||||
* | Ignore compressed tar archivehelp | ArthurHoaro | 2016-12-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #708 from ArthurHoaro/v0.8.1v0.8.1 | Arthur | 2016-12-12 | 12 | -36/+198 |
|\ | | | | | Bump version to v0.8.1 | ||||
| * | Bump version to v0.8.1 | ArthurHoaro | 2016-12-12 | 12 | -36/+198 |
|/ | | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro> | ||||
* | Merge pull request #707 from ArthurHoaro/changelog | Arthur | 2016-12-12 | 1 | -1/+10 |
|\ | | | | | changelog: add release date for v0.8.1 and add section v0.9.0 | ||||
| * | changelog: add release date for v0.8.1 and add section v0.9.0 | ArthurHoaro | 2016-12-12 | 1 | -1/+10 |
| | | |||||
* | | Merge pull request #706 from ArthurHoaro/changelog | Arthur | 2016-12-12 | 1 | -4/+13 |
|\| | | | | | changelog update | ||||
| * | changelog update | ArthurHoaro | 2016-12-12 | 1 | -4/+13 |
|/ | |||||
* | Merge pull request #697 from ArthurHoaro/feature/ids-bis | Arthur | 2016-12-12 | 20 | -233/+617 |
|\ | | | | | Link ID refactoring | ||||
| * | Add a persistent 'shorturl' key to all links | ArthurHoaro | 2016-12-12 | 15 | -91/+115 |
| | | | | | | | | | | | | | | All existing link will keep their permalinks. New links will have smallhash generated with date+id. The purpose of this is to avoid collision between links due to their creation date. | ||||
| * | Unit Test for the new ID system | ArthurHoaro | 2016-12-12 | 8 | -95/+306 |
| | | |||||
| * | Apply the new ID system accros the whole codebase | ArthurHoaro | 2016-12-12 | 9 | -85/+100 |
| | |