Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename title link label to home link and apply it in vintage theme | ArthurHoaro | 2017-05-03 | 3 | -4/+4 |
| | | | | Related to #853 | ||||
* | Merge pull request #852 from ArthurHoaro/theme/install-password | ArthurHoaro | 2017-04-25 | 1 | -1/+1 |
|\ | | | | | Theme: use a password type field during the install | ||||
| * | Theme: use a password type field during the install | ArthurHoaro | 2017-04-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #830 from ArthurHoaro/theme/timezone | ArthurHoaro | 2017-04-25 | 12 | -137/+282 |
|\ \ | |/ |/| | Change timezone data structure send to the templates | ||||
| * | Apply the new timezone template variables to the vintage theme | ArthurHoaro | 2017-04-04 | 5 | -4/+85 |
| | | |||||
| * | Apply the new timezone template variables to the default theme | ArthurHoaro | 2017-04-04 | 3 | -32/+91 |
| | | |||||
| * | Change timezone data structure send to the templates | ArthurHoaro | 2017-04-03 | 4 | -101/+106 |
| | | | | | | | | | | | | | | | | | | | | | | The goal of this is to be able to adapt the timezone form in template without hacking the HTML already rendered. * there are two arrays available: * `continents` which contains only a list of available continents * `cities` which contains a list of available timezone cities, associated with their continent Note: there are two distinct array because RainTPL doesn't support nested loop very well. | ||||
* | | Merge pull request #848 from ArthurHoaro/hotfix/upload-maxsize | ArthurHoaro | 2017-04-25 | 4 | -7/+35 |
|\ \ | | | | | | | Use raw bytes for upload size hidden input | ||||
| * | | Use raw bytes for upload size hidden input | ArthurHoaro | 2017-04-10 | 4 | -7/+35 |
|/ / | |||||
* | | Merge pull request #844 from ArthurHoaro/hotfix/id-0 | ArthurHoaro | 2017-04-05 | 1 | -2/+2 |
|\ \ | | | | | | | Fix offset check with link ID = 0 | ||||
| * | | Fix offset check with link ID = 0 | ArthurHoaro | 2017-04-05 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #800 from ArthurHoaro/hotfix/get-bytes-warning | ArthurHoaro | 2017-04-03 | 4 | -31/+172 |
|\ \ | | | | | | | Fix a warning generated in return_bytes function and refactor it | ||||
| * | | UtilsTest: PHP 5.5 compatibility | ArthurHoaro | 2017-04-03 | 1 | -8/+8 |
| | | | |||||
| * | | Fix a warning generated in return_bytes function and refactor it | ArthurHoaro | 2017-04-03 | 4 | -31/+172 |
|/ / | | | | | | | | | | | It was multiplying a string containing a letter. Moved function to Utils.php and display a human readable limit size | ||||
* | | Merge pull request #842 from ArthurHoaro/cleanup/remove-riy-plugin | ArthurHoaro | 2017-04-03 | 5 | -153/+0 |
|\ \ | | | | | | | Remove readityourself plugin | ||||
| * | | Remove readityourself plugin | ArthurHoaro | 2017-04-01 | 5 | -153/+0 |
|/ / | | | | | | | Fixes #818 | ||||
* | | 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 |
|/ / |