aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #817 from ArthurHoaro/feature/json-conf-parsingArthurHoaro2017-03-213-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 errorArthurHoaro2017-03-123-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-versionArthurHoaro2017-03-122-1/+6
|\ \ | |/ |/| Theme: display shaarli version in the footer when logged in
| * Theme: display shaarli version in the footer when logged inArthurHoaro2017-03-122-1/+6
|/ | | | Fixes #778
* Merge pull request #813 from ArthurHoaro/changelogArthurHoaro2017-03-121-0/+8
|\ | | | | Update changelog
| * Update changelogArthurHoaro2017-03-121-0/+8
|/
* Merge pull request #811 from ArthurHoaro/theme/awesomplete-overflowArthurHoaro2017-03-122-1/+5
|\ | | | | Fixes #806: display overflow for awesomplete list
| * Fixes #806: display overflow for awesomplete listArthurHoaro2017-03-122-1/+5
| |
* | Merge pull request #812 from ArthurHoaro/theme/configure-valignArthurHoaro2017-03-122-1/+2
|\ \ | |/ |/| Theme: Vertical align theme select in configure
| * Theme: Vertical align theme select in configureArthurHoaro2017-03-122-1/+2
|/ | | | Fixes #807
* Merge pull request #809 from ArthurHoaro/cleanup/inline-jsArthurHoaro2017-03-1214-110/+286
|\ | | | | Remove inline JS and add LibreJS headers in JS files
| * Remove inline JS and add LibreJS headers in JS filesArthurHoaro2017-03-1214-110/+286
| | | | | | | | | | Fixes #33 (wow!) Relates to #395
* | Merge pull request #808 from ArthurHoaro/demo-readmeArthurHoaro2017-03-111-1/+1
|\ \ | |/ |/| Shaarli demo moved to shaarli.org
| * Shaarli demo moved to shaarli.orgArthurHoaro2017-03-111-1/+1
| |
* | Merge pull request #779 from ArthurHoaro/feature/import-parser-logsArthurHoaro2017-03-116-29/+54
|\ \ | | | | | | Link imports are now logged in `data/` folder, and can be debug using…
| * | Fix namespace issueArthurHoaro2017-03-102-0/+2
| | |
| * | Upgrade netscape-bookmark-parser dependency to v2.xArthurHoaro2017-03-101-1/+1
| | |
| * | Link imports are now logged in `data/` folder, and can be debug using ↵ArthurHoaro2017-03-105-28/+51
| |/ | | | | | | | | | | `dev.debug=true` setting related to #741 and #681
* | Merge pull request #803 from ArthurHoaro/feature/awesomplete-autofirstArthurHoaro2017-03-112-2/+2
|\ \ | | | | | | Fixes #657: use data-autofirst parameter for awesomeplete
| * | Fixes #657: use data-autofirst parameter for awesomepleteArthurHoaro2017-03-112-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-logoArthurHoaro2017-03-111-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 logoArthurHoaro2017-03-111-1/+1
| |/
* | Merge pull request #799 from ArthurHoaro/plugins/piwik-urlArthurHoaro2017-03-114-16/+80
|\ \ | |/ |/| Fix #773: set Piwik URL protocol
| * Fix #773: set Piwik URL protocolArthurHoaro2017-03-114-16/+80
|/
* Merge pull request #797 from ArthurHoaro/hotfix/font-gitArthurHoaro2017-03-099-653/+2675
|\ | | | | Prevent git from messing with font files
| * Prevent git from messing with font filesArthurHoaro2017-03-099-653/+2675
| | | | | | | | This should remove font related errors in browser debig consoles
* | Merge pull request #794 from ArthurHoaro/hotfix/namespaceArthurHoaro2017-03-094-34/+45
|\ \ | |/ |/| Move config exception to dedicated classes with proper namespace
| * Move config exception to dedicated classes with proper namespaceArthurHoaro2017-03-094-34/+45
|/
* Merge pull request #792 from ArthurHoaro/feature/private-filter-visualArthurHoaro2017-03-097-21/+36
|\ | | | | Display private only filter as search criteria
| * Fix blocking namespace issueArthurHoaro2017-03-085-20/+24
| |
| * Display private only filter as search parameterArthurHoaro2017-03-083-1/+12
| |
* | Merge pull request #791 from ArthurHoaro/feature/ctrl-enter-submitArthurHoaro2017-03-092-1/+8
|\ \ | | | | | | Submit editlink textarea using CTRL+Enter shortcut
| * | Submit editlink textarea using CTRL+Enter shortcutArthurHoaro2017-03-082-1/+8
| |/
* | Merge pull request #796 from virtualtam/changelogVirtualTam2017-03-081-0/+4
|\ \ | |/ |/| Add v0.7.1 to CHANGELOG.md
| * Add v0.7.1 to CHANGELOG.mdVirtualTam2017-03-081-0/+4
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #790 from ArthurHoaro/feature/intl-datesArthurHoaro2017-03-074-13/+249
|\ | | | | Fix autoLocale error and cover it with unit tests
| * Fix autoLocale error and cover it with unit testsArthurHoaro2017-03-074-13/+249
| |
* | Merge pull request #750 from ArthurHoaro/feature/intl-datesArthurHoaro2017-03-0612-23/+246
|\| | | | | Improve datetime display
| * Use all_tests target in Travis CIArthurHoaro2017-03-061-1/+1
| |
| * Run languages tests using PHPUnit test suitesArthurHoaro2017-03-064-7/+38
| |
| * Improve datetime displayArthurHoaro2017-03-068-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() detectionArthurHoaro2017-03-062-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/configVirtualTam2017-03-0426-47/+62
|\ | | | | application: introduce the Shaarli\Config namespace
| * application: introduce the Shaarli\Config namespaceVirtualTam2017-03-0426-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/changelogVirtualTam2017-03-041-7/+18
|\ \ | |/ |/| Update CHANGELOG.md
| * Update CHANGELOG.mdVirtualTam2017-03-041-7/+18
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #785 from ArthurHoaro/hotfix/markdown-htmlVirtualTam2017-03-046-27/+181
|\ | | | | Add markdown_escape setting
| * Add markdown_escape settingArthurHoaro2017-02-286-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/webdesign2ArthurHoaro2017-02-2790-1775/+10721
|\ | | | | New default template
| * Set the vintage theme by default for the time beingArthurHoaro2017-02-272-0/+54
| |