aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #830 from ArthurHoaro/theme/timezoneArthurHoaro2017-04-2512-137/+282
|\ | | | | Change timezone data structure send to the templates
| * Apply the new timezone template variables to the vintage themeArthurHoaro2017-04-045-4/+85
| |
| * Apply the new timezone template variables to the default themeArthurHoaro2017-04-043-32/+91
| |
| * Change timezone data structure send to the templatesArthurHoaro2017-04-034-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-maxsizeArthurHoaro2017-04-254-7/+35
|\ \ | | | | | | Use raw bytes for upload size hidden input
| * | Use raw bytes for upload size hidden inputArthurHoaro2017-04-104-7/+35
|/ /
* | Merge pull request #844 from ArthurHoaro/hotfix/id-0ArthurHoaro2017-04-051-2/+2
|\ \ | | | | | | Fix offset check with link ID = 0
| * | Fix offset check with link ID = 0ArthurHoaro2017-04-051-2/+2
|/ /
* | Merge pull request #800 from ArthurHoaro/hotfix/get-bytes-warningArthurHoaro2017-04-034-31/+172
|\ \ | | | | | | Fix a warning generated in return_bytes function and refactor it
| * | UtilsTest: PHP 5.5 compatibilityArthurHoaro2017-04-031-8/+8
| | |
| * | Fix a warning generated in return_bytes function and refactor itArthurHoaro2017-04-034-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-pluginArthurHoaro2017-04-035-153/+0
|\ \ | | | | | | Remove readityourself plugin
| * | Remove readityourself pluginArthurHoaro2017-04-015-153/+0
|/ / | | | | | | Fixes #818
* | Merge pull request #742 from ArthurHoaro/api/postLinkArthurHoaro2017-04-016-7/+284
|\ \ | | | | | | REST API: implement POST link service
| * | REST API: implement POST link serviceArthurHoaro2017-03-276-7/+284
| | |
* | | Merge pull request #839 from ArthurHoaro/theme/daily-page-titleArthurHoaro2017-03-291-0/+1
|\ \ \ | | | | | | | | Display daily date in the page title (browser title)
| * | | Display daily date in the page title (browser title)ArthurHoaro2017-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes #211 Depends on #838
* | | | Merge pull request #838 from ArthurHoaro/theme/daily-date-formatArthurHoaro2017-03-296-9/+66
|\ \ \ \ | |/ / / |/| | | Theme: use format_date function for daily date
| * | | Theme: use format_date function for daily dateArthurHoaro2017-03-286-9/+66
|/ / /
* | | Merge pull request #837 from ArthurHoaro/theme/js-edit-linklist-marginArthurHoaro2017-03-271-2/+1
|\ \ \ | |/ / |/| | Theme: JS - Fix a bug preventing edit margin suppression to work
| * | Theme: JS - Fix a bug preventing edit margin suppression to workArthurHoaro2017-03-271-2/+1
|/ / | | | | | | Explanation: an ID with a leading digit isn't a valid CSS selector
* | Merge pull request #832 from ArthurHoaro/theme/fontArthurHoaro2017-03-277-11/+20
|\ \ | | | | | | Theme: change global font to Roboto and include bold variant
| * | Theme: change global font to Roboto and include bold variantArthurHoaro2017-03-247-11/+20
| | | | | | | | | | | | Fixes #822
* | | Merge pull request #834 from philipp-r/issue-833ArthurHoaro2017-03-251-3/+9
|\ \ \ | |/ / |/| | Tags parameter for redirects
| * | Tags parameter for redirects #833philipp-r2017-03-251-3/+9
|/ /
* | Merge pull request #831 from ArthurHoaro/theme/install-api-enableArthurHoaro2017-03-234-5/+23
|\ \ | | | | | | Add API setting in the new theme during the installation
| * | Add API setting in the new theme during the installationArthurHoaro2017-03-224-5/+23
| | | | | | | | | | | | Also use the same variable name across template files
* | | Merge pull request #829 from ArthurHoaro/hotfix/id-0ArthurHoaro2017-03-231-2/+6
|\ \ \ | |_|/ |/| | Fixes a bug preventing to edit link with ID 0
| * | Fixes a bug preventing to edit link with ID 0ArthurHoaro2017-03-221-2/+6
|/ / | | | | | | Fixes #814
* | Merge pull request #828 from ArthurHoaro/project/master-versionArthurHoaro2017-03-221-1/+1
|\ \ | | | | | | Fix version check branch for UT
| * | Fix version check branch for UTArthurHoaro2017-03-221-1/+1
| | |
* | | Merge pull request #798 from ArthurHoaro/feature/composer-lockArthurHoaro2017-03-222-1/+2424
|\ \ \ | | | | | | | | Include composer.lock in git files
| * | | Include composer.lock in git filesArthurHoaro2017-03-212-1/+2424
| | | |
* | | | Merge pull request #816 from ArthurHoaro/project/master-versionArthurHoaro2017-03-225-22/+123
|\ \ \ \ | | |/ / | |/| | Use 'dev' version on the master branch
| * | | Set Shaarli's version only in shaarli_version.php fileArthurHoaro2017-03-213-13/+62
| | | |
| * | | Add an updateMethod to match the current remote branch for updatesArthurHoaro2017-03-121-0/+44
| | | |
| * | | Use 'dev' version on the master branchArthurHoaro2017-03-124-11/+19
| | | | | | | | | | | | | | | | Allowed check branches are now `latest` and `stable`.
* | | | Merge pull request #826 from virtualtam/readme/badgesVirtualTam2017-03-211-3/+8
|\ \ \ \ | |_|_|/ |/| | | README: use explicit version badges
| * | | README: use explicit version badgesVirtualTam2017-03-191-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-defaultArthurHoaro2017-03-215-4/+66
|\ \ \ | | | | | | | | Fixes #304: use atom feed as default
| * | | Fixes #304: use atom feed as defaultArthurHoaro2017-03-115-4/+66
| | | | | | | | | | | | | | | | RSS feed is still available with the setting set to false
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 10:41:53 +0000