Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #826 from virtualtam/readme/badges | VirtualTam | 2017-03-21 | 1 | -3/+8 |
|\ | | | | | README: use explicit version badges | ||||
| * | README: use explicit version badges | VirtualTam | 2017-03-19 | 1 | -3/+8 |
| | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/823 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #804 from ArthurHoaro/feature/atom-default | ArthurHoaro | 2017-03-21 | 5 | -4/+66 |
|\ \ | | | | | | | Fixes #304: use atom feed as default | ||||
| * | | Fixes #304: use atom feed as default | ArthurHoaro | 2017-03-11 | 5 | -4/+66 |
| | | | | | | | | | | | | RSS feed is still available with the setting set to false | ||||
* | | | Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing | ArthurHoaro | 2017-03-21 | 3 | -4/+14 |
|\ \ \ | |_|/ |/| | | Proper error if the conf file is invalid instead of fatal error | ||||
| * | | Proper error if the conf file is invalid instead of fatal error | ArthurHoaro | 2017-03-12 | 3 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Error: An error occurred while parsing configuration JSON 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. | ||||
* | | | Merge pull request #815 from ArthurHoaro/theme/display-version | ArthurHoaro | 2017-03-12 | 2 | -1/+6 |
|\ \ \ | |/ / |/| | | Theme: display shaarli version in the footer when logged in | ||||
| * | | Theme: display shaarli version in the footer when logged in | ArthurHoaro | 2017-03-12 | 2 | -1/+6 |
|/ / | | | | | | | Fixes #778 | ||||
* | | Merge pull request #813 from ArthurHoaro/changelog | ArthurHoaro | 2017-03-12 | 1 | -0/+8 |
|\ \ | | | | | | | Update changelog | ||||
| * | | Update changelog | ArthurHoaro | 2017-03-12 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #811 from ArthurHoaro/theme/awesomplete-overflow | ArthurHoaro | 2017-03-12 | 2 | -1/+5 |
|\ \ | | | | | | | Fixes #806: display overflow for awesomplete list | ||||
| * | | Fixes #806: display overflow for awesomplete list | ArthurHoaro | 2017-03-12 | 2 | -1/+5 |
| | | | |||||
* | | | Merge pull request #812 from ArthurHoaro/theme/configure-valign | ArthurHoaro | 2017-03-12 | 2 | -1/+2 |
|\ \ \ | |/ / |/| | | Theme: Vertical align theme select in configure | ||||
| * | | Theme: Vertical align theme select in configure | ArthurHoaro | 2017-03-12 | 2 | -1/+2 |
|/ / | | | | | | | Fixes #807 | ||||
* | | Merge pull request #809 from ArthurHoaro/cleanup/inline-js | ArthurHoaro | 2017-03-12 | 14 | -110/+286 |
|\ \ | | | | | | | Remove inline JS and add LibreJS headers in JS files | ||||
| * | | Remove inline JS and add LibreJS headers in JS files | ArthurHoaro | 2017-03-12 | 14 | -110/+286 |
| | | | | | | | | | | | | | | | Fixes #33 (wow!) Relates to #395 | ||||
* | | | Merge pull request #808 from ArthurHoaro/demo-readme | ArthurHoaro | 2017-03-11 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Shaarli demo moved to shaarli.org | ||||
| * | | Shaarli demo moved to shaarli.org | ArthurHoaro | 2017-03-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #779 from ArthurHoaro/feature/import-parser-logs | ArthurHoaro | 2017-03-11 | 6 | -29/+54 |
|\ \ \ | | | | | | | | | Link imports are now logged in `data/` folder, and can be debug using… | ||||
| * | | | Fix namespace issue | ArthurHoaro | 2017-03-10 | 2 | -0/+2 |
| | | | | |||||
| * | | | Upgrade netscape-bookmark-parser dependency to v2.x | ArthurHoaro | 2017-03-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Link imports are now logged in `data/` folder, and can be debug using ↵ | ArthurHoaro | 2017-03-10 | 5 | -28/+51 |
| |/ / | | | | | | | | | | | | | | | | `dev.debug=true` setting related to #741 and #681 | ||||
* | | | Merge pull request #803 from ArthurHoaro/feature/awesomplete-autofirst | ArthurHoaro | 2017-03-11 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fixes #657: use data-autofirst parameter for awesomeplete | ||||
| * | | | Fixes #657: use data-autofirst parameter for awesomeplete | ArthurHoaro | 2017-03-11 | 2 | -2/+2 |
| |/ / | | | | | | | | | | data-autofirst automatically selects the first item of the list of choice automatically. You just have to press enter to use it. | ||||
* | | | Merge pull request #805 from ArthurHoaro/mobile-logo | ArthurHoaro | 2017-03-11 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fixes #793: display the star logo on mobile instead of home logo | ||||
| * | | Fixes #793: display the star logo on mobile instead of home logo | ArthurHoaro | 2017-03-11 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #799 from ArthurHoaro/plugins/piwik-url | ArthurHoaro | 2017-03-11 | 4 | -16/+80 |
|\ \ | |/ |/| | Fix #773: set Piwik URL protocol | ||||
| * | Fix #773: set Piwik URL protocol | ArthurHoaro | 2017-03-11 | 4 | -16/+80 |
|/ | |||||
* | 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> |