aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
Commit message (Collapse)AuthorAgeFilesLines
* tpl: default/vintage: pluginsadmin: fix link to documentationnodiscc2018-07-122-2/+2
| | | | Ref #930
* Merge remote-tracking branch 'upstream/master'Mark Schmitz2018-06-0718-41/+46
|\
| * Login: update PageBuilder and default/vintage templatesVirtualTam2018-06-0210-22/+22
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * Merge pull request #1135 from ArthurHoaro/ci/csslintArthurHoaro2018-05-2911-15/+15
| |\ | | | | | | Reformat SCSS to SASS format and run SASSLint in CI
| | * Add classes to default template to avoid using IDs in SCSSArthurHoaro2018-05-1011-15/+15
| | |
| * | Adds Stakali Android app to 3rd party listsArthurHoaro2018-05-131-2/+8
| |/
| * default/editlink.tpl: title: Shaare -> New Shaarenodiscc2018-04-141-2/+1
| |
* | also for new default tpl add meta tag to block sending the referrer vintage ↵Mark Schmitz2018-06-071-0/+1
|/ | | | -> #692
* add loading user css at last to vintage tplMark Schmitz2018-04-131-1/+1
|
* load user css at last, after plugin css to enable changing plugin stylesMark Schmitz2018-04-131-3/+3
|
* Webpack / Update front paths in template filesArthurHoaro2018-03-2815-50/+97
|
* Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ArthurHoaro2018-03-2835-10644/+0
|
* fix: IP ban check for the Vintage themeVirtualTam2018-03-241-1/+1
| | | | | | Introduced by https://github.com/shaarli/Shaarli/pull/1008 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Refactor login / ban authentication stepsVirtualTam2018-02-052-2/+2
| | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/324 Added: - Add the `LoginManager` class to manage logins and bans Changed: - Refactor IP ban management - Simplify logic - Avoid using globals, inject dependencies Fixed: - Use `ban_duration` instead of `ban_after` when setting a new ban Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #1038 from ArthurHoaro/feature/public-only-filterArthurHoaro2018-02-023-7/+15
|\ | | | | Add a filter to only display public links
| * Public/private filter: use two separate buttonsArthurHoaro2018-01-242-5/+8
| | | | | | | | #1038
| * Add a filter to only display public linksArthurHoaro2017-12-163-6/+11
| | | | | | | | | | | | When the key filter is clicked once, it only displays private link. When it is clicked on again, it becomes red and only public links are displayed. Another click and all links are displayed. The current visibility status is shown in the search banner Fixes #1030
* | Fix an issue preventing the Save button to appear for plugin parametersArthurHoaro2018-01-011-3/+3
| | | | | | | | is a special variable in RainTPL used in loops
* | Add CSS class and IDs in Shaarli's menuArthurHoaro2017-12-161-26/+26
|/ | | | Fixes #877
* Merge pull request #1017 from ArthurHoaro/feature/mobile-iconArthurHoaro2017-11-182-1/+2
|\ | | | | Add apple-touch-icon meta tag
| * Add apple-touch-icon meta tagArthurHoaro2017-11-182-1/+2
| | | | | | | | Fixes #997
* | Merge pull request #1014 from ArthurHoaro/feature/no-pluginArthurHoaro2017-11-121-6/+12
|\ \ | | | | | | Improve messages if there is no plugin or parameter available in the admin page
| * | Improve messages if there is no plugin or parameter available in the admin pageArthurHoaro2017-11-111-6/+12
| |/ | | | | | | Fixes #931
* / Fix alignement and better clarity for 'List all links with those tags' buttonArthurHoaro2017-11-083-4/+26
|/ | | | | | Fix CSS class typo and display the link as a button Fixes #999
* Remove redirector setting from Configure pageArthurHoaro2017-11-071-15/+0
| | | | | | This feature is pretty much useless these days as browsers have builtin features to support the thag "<meta name='referrer'", so keep the setting page as clean as possible. Also, avoid advertising it too much, because I'm pretty sure it doesn't work very well with markdown descriptions (as Parsedown have some trouble regarding URL detection (without MarkDown link tag)).
* Theme improvements: move thumbnails to the right and reduce margins overallArthurHoaro2017-10-283-59/+114
| | | | | | | | | | * Reduce multiple margins (markdown, space between block, etc.) * Move thumbnails to the right in the same line as the title * Move edit button as floating to the left * Move fold/collapse and checkbox buttons as floating to the right * Add a bunch of HTML ID in the linklist template Relates to #877
* Add language selection in the configure page of the default themeArthurHoaro2017-10-223-1/+46
|
* JS translationArthurHoaro2017-10-223-6/+20
|
* Shaarli's translationArthurHoaro2017-10-224-18/+28
| | | | | | | | | * translation system and unit tests * Translations everywhere Dont use translation merge It is not available with PHP builtin gettext, so it would have lead to inconsistency.
* Merge pull request #987 from ArthurHoaro/hotfix/security-issueArthurHoaro2017-10-071-1/+1
|\ | | | | Fix security issue reported by @chb9
| * Fix security issue reported by @chbiArthurHoaro2017-10-071-1/+1
| | | | | | | | Vulnerability introduced by 6ccd0b218fbd34de750f55b78f3dc43bb3d9fa8e - release with Shaarli v0.9.1.
* | Merge pull request #979 from ArthurHoaro/feature/assets-cache-versionVirtualTam2017-10-062-10/+10
|\ \ | | | | | | Add a version hash for asset loading to prevent browser's cache issue
| * | Add a version hash for asset loading to prevent browser's cache issueArthurHoaro2017-10-012-10/+10
| |/ | | | | | | | | | | The hash is generated using the same salt as the one used for credentials (1 salt per instance) in order to avoid exposing the instance version. Fixes #965
* / Fix jumpy textarea with long content in post editArthurHoaro2017-10-011-0/+6
|/ | | | | | We manually reset the scroll position, to avoid height = 'auto' jump to the top Fixes #971
* visited links color: same hue as unvisited links, darkenednodiscc2017-09-041-1/+1
| | | | | Related to https://github.com/shaarli/Shaarli/issues/877 Plain grey links would lead to think that the link is somehow disabled/inaccessible/private This slightly improves clarity/usability
* Merge pull request #939 from ArthurHoaro/hotfix/firefox-social-titleArthurHoaro2017-09-021-1/+2
|\ | | | | Firefox Social title: Use document.title instead of RainTPL variable
| * Firefox Social title: Use document.title instead of RainTPL variableArthurHoaro2017-09-021-1/+2
| | | | | | | | Fixes #929
* | Merge pull request #950 from thewilli/delete-fixArthurHoaro2017-09-011-3/+3
|\ \ | | | | | | fixed link deletion
| * | fixed link deletionWilli Eggeling2017-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting links, the js of the default theme separated ids by an escaped space ('+'). There was a trailing '+' after the ids which led to the php code detecting multiple values even for single values. In combination with the id '0' this could led to no id found at all and a resulting php error. this commit fixes the behavior and adds an additional error handling and trimming to the php code.
* | | new setting: default value for 'remember me' checkboxWilli Eggeling2017-08-272-2/+5
|/ / | | | | | | | | | | - the default state for the login page's 'remember me' checkbox can now be configured - adapted the default and vintage theme to consider the new setting - added documentation for the new setting
* / fixed note bookmarkletWilli Eggeling2017-08-241-1/+1
|/ | | | - the double quotes used in the alert() call of the note bookmarklet in the default template collided with the ones of the href tag - replaced the double quotes with single ones (just like the link bookmarklet)
* Merge pull request #925 from ArthurHoaro/theme/remove-2nd-sort-byArthurHoaro2017-08-191-2/+0
|\ | | | | Remove the 2nd green 'sort by' row in link list
| * Remove the 2nd green 'sort by' row in link listArthurHoaro2017-08-191-2/+0
| | | | | | | | It isn't really useful and doesn't look good if there isn't enough tags
* | Hide the search link if no tag has been searched in tag listArthurHoaro2017-08-191-3/+5
|/
* Merge pull request #889 from Lucas-C/masterVirtualTam2017-08-034-80/+65
|\ | | | | Using only one form in linklist.html - fix #885
| * Using only one form in linklist.html + adding untaggedonly filter - fix #885Lucas Cimon2017-07-304-80/+65
| |
* | Merge pull request #896 from ArthurHoaro/hotfix/firefox-social-subdirVirtualTam2017-07-231-2/+2
|\ \ | | | | | | Fix Firefox Social button in the default theme
| * | Fix Firefox Social button in the default themeArthurHoaro2017-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | is no longer required since the JS function is now in . Also, include the trailing slash in the post URL. Fixes #895
* | | Remove merge conflict leftovernodiscc2017-07-111-11/+1
| | | | | | | | | Fixes #900
* | | Generate HTML documentation using MkDocs (WIP)nodiscc2017-06-181-0/+10
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MkDocs is a static site generator geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML file. * http://www.mkdocs.org/ * http://www.mkdocs.org/user-guide/configuration/ Ref. #312 * remove pandoc-generated HTML documentation * move markdown doc to doc/md/, * mkdocs.yml: * generate HTML doc in doc/html * add pages TOC/ordering * use index.md as index page * Makefile: remove execute permissions from generated files * Makefile: rewrite htmlpages GFM to markdown conversion using sed: awk expression aslo matched '][' which causes invalid output on complex links with images or code blocks * Add mkdocs.yml to .gitattributes, exclude this file from release archives * Makefile: rename: htmldoc -> doc_html target * run make doc: pull latest markdown documentation from wiki * run make htmlpages: update html documentation