Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1140 from ArthurHoaro/hotfix/markdown-rss-permalink | ArthurHoaro | 2018-05-29 | 2 | -0/+63 |
|\ | | | | | Fix feed permalink rendering with markdown escape set to true | ||||
| * | Fix feed permalink rendering with markdown escape set to true | ArthurHoaro | 2018-05-19 | 2 | -0/+63 |
|/ | | | | Fixes #1134 | ||||
* | Merge pull request #1138 from ArthurHoaro/stakali | ArthurHoaro | 2018-05-17 | 2 | -3/+11 |
|\ | | | | | Adds Stakali Android app to 3rd party lists | ||||
| * | Adds Stakali Android app to 3rd party lists | ArthurHoaro | 2018-05-13 | 2 | -3/+11 |
|/ | |||||
* | Merge pull request #1116 from ArthurHoaro/ci/eslint | ArthurHoaro | 2018-05-06 | 2 | -11/+32 |
|\ | | | | | Use Travis stages to run JS tests separately | ||||
| * | Use Travis stages to run JS tests separately | ArthurHoaro | 2018-05-05 | 2 | -11/+32 |
|/ | |||||
* | Merge pull request #1133 from ArthurHoaro/hotfix/title-dl | ArthurHoaro | 2018-05-02 | 2 | -5/+14 |
|\ | | | | | Title retrieval fixes | ||||
| * | Support redirection in cURL download callback | ArthurHoaro | 2018-05-01 | 1 | -4/+13 |
| | | |||||
| * | Fix parameter order which was preventing max_dl parameter to work properly | ArthurHoaro | 2018-05-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1081 from nodiscc/doc-merge-sharing | nodiscc | 2018-04-18 | 12 | -63/+98 |
|\ | | | | | doc: merge all sharing methods under a single "Sharing content" page | ||||
| * | remove duplicate translation | nodiscc | 2018-04-14 | 1 | -6/+0 |
| | | |||||
| * | doc: sharing: add link to REST API documentation | nodiscc | 2018-04-14 | 1 | -1/+1 |
| | | |||||
| * | doc: optimize PNGs with pngcrush | nodiscc | 2018-04-14 | 6 | -0/+0 |
| | | | | | | | | 164k -> 156k | ||||
| * | doc: add edit_icon.png to git repository | nodiscc | 2018-04-14 | 2 | -1/+1 |
| | | | | | | | | optimize icon with optipng/pngcrush (3.30%) | ||||
| * | update PO strings for Edit/New Shaare | nodiscc | 2018-04-14 | 1 | -3/+14 |
| | | | | | | | | update french translation | ||||
| * | default/editlink.tpl: title: Shaare -> New Shaare | nodiscc | 2018-04-14 | 1 | -2/+1 |
| | | |||||
| * | doc: merge all sharing methods under a single "Sharing content" page | nodiscc | 2018-04-14 | 5 | -58/+89 |
| | | | | | | | | | | | | | | | | | | * formatting, wording, reordering, general improvements * move blog/pastebin/notepad item from index.md to this page * add TODOs * add the new page to mkdocs TOC Part of https://github.com/shaarli/Shaarli/issues/598 | ||||
* | | German language created (#1114) | Buster One | 2018-04-15 | 2 | -0/+1314 |
|/ | | | | | | | | | | | | * Added german language selection * German language file created * typo * extra space removed and typo corrected * lines 1314 through 1408 removed as suggested | ||||
* | Merge pull request #1126 from kramred/master | ArthurHoaro | 2018-04-14 | 2 | -4/+4 |
|\ | | | | | load user css at last, after plugin css to enable changing plugin styles | ||||
| * | add loading user css at last to vintage tpl | Mark Schmitz | 2018-04-13 | 1 | -1/+1 |
| | | |||||
| * | load user css at last, after plugin css to enable changing plugin styles | Mark Schmitz | 2018-04-13 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #1121 from virtualtam/node/packaging-metadata | VirtualTam | 2018-04-08 | 12 | -22/+28 |
|\ | | | | | Update frontend metadata and COPYING | ||||
| * | Cleanup unused asset resources | VirtualTam | 2018-04-05 | 5 | -0/+0 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update documentation and Doxygen icon location | VirtualTam | 2018-04-05 | 4 | -3/+3 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update COPYING | VirtualTam | 2018-04-05 | 2 | -19/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/pull/1072 Changed: - update paths to resource files (assets, images) Removed: - references to resources now resolved through NPM - licenses corresponding to the aforementioned resources Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update NPM frontend metadata | VirtualTam | 2018-04-04 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
| * | Update EditorConfig for frontend resources | VirtualTam | 2018-04-03 | 1 | -1/+1 |
|/ | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | Merge pull request #1115 from ArthurHoaro/parsedown-version | ArthurHoaro | 2018-03-31 | 3 | -60/+71 |
|\ | | | | | Update parsedown to its latest version instead of fixed 1.6 | ||||
| * | Update parsedown to its latest version instead of fixed 1.6 | ArthurHoaro | 2018-03-31 | 3 | -60/+71 |
|/ | |||||
* | Remove minified JS libs | ArthurHoaro | 2018-03-31 | 2 | -9/+0 |
| | |||||
* | Merge pull request #1113 from ArthurHoaro/docker/node-yarn-webpack | ArthurHoaro | 2018-03-28 | 1 | -1/+10 |
|\ | | | | | Docker: build frontend dependencies with node and yarn | ||||
| * | Docker: build frontend dependencies with node and yarn | ArthurHoaro | 2018-03-27 | 1 | -1/+10 |
| | | |||||
| * | Webpack / Documentation update | ArthurHoaro | 2018-03-26 | 5 | -11/+47 |
| | | |||||
| * | Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git | ArthurHoaro | 2018-03-26 | 9 | -18/+4849 |
| | | |||||
| * | Webpack / Update front paths in template files | ArthurHoaro | 2018-03-26 | 15 | -50/+97 |
| | | |||||
| * | Webpack / Rewrite all JS to ES6 Syntax | ArthurHoaro | 2018-03-26 | 5 | -724/+656 |
| | | |||||
| * | Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ | ArthurHoaro | 2018-03-26 | 48 | -8228/+19 |
| | | |||||
* | | Merge pull request #1072 from ArthurHoaro/feature/modern-front-end | ArthurHoaro | 2018-03-28 | 81 | -9118/+5755 |
|\ \ | | | | | | | Manage frontend dependencies with npm/yarn and webpack | ||||
| * | | Webpack / Documentation update | ArthurHoaro | 2018-03-28 | 5 | -11/+47 |
| | | | |||||
| * | | Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git | ArthurHoaro | 2018-03-28 | 9 | -18/+4849 |
| | | | |||||
| * | | Webpack / Update front paths in template files | ArthurHoaro | 2018-03-28 | 15 | -50/+97 |
| | | | |||||
| * | | Webpack / Rewrite all JS to ES6 Syntax | ArthurHoaro | 2018-03-28 | 5 | -724/+656 |
| | | | |||||
| * | | Webpack / Remove frontend dependencies from tpl/ & inc/ and move them to assets/ | ArthurHoaro | 2018-03-28 | 48 | -8228/+19 |
|/ / | |||||
* | | Merge pull request #1093 from ArthurHoaro/feature/theme-translation | ArthurHoaro | 2018-03-26 | 6 | -2/+98 |
|\ \ | | | | | | | Load theme translations files automatically | ||||
| * | | Load theme translations files automatically | ArthurHoaro | 2018-03-26 | 6 | -2/+98 |
| | | | | | | | | | | | | | | | | | | Fixes #1077 Take a look at the docs update to see how it works | ||||
* | | | Merge pull request #1103 from dennisverspuij/fix-on-in-markdown | ArthurHoaro | 2018-03-26 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix removal of on=... attributes from html (generated from markdown) | ||||
| * | | Fix removal of on=... attributes from html generated from markdown | Dennis Verspuij | 2018-03-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1110 from virtualtam/doc/v0.9.6 | VirtualTam | 2018-03-25 | 3 | -4/+11 |
|\ \ \ | | | | | | | | | Documentation: release v0.9.6 | ||||
| * | | | Documentation: release v0.9.6 | VirtualTam | 2018-03-25 | 3 | -4/+11 |
|/ / / | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | Merge pull request #1107 from virtualtam/apache/htaccess/jwt-header | VirtualTam | 2018-03-25 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | httpd: always forward the 'Authorization' header |