Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #742 from ArthurHoaro/api/postLink | ArthurHoaro | 2017-04-01 | 6 | -7/+284 | |
|\ \ \ \ \ | | | | | | | | | | | | | REST API: implement POST link service | |||||
| * | | | | | REST API: implement POST link service | ArthurHoaro | 2017-03-27 | 6 | -7/+284 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #839 from ArthurHoaro/theme/daily-page-title | ArthurHoaro | 2017-03-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Display daily date in the page title (browser title) | |||||
| * | | | | | | Display daily date in the page title (browser title) | ArthurHoaro | 2017-03-28 | 1 | -0/+1 | |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #211 Depends on #838 | |||||
* | | | | | | Merge pull request #838 from ArthurHoaro/theme/daily-date-format | ArthurHoaro | 2017-03-29 | 6 | -9/+66 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Theme: use format_date function for daily date | |||||
| * | | | | | Theme: use format_date function for daily date | ArthurHoaro | 2017-03-28 | 6 | -9/+66 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #837 from ArthurHoaro/theme/js-edit-linklist-margin | ArthurHoaro | 2017-03-27 | 1 | -2/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Theme: JS - Fix a bug preventing edit margin suppression to work | |||||
| * | | | | Theme: JS - Fix a bug preventing edit margin suppression to work | ArthurHoaro | 2017-03-27 | 1 | -2/+1 | |
|/ / / / | | | | | | | | | | | | | Explanation: an ID with a leading digit isn't a valid CSS selector | |||||
* | | | | Merge pull request #832 from ArthurHoaro/theme/font | ArthurHoaro | 2017-03-27 | 7 | -11/+20 | |
|\ \ \ \ | |_|_|/ |/| | | | Theme: change global font to Roboto and include bold variant | |||||
| * | | | Theme: change global font to Roboto and include bold variant | ArthurHoaro | 2017-03-24 | 7 | -11/+20 | |
| | | | | | | | | | | | | | | | | Fixes #822 | |||||
* | | | | Merge pull request #834 from philipp-r/issue-833 | ArthurHoaro | 2017-03-25 | 1 | -3/+9 | |
|\ \ \ \ | |/ / / |/| | | | Tags parameter for redirects | |||||
| * | | | Tags parameter for redirects #833 | philipp-r | 2017-03-25 | 1 | -3/+9 | |
|/ / / | ||||||
* | | | Merge pull request #831 from ArthurHoaro/theme/install-api-enable | ArthurHoaro | 2017-03-23 | 4 | -5/+23 | |
|\ \ \ | | | | | | | | | Add API setting in the new theme during the installation | |||||
| * | | | Add API setting in the new theme during the installation | ArthurHoaro | 2017-03-22 | 4 | -5/+23 | |
| | |/ | |/| | | | | | | | Also use the same variable name across template files | |||||
* | | | Merge pull request #829 from ArthurHoaro/hotfix/id-0 | ArthurHoaro | 2017-03-23 | 1 | -2/+6 | |
|\ \ \ | |_|/ |/| | | Fixes a bug preventing to edit link with ID 0 | |||||
| * | | Fixes a bug preventing to edit link with ID 0 | ArthurHoaro | 2017-03-22 | 1 | -2/+6 | |
|/ / | | | | | | | Fixes #814 | |||||
* | | Merge pull request #828 from ArthurHoaro/project/master-version | ArthurHoaro | 2017-03-22 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix version check branch for UT | |||||
| * | | Fix version check branch for UT | ArthurHoaro | 2017-03-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #798 from ArthurHoaro/feature/composer-lock | ArthurHoaro | 2017-03-22 | 2 | -1/+2424 | |
|\ \ \ | | | | | | | | | Include composer.lock in git files | |||||
| * | | | Include composer.lock in git files | ArthurHoaro | 2017-03-21 | 2 | -1/+2424 | |
| | | | | ||||||
* | | | | Merge pull request #816 from ArthurHoaro/project/master-version | ArthurHoaro | 2017-03-22 | 5 | -22/+123 | |
|\ \ \ \ | | |/ / | |/| | | Use 'dev' version on the master branch | |||||
| * | | | Set Shaarli's version only in shaarli_version.php file | ArthurHoaro | 2017-03-21 | 3 | -13/+62 | |
| | | | | ||||||
| * | | | Add an updateMethod to match the current remote branch for updates | ArthurHoaro | 2017-03-12 | 1 | -0/+44 | |
| | | | | ||||||
| * | | | Use 'dev' version on the master branch | ArthurHoaro | 2017-03-12 | 4 | -11/+19 | |
| | | | | | | | | | | | | | | | | Allowed check branches are now `latest` and `stable`. | |||||
* | | | | 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 | |
| |/ |