Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #797 from ArthurHoaro/hotfix/font-git | ArthurHoaro | 2017-03-09 | 9 | -653/+2675 |
|\ | | | | | Prevent git from messing with font files | ||||
| * | Prevent git from messing with font files | ArthurHoaro | 2017-03-09 | 9 | -653/+2675 |
| | | | | | | | | This should remove font related errors in browser debig consoles | ||||
* | | Merge pull request #794 from ArthurHoaro/hotfix/namespace | ArthurHoaro | 2017-03-09 | 4 | -34/+45 |
|\ \ | |/ |/| | Move config exception to dedicated classes with proper namespace | ||||
| * | Move config exception to dedicated classes with proper namespace | ArthurHoaro | 2017-03-09 | 4 | -34/+45 |
|/ | |||||
* | Merge pull request #792 from ArthurHoaro/feature/private-filter-visual | ArthurHoaro | 2017-03-09 | 7 | -21/+36 |
|\ | | | | | Display private only filter as search criteria | ||||
| * | Fix blocking namespace issue | ArthurHoaro | 2017-03-08 | 5 | -20/+24 |
| | | |||||
| * | Display private only filter as search parameter | ArthurHoaro | 2017-03-08 | 3 | -1/+12 |
| | | |||||
* | | Merge pull request #791 from ArthurHoaro/feature/ctrl-enter-submit | ArthurHoaro | 2017-03-09 | 2 | -1/+8 |
|\ \ | | | | | | | Submit editlink textarea using CTRL+Enter shortcut | ||||
| * | | Submit editlink textarea using CTRL+Enter shortcut | ArthurHoaro | 2017-03-08 | 2 | -1/+8 |
| |/ | |||||
* | | Merge pull request #796 from virtualtam/changelog | VirtualTam | 2017-03-08 | 1 | -0/+4 |
|\ \ | |/ |/| | Add v0.7.1 to CHANGELOG.md | ||||
| * | Add v0.7.1 to CHANGELOG.md | VirtualTam | 2017-03-08 | 1 | -0/+4 |
|/ | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #790 from ArthurHoaro/feature/intl-dates | ArthurHoaro | 2017-03-07 | 4 | -13/+249 |
|\ | | | | | Fix autoLocale error and cover it with unit tests | ||||
| * | Fix autoLocale error and cover it with unit tests | ArthurHoaro | 2017-03-07 | 4 | -13/+249 |
| | | |||||
* | | Merge pull request #750 from ArthurHoaro/feature/intl-dates | ArthurHoaro | 2017-03-06 | 12 | -23/+246 |
|\| | | | | | Improve datetime display | ||||
| * | Use all_tests target in Travis CI | ArthurHoaro | 2017-03-06 | 1 | -1/+1 |
| | | |||||
| * | Run languages tests using PHPUnit test suites | ArthurHoaro | 2017-03-06 | 4 | -7/+38 |
| | | |||||
| * | Improve datetime display | ArthurHoaro | 2017-03-06 | 8 | -35/+174 |
| | | | | | | | | | | | | | | | | | | | | Use php-intl extension to display datetimes a bit more nicely, depending on the locale. What changes: * the day is no longer displayed * day number and month are ordered according to the locale * the timezone is more readable (UTC+1 instead of CET) | ||||
| * | Improve autoLocale() detection | ArthurHoaro | 2017-03-06 | 2 | -9/+62 |
|/ | | | | | | - Creates arrays_combination function to cover all cases - add the underscore separator in the regex - add `utf8` encoding in addition to `UTF-8` | ||||
* | Merge pull request #788 from virtualtam/application/namespace/config | VirtualTam | 2017-03-04 | 26 | -47/+62 |
|\ | | | | | application: introduce the Shaarli\Config namespace | ||||
| * | application: introduce the Shaarli\Config namespace | VirtualTam | 2017-03-04 | 26 | -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/changelog | VirtualTam | 2017-03-04 | 1 | -7/+18 |
|\ \ | |/ |/| | Update CHANGELOG.md | ||||
| * | Update CHANGELOG.md | VirtualTam | 2017-03-04 | 1 | -7/+18 |
|/ | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #785 from ArthurHoaro/hotfix/markdown-html | VirtualTam | 2017-03-04 | 6 | -27/+181 |
|\ | | | | | Add markdown_escape setting | ||||
| * | Add markdown_escape setting | ArthurHoaro | 2017-02-28 | 6 | -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/webdesign2 | ArthurHoaro | 2017-02-27 | 90 | -1775/+10721 |
|\ | | | | | New default template | ||||
| * | Set the vintage theme by default for the time being | ArthurHoaro | 2017-02-27 | 2 | -0/+54 |
| | | |||||
| * | Multiple minor improvements and bugfixes regarding the new templates: | ArthurHoaro | 2017-02-27 | 8 | -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 fields | ArthurHoaro | 2017-02-27 | 3 | -79/+137 |
| | | |||||
| * | 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 |