aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1625 from ArthurHoaro/fix/delete-confirm-popupArthurHoaro2020-11-054-12/+20
|\ | | | | Fix confirm popup before bookmark deletion
| * Fix confirm popup before bookmark deletionArthurHoaro2020-11-054-12/+20
|/ | | | | | Regression introduced by #1596 Fixes #1623
* Merge pull request #1620 from ArthurHoaro/feature/no-auto-linkArthurHoaro2020-11-054-4/+50
|\ | | | | Default formatter: add a setting to disable auto-linkification
| * Default formatter: add a setting to disable auto-linkificationArthurHoaro2020-11-034-4/+50
| | | | | | | | | | | | | | + update documentation + single parameter for both URL and hashtags Fixes #1094
* | Merge pull request #1624 from ArthurHoaro/fix/delete-redirectArthurHoaro2020-11-052-3/+7
|\ \ | | | | | | Fix: redirect to referrer after bookmark deletion
| * | Fix: redirect to referrer after bookmark deletionArthurHoaro2020-11-052-3/+7
| |/ | | | | | | | | | | Except if the referer points to a permalink (which has been deleted). Fixes #1622
* | Merge pull request #1619 from ArthurHoaro/fix/translationsArthurHoaro2020-11-051-39/+41
|\ \ | |/ |/| Fix French translation
| * Fix French translationArthurHoaro2020-11-031-39/+41
|/ | | | | | 2 missing key + 1 wrong translation Fixes #1571
* Merge pull request #1610 from ArthurHoaro/fix/wallabagArthurHoaro2020-11-032-8/+32
|\ | | | | Plugin wallabag: minor improvements
| * Plugin wallabag: minor improvementsArthurHoaro2020-10-272-8/+32
| | | | | | | | | | | | | | | | - hide the wallabag icon for logged out users - set API V2 as default parameter - fix URL encoding issue with special chars Fixes #1147
* | Merge pull request #1618 from ArthurHoaro/fix/ut-daily-date-1-digitArthurHoaro2020-11-022-3/+3
|\ \ | | | | | | UT: fix formatting issue when the current day has a single digit
| * | UT: fix formatting issue when the current day has a single digitArthurHoaro2020-11-022-3/+3
|/ /
* | Merge pull request #1616 from dimtion/fix-api-redirectArthurHoaro2020-10-292-5/+5
|\ \ | | | | | | API postLink: change relative path to absolute path
| * | postLink: change relative path to absolute pathLoïc Carr2020-10-282-5/+5
| | |
* | | Merge pull request #1615 from ArthurHoaro/hotfix/save-redirectArthurHoaro2020-10-281-1/+1
|\ \ \ | | | | | | | | Remove unnecessary escape of referer
| * | | Remove unnecessary escape of refererArthurHoaro2020-10-281-1/+1
| | | | | | | | | | | | | | | | Fixes #1611
* | | | Merge pull request #1614 from ArthurHoaro/hotfix/php71-compat-loginArthurHoaro2020-10-282-3/+6
|\ \ \ \ | |/ / / |/| | | Fix compatiliby issue on login with PHP 7.1
| * | | Fix compatiliby issue on login with PHP 7.1ArthurHoaro2020-10-282-3/+6
| | | | | | | | | | | | | | | | session_set_cookie_params does not return any value in PHP 7.1
* | | | Merge pull request #1613 from ArthurHoaro/hotfix/404-not-authorizedArthurHoaro2020-10-282-3/+3
|\| | | | | | | | | | | Raise 404 error instead of 500 if permalink access is denied
| * | | Raise 404 error instead of 500 if permalink access is deniedArthurHoaro2020-10-282-3/+3
| | | |
* | | | Merge pull request #1612 from ArthurHoaro/hotfix/simplexmlArthurHoaro2020-10-281-0/+1
|\ \ \ \ | | | | | | | | | | Include php-simplexml in Docker image
| * | | | Include php-simplexml in Docker imageArthurHoaro2020-10-281-0/+1
|/ / / / | | | | | | | | | | | | Composer 2.0 is now blocking everything if requirements are not met
* | | | Merge pull request #1587 from ArthurHoaro/feature/batch-bookmark-creationArthurHoaro2020-10-2725-528/+1125
|\| | |
| * | | Bulk creation: ignore blank linesArthurHoaro2020-10-272-1/+5
| | | |
| * | | Bulk creation: displays a progress bar when saving all displayed formsArthurHoaro2020-10-273-4/+50
| | | |
| * | | Bulk creation: improve performances using memoizationArthurHoaro2020-10-271-9/+43
| | | | | | | | | | | | | | | | Reduced additional processing time per links from ~40ms to ~5ms
| * | | Bulk creation: fix private status based on the first formArthurHoaro2020-10-274-4/+16
| | | |
| * | | Feature: bulk creation of bookmarksArthurHoaro2020-10-2725-527/+1028
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes creates a new form in addlink page allowing to create multiple bookmarks at once more easily. It focuses on re-using as much existing code and template component as possible. These changes includes: - a new form in addlink (hidden behind a button by default), containing a text area for URL, and tags/private status to apply to created links - this form displays a new template called editlink.batch, itself including editlink template multiple times - User interation in this new templates are handle by a new JS script (shaare-batch.js) making AJAX requests, and therefore does not need page reloading - ManageShaareController has been split into 3 distinct controllers: + ShaareAdd: displays addlink template + ShaareManage: various operation applied on existing shaares (change visibility, pin, deletion, etc.) + ShaarePublish: handles creation/edit forms and saving Shaare's form - Updated translations Fixes #137
* | | Merge pull request #1595 from ArthurHoaro/feature/daily-periodArthurHoaro2020-10-2727-333/+1211
|\ \ \
| * | | Fix rebase issueArthurHoaro2020-10-273-3/+4
| | | |
| * | | Feature: add weekly and monthly view/RSS feed for daily pageArthurHoaro2020-10-2711-318/+1190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Heavy refactoring of DailyController - Add a banner like in tag cloud to display monthly and weekly links - Translations: t() now supports variables with optional first letter uppercase Fixes #160
| * | | Move utils classes to Shaarli\Helper namespace and folderArthurHoaro2020-10-2715-12/+17
|/ / /
* | | Merge pull request #1597 from ArthurHoaro/feature/share-private-bookmarkArthurHoaro2020-10-2710-23/+268
|\ \ \ | | | | | | | | Feature: Share private bookmarks using a URL containing a private key
| * | | Feature: Share private bookmarks using a URL containing a private keyArthurHoaro2020-10-2710-23/+268
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a share link next to « Permalink » in linklist (using share icon from fork awesome) - This link generates a private key associated to the bookmark - Accessing the bookmark while logged out with the proper key will display it Fixes #475
* | | Merge pull request #1604 from ArthurHoaro/feature/server-admin-pageArthurHoaro2020-10-2716-105/+1087
|\ \ \ | | | | | | | | Feature: add a Server administration page
| * | | Feature: add a Server administration pageArthurHoaro2020-10-2116-105/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains mostly read only information about the current Shaarli instance, PHP version, extensions, file and folder permissions, etc. Also action buttons to clear the cache or sync thumbnails. Part of the content of this page is also displayed on the install page, to check server requirement before installing Shaarli config file. Fixes #40 Fixes #185
* | | | Merge pull request #1609 from GaneshKandu/patch-1ArthurHoaro2020-10-271-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Removed PHP_EOLGanesh Kandu2020-10-271-3/+3
| | | | | | | | | | | | just replace "*/ ?>" and "<?php /*" with '' and "Trim" output whatever is EOF will trimmed out.
| * | | Replaced PHP_EOL to "\n"Ganesh Kandu2020-10-271-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i was getting error ``` An error occurred while parsing JSON configuration file (data/config.json.php): error code #4 ➜ Syntax error Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as jsonlint.com. ``` after debug i found ```php $data = str_replace(self::getPhpHeaders(), '', $data); $data = str_replace(self::getPhpSuffix(), '', $data); ``` doesn't removing php header and php suffix cause of this issue was PHP_EOL represents the endline character for the current system. if my ```config.json.php``` was encoded with unix ( LF ) and php running on windows windows encoding ( CR LF ) is not same as unix encoding ( LF ) so ```str_replace``` doesn't replace strin then it causes issue.
* | | Merge pull request #1601 from ArthurHoaro/feature/psr3ArthurHoaro2020-10-2417-125/+172
|\ \ \
| * | | Use PSR-3 logger for login attemptsArthurHoaro2020-10-2015-124/+170
| | | | | | | | | | | | | | | | Fixes #1122
| * | | Composer: explicitly import katzgrau/klogger (already included in ↵ArthurHoaro2020-10-202-1/+2
| |/ / | | | | | | | | | netscape-bookmark-parser)
* | | Merge pull request #1605 from ArthurHoaro/fix/nginx-doc-ruleArthurHoaro2020-10-212-1/+11
|\ \ \ | | | | | | | | Fix: nginx - add rule to disable url-rewriting for the docs
| * | | Fix: nginx - add rule to disable url-rewriting for the docsArthurHoaro2020-10-212-1/+11
| |/ / | | | | | | | | | Related to #1603
* | | Merge pull request #1602 from ArthurHoaro/fix/root-exceptionsArthurHoaro2020-10-203-7/+19
|\ \ \ | |/ / |/| | Dislay an error if an exception occurs in the error handler
| * | Dislay an error if an exception occurs in the error handlerArthurHoaro2020-10-203-7/+19
|/ / | | | | | | Related to #1598
* | Merge pull request #1584 from ArthurHoaro/feature/async-thumbnail-retrievalArthurHoaro2020-10-2010-42/+279
|\ \ | | | | | | Asynchronous retrieval of bookmark's thumbnails
| * | Asynchronous retrieval of bookmark's thumbnailsArthurHoaro2020-10-2010-42/+279
|/ / | | | | | | | | | | | | | | | | This feature is based general.enable_async_metadata setting and works with existing metadata.js file. The script is compatible with any template: - the thumbnail div bloc must have attribute - the bookmark bloc must have attribute with the bookmark ID as value Fixes #1564
* | Merge pull request #1567 from ArthurHoaro/feature/async-title-retrievalArthurHoaro2020-10-2022-245/+677
|\ \
| * | Improve metadata retrieval (performances and accuracy)ArthurHoaro2020-10-155-177/+237
| | | | | | | | | | | | | | | - Use dedicated function to download headers to avoid apply multiple regexps on headers - Also try to extract title from meta tags
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:32:05 +0000