| Commit message (Expand) | Author | Age | Files | Lines |
* | Theme: JS - Fix a bug preventing edit margin suppression to work | ArthurHoaro | 2017-03-27 | 1 | -2/+1 |
* | 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 | ArthurHoaro | 2017-03-24 | 7 | -11/+20 |
* | | Merge pull request #834 from philipp-r/issue-833 | ArthurHoaro | 2017-03-25 | 1 | -3/+9 |
|\ \
| |/
|/| |
|
| * | 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 | ArthurHoaro | 2017-03-22 | 4 | -5/+23 |
* | | 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 | ArthurHoaro | 2017-03-22 | 1 | -2/+6 |
|/ / |
|
* | | Merge pull request #828 from ArthurHoaro/project/master-version | ArthurHoaro | 2017-03-22 | 1 | -1/+1 |
|\ \ |
|
| * | | 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 | ArthurHoaro | 2017-03-21 | 2 | -1/+2424 |
* | | | | Merge pull request #816 from ArthurHoaro/project/master-version | ArthurHoaro | 2017-03-22 | 5 | -22/+123 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | 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 |
* | | | | Merge pull request #826 from virtualtam/readme/badges | VirtualTam | 2017-03-21 | 1 | -3/+8 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | README: use explicit version badges | VirtualTam | 2017-03-19 | 1 | -3/+8 |
| | |/
| |/| |
|
* | | | Merge pull request #804 from ArthurHoaro/feature/atom-default | ArthurHoaro | 2017-03-21 | 5 | -4/+66 |
|\ \ \ |
|
| * | | | Fixes #304: use atom feed as default | ArthurHoaro | 2017-03-11 | 5 | -4/+66 |
* | | | | 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 | ArthurHoaro | 2017-03-12 | 3 | -4/+14 |
| | |/
| |/| |
|
* | | | 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 | ArthurHoaro | 2017-03-12 | 2 | -1/+6 |
|/ / |
|
* | | Merge pull request #813 from ArthurHoaro/changelog | ArthurHoaro | 2017-03-12 | 1 | -0/+8 |
|\ \ |
|
| * | | 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 | 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 | ArthurHoaro | 2017-03-12 | 2 | -1/+2 |
|/ / |
|
* | | 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 | ArthurHoaro | 2017-03-12 | 14 | -110/+286 |
* | | | Merge pull request #808 from ArthurHoaro/demo-readme | ArthurHoaro | 2017-03-11 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 |
|\ \ \ |
|
| * | | | 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 `dev.de... | ArthurHoaro | 2017-03-10 | 5 | -28/+51 |
| |/ / |
|
* | | | Merge pull request #803 from ArthurHoaro/feature/awesomplete-autofirst | ArthurHoaro | 2017-03-11 | 2 | -2/+2 |
|\ \ \ |
|
| * | | | Fixes #657: use data-autofirst parameter for awesomeplete | ArthurHoaro | 2017-03-11 | 2 | -2/+2 |
| |/ / |
|
* | | | 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 | 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 | 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 | ArthurHoaro | 2017-03-09 | 9 | -653/+2675 |
* | | Merge pull request #794 from ArthurHoaro/hotfix/namespace | ArthurHoaro | 2017-03-09 | 4 | -34/+45 |
|\ \
| |/
|/| |
|
| * | 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 |
|\ |
|