Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1847 commits 8 branches 1 tag 12 MiB
Commit graph

1847 commits

This branch
This branch
All branches
Author SHA1 Message Date
nodiscc
fc2beb8c6a Changelog: link to CVE-2017-15215, give attribution 2017-10-23 01:06:11 +02:00
VirtualTam
fd7d84616d Move session ID check to SessionManager 
Relates to https://github.com/shaarli/Shaarli/issues/324

Changed:
- `is_session_id_valid()` -> `SessionManager::checkId()`
- update tests

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-22 19:54:44 +02:00
VirtualTam
ebd650c06c Refactor session token management 
Relates to https://github.com/shaarli/Shaarli/issues/324

Added:
- `SessionManager` class to group session-related features
- unit tests

Changed:
- `getToken()` -> `SessionManager->generateToken()`
- `tokenOk()` -> `SessionManager->checkToken()`
- inject a `$token` parameter to `PageBuilder`'s constructor

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-22 19:19:46 +02:00
VirtualTam
e648f62b4f Merge pull request #1004 from virtualtam/doc/docker/reverse-proxy 
Documentation: add reverse proxy examples for Docker images
 2017-10-22 17:07:45 +02:00
VirtualTam
1a2c5ddeb5 Documentation: add reverse proxy examples for Docker images 
Closes https://github.com/shaarli/Shaarli/issues/888

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-22 15:03:20 +02:00
ArthurHoaro
2e6314af31 Merge pull request #1002 from ArthurHoaro/doc/install-docker 
Docs: mention Docker in the download & install page
 2017-10-22 14:56:26 +02:00
ArthurHoaro
d8acf85504 Merge pull request #871 from ArthurHoaro/feature/translation 
Shaarli's translation
 2017-10-22 13:19:51 +02:00
ArthurHoaro
1a47014f99 Translation documentation 2017-10-22 13:16:59 +02:00
ArthurHoaro
6a65bc5798 Translations : Working demo example of translation extension 2017-10-22 13:16:56 +02:00
ArthurHoaro
f39580c6fd Add language selection in the configure page of the default theme 2017-10-22 13:16:53 +02:00
VirtualTam
efd3a6405a Merge pull request #1001 from virtualtam/docker/latest 
docker: add 'latest' image
 2017-10-22 13:00:47 +02:00
ArthurHoaro
d637976329 Use makefile target to generate MO file and remove it from git 2017-10-22 12:56:55 +02:00
ArthurHoaro
40ec173e68 JS translation 2017-10-22 12:56:55 +02:00
ArthurHoaro
12266213d0 Shaarli's translation 
* 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.
 2017-10-22 12:55:03 +02:00
ArthurHoaro
cfcc38192a Doc: mention Docker docs in the download & install page 2017-10-22 12:50:04 +02:00
VirtualTam
fab0f4e576 docker: add 'latest' image 
This implies the following changes:
- `shaarli/shaarli:latest` will now point to the `latest` release
- `shaarli/shaarli:master` will point to the `master` branch

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-21 18:44:19 +02:00
VirtualTam
72cfe44436 Merge pull request #846 from virtualtam/docker/alpine 
Docker: switch to Alpine Linux
 2017-10-21 18:00:08 +02:00
nodiscc
919c980344 documentation: update tag cloud/filtering doc 
Ref. https://github.com/shaarli/Shaarli/issues/959
 2017-10-19 18:06:07 +02:00
VirtualTam
1f40141a69 Merge pull request #996 from virtualtam/fix/user-css 
Fix: enable access to data/user.css (Apache 2.2 & 2.4)
 2017-10-17 22:39:29 +02:00
VirtualTam
710291b164 Fix: enable access to data/user.css (Apache 2.2 & 2.4) 
Relates to https://github.com/shaarli/Shaarli/issues/872
Relates to https://github.com/shaarli/Shaarli/issues/993

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-16 19:41:22 +02:00
VirtualTam
a93b620a35 EditorConfig: add .htaccess support 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-16 19:38:33 +02:00
VirtualTam
839566500c Merge pull request #995 from virtualtam/lint/editorconfig 
Add EditorConfig configuration
 2017-10-16 19:18:29 +02:00
VirtualTam
e9619cc4f8 Add EditorConfig configuration 
EditorConfig allows specifying indentation, line feed and encoding
properties according to the type of file being edited.

Most editors support it out-of-the-box, or can benefit from it through a
plugin.

See:
- http://editorconfig.org/
- https://github.com/editorconfig/editorconfig
- https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-11 21:35:17 +02:00
VirtualTam
9f32160c32 Merge pull request #992 from ArthurHoaro/feature/import-history 
Don't write History for link import
 2017-10-08 16:35:57 +02:00
VirtualTam
0a496258af Merge pull request #990 from danieljakots/master 
Fix link in Upgrade-and-migration.md
 2017-10-08 16:35:33 +02:00
ArthurHoaro
66e74d50d3 Don't write History for link import 
With large imports it has a large impact on performances and isn't really useful.

Instead, write an IMPORT event, which let client using the history service resync its DB.

-> 15k link import done in 6 seconds.

Fixes #985
 2017-10-07 16:40:16 +02:00
Daniel Jakots
ba6245670d Fix link in Upgrade-and-migration.md 2017-10-07 09:35:40 -04:00
ArthurHoaro
78865393a6 Badge version 2017-10-07 12:27:50 +02:00
ArthurHoaro
a01437f9e1 Merge pull request #988 from ArthurHoaro/changelog-0.9.2 
Changelog 0.9.2 + AUTHORS
 2017-10-07 12:12:34 +02:00
ArthurHoaro
6770135b0a Update AUTHORS 
Signed-off-by: ArthurHoaro <arthur@hoa.ro>
 2017-10-07 12:10:23 +02:00
ArthurHoaro
6f2c02a0ce Changelog v0.9.2 2017-10-07 12:05:07 +02:00
ArthurHoaro
be9ddff2fb Merge pull request #987 from ArthurHoaro/hotfix/security-issue 
Fix security issue reported by @chb9
 2017-10-07 11:33:20 +02:00
ArthurHoaro
d14555a3df Fix security issue reported by @chbi 
Vulnerability introduced by 6ccd0b218f - release with Shaarli v0.9.1.
 2017-10-07 11:27:44 +02:00
VirtualTam
c8d96b4729 Merge pull request #979 from ArthurHoaro/feature/assets-cache-version 
Add a version hash for asset loading to prevent browser's cache issue
 2017-10-06 14:32:07 +02:00
VirtualTam
b3e39bf57e Merge pull request #980 from ArthurHoaro/hotfix/textarea-resize-jumpy 
Fix jumpy textarea with long content in post edit
 2017-10-06 14:31:16 +02:00
VirtualTam
f5bdd8edc8 Merge pull request #983 from bvberkum/pullrequest/shaarli-docker-quickstart 
Docker quickstart
 2017-10-06 14:30:18 +02:00
B. van Berkum
df8becac4f Minor docker-101 doc updates, typos fixed #983 2017-10-06 00:25:50 +02:00
VirtualTam
e3a3cc0da8 docker: rename resources for the stable image 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-03 20:07:46 +02:00
VirtualTam
1a216faecb docker: switch to Alpine Linux for the master image 
Relates to https://github.com/shaarli/Shaarli/issues/843

Changed:
- switch base image from Debian:Jessie to Alpine:3.6
- switch to PHP 7.1
- switch from supervisord to s6 to manage services

See:
- https://alpinelinux.org/
- https://wiki.alpinelinux.org/wiki/Nginx_with_PHP
- http://www.skarnet.org/software/s6/
  - http://www.skarnet.org/software/s6/s6-svscan.html
  - http://www.skarnet.org/software/s6/s6-svc.html
  - http://www.skarnet.org/software/s6/s6-svstat.html

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-10-03 19:47:01 +02:00
VirtualTam
2f69b6d04e Merge pull request #981 from mark-gerarts/default-note-title 
Allow setting of a default note title, see #963
 2017-10-03 19:26:48 +02:00
B. van Berkum
2f65b3dd53 Docker quickstart: one more grammar mistake. Made it a bit more terse. 2017-10-03 01:03:27 +02:00
B. van Berkum
62a8b0ff6e Docker-101: added working systemd config example 2017-10-03 00:57:46 +02:00
B. van Berkum
60ed9b8f41 Typo's, unified structure a bit. 
- Fixes inevitable typo that crept in.
- Removed some blank lines, newlines, to match established whitespace use better.
- Minor grammar improvement.
 2017-10-03 00:35:27 +02:00
B. van Berkum
22a30602cb Docker 101: container start and cleanup 2017-10-03 00:24:23 +02:00
B. van Berkum
02ff7897c0 Added docker quickstart example, with user-data volume 2017-10-03 00:23:34 +02:00
Mark Gerarts
722caa2090 Allow setting of a default note title, see #963 2017-10-01 14:19:57 +02:00
ArthurHoaro
9c46b347b8 Fix jumpy textarea with long content in post edit 
We manually reset the scroll position, to avoid height = 'auto' jump to the top

Fixes #971
 2017-10-01 11:49:17 +02:00
ArthurHoaro
b3e1f92e9c Rename shaarli_version constant to uppercase 2017-10-01 11:11:16 +02:00
ArthurHoaro
bfe4f536bb Add a version hash for asset loading to prevent browser's cache issue 
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
 2017-10-01 11:10:37 +02:00
ArthurHoaro
3512f44617 Merge pull request #976 from ArthurHoaro/hotfix/url-parentheses 
Fix parsing for description links with parentheses
 2017-09-30 14:25:53 +02:00