Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Update method to use the new ID system, which replaces linkdate primary keys. | ArthurHoaro | 2016-12-12 | 1 | -2/+44 |
| | | | | | | | | | | creation and update dates are now DateTime objects. Since this update is very sensitve (changing the whole database), the datastore will be automatically backed up into the file datastore.<datetime>.php. | ||||
| * | Link ID refactoring | ArthurHoaro | 2016-12-12 | 1 | -43/+135 |
| | | | | | | | | | | | | | | | | | | Links now use an incremental unique numeric identifier. This ID is persistent and must never change. ArrayAccess is used to match the link ID with the array keys (see the comment in LinkDB for more details) Key 'created' added, with creation date as a DateTime object. 'updated' is now also a DateTime. | ||||
* | | Merge pull request #679 from ArthurHoaro/plugins/header | Arthur | 2016-12-12 | 10 | -27/+130 |
|\ \ | |/ |/| | Improve theme dependent plugin placeholders: | ||||
| * | Improve theme dependent plugin placeholders: | ArthurHoaro | 2016-12-01 | 10 | -27/+130 |
| | | | | | | | | | | | | | | | | | | - buttons_toolbar: now expect links represented by an array instead of HTML content - fields_toolbar: now expect a form represented by an array instead of HTML content - action_plugin: now expect links represented by an array instead of HTML content Default templates updated accordingly mprove theme dependent plugin placeholders: | ||||
* | | Merge pull request #702 from ArthurHoaro/feed-cdata | Arthur | 2016-12-05 | 1 | -3/+1 |
|\ \ | | | | | | | Remove new line between content tag and CDATA in ATOM feed | ||||
| * | | Remove new line between content tag and CDATA in ATOM feed | ArthurHoaro | 2016-12-02 | 1 | -3/+1 |
| | | | | | | | | | | | | Content not starting directly with CDATA can be misinterpreted by some feed parsers. | ||||
* | | | Merge pull request #703 from ArthurHoaro/changelog | Arthur | 2016-12-05 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | Add latest merged changes to the CHANGELOG | ||||
| * | | | Add latest merged changes to the CHANGELOG | ArthurHoaro | 2016-12-03 | 1 | -0/+11 |
|/ / / | |||||
* | | | Merge pull request #701 from ArthurHoaro/plugins/md-html-doc | Arthur | 2016-12-03 | 4 | -3/+32 |
|\ \ \ | |/ / |/| | | Describe markdown HTML rendering and display a warning | ||||
| * | | Describe markdown HTML rendering and display a warning | ArthurHoaro | 2016-12-01 | 4 | -3/+32 |
| | | | | | | | | | | | | Fixes #688 | ||||
* | | | Merge pull request #691 from ArthurHoaro/plugins/no-md-feed | Arthur | 2016-12-01 | 3 | -18/+59 |
|\ \ \ | | | | | | | | | Markdown: fixes feed rendering with nomarkdown tag | ||||
| * | | | Markdown: fixes feed rendering with nomarkdown tag | ArthurHoaro | 2016-11-22 | 3 | -18/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make sure we match exactly `nomarkdown` tag * pass the whole link data to stripNoMarkdownTag() to: * strip the noMD tag in taglist (array) * strip the tag in tags (string) Fixes #689 tmp | ||||
* | | | | Merge pull request #700 from teromene/firefox-social-title | Arthur | 2016-11-30 | 1 | -15/+17 |
|\ \ \ \ | | | | | | | | | | | Show page title when sharing via Firefox Social. | ||||
| * | | | | Show page title when sharing via Firefox Social. | Teromene | 2016-11-29 | 1 | -15/+17 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #699 from teromene/https-no-social | Arthur | 2016-11-30 | 2 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | Disable Firefox Social in the tools section if the page is not loaded using HTTPS. |