aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #916 from ArthurHoaro/hotfix/fix-composer-php-versionArthurHoaro2017-08-052-94/+119
|\ | | | | Fix PHP version configuration in composer.json
| * Fix PHP version configuration in composer.jsonArthurHoaro2017-08-052-94/+119
| | | | | | | | | | Without this setting, composer would download dependencies depending on the PHP version installed on the system. E.G. I was getting doctrine/instantiator 1.1, which requires at least PHP 7.1.
* | Merge pull request #910 from virtualtam/documentation/improvementsVirtualTam2017-08-0571-19938/+10
|\ \ | | | | | | Include generated doc in release archives, remove HTML from SCM
| * | documentation: include generated HTML in release archivesVirtualTam2017-08-021-4/+6
| | | | | | | | | | | | | | | | | | | | | Closes https://github.com/shaarli/Shaarli/issues/908 Relates to https://github.com/shaarli/Shaarli/pull/772 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: set edit_uriVirtualTam2017-08-021-0/+1
| | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: remove uneeded resourcesVirtualTam2017-08-023-294/+0
| | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/312 Relates to https://github.com/shaarli/Shaarli/pull/772 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | documentation: remove generated HTML from SCMVirtualTam2017-08-0266-19640/+3
| | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/908 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #887 from ArthurHoaro/hotfix/dash-tag-renameArthurHoaro2017-08-053-40/+106
|\ \ \ | | | | | | | | Make sure that the tag exists before altering/removing it
| * | | Move tag renaming code to LinkDB and unit test itArthurHoaro2017-08-053-36/+102
| | | |
| * | | Refactoring of CHANGETAG part to avoid duplicated codeArthurHoaro2017-05-311-34/+27
| | | |
| * | | Make sure that the tag exists before altering/removing itArthurHoaro2017-05-311-10/+17
| | | | | | | | | | | | | | | | Fixes #886
* | | | Merge pull request #889 from Lucas-C/masterVirtualTam2017-08-039-102/+111
|\ \ \ \ | | | | | | | | | | Using only one form in linklist.html - fix #885
| * | | | Using only one form in linklist.html + adding untaggedonly filter - fix #885Lucas Cimon2017-07-309-102/+111
| | | | |
* | | | | Merge pull request #913 from virtualtam/fix/readmeVirtualTam2017-08-021-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | readme: fix logo uri
| * | | | readme: fix logo uriVirtualTam2017-08-021-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #911 from virtualtam/fix/release/composerVirtualTam2017-08-021-1/+1
|\ \ \ \ | | | | | | | | | | fix: use pinned dependency revisions when generating release archives
| * | | | fix: use pinned dependency revisions when generating release archivesVirtualTam2017-08-021-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #912 from virtualtam/travis/preciseVirtualTam2017-08-021-0/+1
|\ \ \ \ | |_|_|/ |/| | | travis: explicitly set the build dist to `precise`
| * | | travis: explicitly set the build dist to `precise`VirtualTam2017-08-011-0/+1
|/ / / | | | | | | | | | | | | | | | See https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #906 from virtualtam/docker/cleanupVirtualTam2017-07-2953-970/+463
|\ \ \ | | | | | | | | docker: remove `dev` image, update documentation
| * | | Generate HTML documentationVirtualTam2017-07-2940-446/+459
| | | | | | | | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
| * | | docker: remove `dev` image, update documentationVirtualTam2017-07-2913-524/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://github.com/shaarli/Shaarli/issues/843 Changed: - Update Docker image list - Update Docker documentation structure Removed: - Delete Dockerfile and resources for the `dev` image - Cleanup `doc/` resources Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | 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
* | | | doc: fix bullet list formattingnodiscc2017-07-201-0/+2
| | | | | | | | | | | | https://shaarli.readthedocs.io/en/master/Shaarli-configuration/
* | | | Merge pull request #901 from shaarli/fix-900nodiscc2017-07-191-11/+1
|\ \ \ \ | | | | | | | | | | Remove merge conflict leftover
| * | | | Remove merge conflict leftovernodiscc2017-07-111-11/+1
| | | | | | | | | | | | | | | Fixes #900
* | | | | Merge pull request #899 from smuth4/masterArthurHoaro2017-07-132-1/+41
|\ \ \ \ \ | |/ / / / |/| | | | Respect HTTP_X_FORWARDED_HOST
| * | | | Add tests to cover new server_url behaviorStephen Muth2017-07-121-0/+28
| | | | |
| * | | | Respect HTTP_X_FORWARDED_HOSTStephen Muth2017-07-081-1/+13
|/ / / / | | | | | | | | | | | | | | | | alongside _PORT and _PROTO Fixes #879
* | | | doc: contributing: remove leftover link to wikinodiscc2017-07-041-1/+1
| | | |
* | | | Merge pull request #772 from nodiscc/rtfdnodiscc2017-07-04161-7647/+20558
|\ \ \ \ | |_|/ / |/| | | Generate HTML documentation using MkDocs
| * | | makefile: remove [[link]] -> [link](url) conversion logicnodiscc2017-07-041-6/+0
| | | | | | | | | | | | | | | | all links in documentation have been converted to standard markdown link syntax
| * | | make htmlpagesnodiscc2017-07-044-47/+236
| | | |
| * | | makefile: remove obsolete 'doc' targetnodiscc2017-07-041-8/+2
| | | | | | | | | | | | | | | | official documentation can now be found in doc/md/
| * | | doc: release: update doc generation instructionsnodiscc2017-07-041-2/+2
| | | |
| * | | CONTRIBUTING.md: define new workflow for documentation edition and contributionsnodiscc2017-07-041-6/+2
| | | |
| * | | doc: replace pandoc requirement with python3-venvnodiscc2017-06-181-1/+2
| | | |
| * | | move README contents to doc/md/index.mdnodiscc2017-06-182-97/+111
| | | |
| * | | make htmlpagesnodiscc2017-06-1850-1854/+92
| | | |
| * | | doc: rename "datastore hacks" -> "various hacks", move example scripts to ↵nodiscc2017-06-187-516/+10
| | | | | | | | | | | | | | | | gist.github.com, remove obsolete GH wiki _Sidebar.md
| * | | Generate HTML documentation using MkDocs (WIP)nodiscc2017-06-18162-7136/+22127
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #890 from Lucas-C/taglist-cloud_improvmentsArthurHoaro2017-06-113-3/+19
|\ \ \ | |/ / |/| | Tagcloud/list improvments
| * | Tagcloud/list improvmentsLucas Cimon2017-06-093-3/+19
|/ /
* | Merge pull request #894 from Lucas-C/bug893ArthurHoaro2017-06-071-2/+3
|\ \ | |/ |/| Fixing "Uncaught TypeError" in shaarli.js - fix #893
| * Fixing "Uncaught TypeError" in shaarli.js - fix #893Lucas Cimon2017-06-071-2/+3
|/
* Merge pull request #882 from ArthurHoaro/feature/edit-timestampArthurHoaro2017-05-313-3/+16
|\ | | | | Add creation date when editing a link
| * Add creation date when editing a linkArthurHoaro2017-05-313-3/+16
| | | | | | | | | | | | Also, alter the title on edition Fixes #431
* | Merge pull request #880 from ArthurHoaro/hotfix/allowed-protocolsArthurHoaro2017-05-318-16/+151
|\ \ | | | | | | Add a whitelist of protocols for URLs
| * | Add a whitelist of protocols for URLsArthurHoaro2017-05-258-16/+151
| | | | | | | | | | | | | | | | | | | | | - for Shaare - for markdown description links and images Not whitelisted protocols will be replaced by `http://`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 03:18:35 +0000