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

2279 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur
7676d82e75 Merge pull request #452 from ArthurHoaro/v0.6.3 
Bump version to v0.6.3
 2016-01-31 19:47:49 +01:00
ArthurHoaro
729d267172 Bump version to v0.6.3 2016-01-31 19:32:22 +01:00
Arthur
b7acd6f431 Merge pull request #451 from ArthurHoaro/markdown-gitdiff 
Fixes forced git changes
 2016-01-31 19:25:29 +01:00
ArthurHoaro
1456358240 Fixes forced git changes 
Probably related to the introduction of .gitattribute with forced line ending.
 2016-01-31 19:22:14 +01:00
Arthur
53603f5823 Merge pull request #388 from ArthurHoaro/pluginadmin 
Fixes #378 - Plugin administration UI.
 2016-01-31 19:00:13 +01:00
Arthur
893338f0d4 Merge pull request #379 from ArthurHoaro/plugin-markdown 
PLUGIN Markdown
 2016-01-31 18:57:29 +01:00
ArthurHoaro
dea0ba28f9 Fixes #378 - Plugin administration UI. 2016-01-31 18:54:48 +01:00
Arthur
423e2a8b13 Merge pull request #448 from shaarli/whitespace 
remove whitespace
 2016-01-31 17:50:07 +01:00
nodiscc
abe330b5e9 fix whitespace 2016-01-22 17:24:15 +01:00
Arthur
db36b8812d Merge pull request #444 from dimtion/404_template 
Create 404 template
 2016-01-21 19:27:00 +01:00
Dimtion
f4c84ad7fc Create 404 template 
Solve #430 for links
 2016-01-20 22:52:28 +01:00
ArthurHoaro
55d0a5c445 Bugfix: prevent LinkFilter to work on outdated data. 2016-01-20 22:51:56 +01:00
VirtualTam
25d88c90aa Merge pull request #441 from virtualtam/tests/check-file-permissions 
tests: add a make target to check file permissions
 2016-01-18 00:29:14 +01:00
VirtualTam
dc7db03feb Merge pull request #443 from virtualtam/fix/logm-eol 
fix: use PHP_EOL for carriage returns in file logs
 2016-01-18 00:28:21 +01:00
VirtualTam
aa7f7b3ea6 fix: use PHP_EOL for carriage returns in file logs 
Relates to #436

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-18 00:24:36 +01:00
VirtualTam
fc17813bd1 tests: add a make target to check file permissions 
Additions:
- [makefile] check versioned files are not executable
- [travis]   call the new make target

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-17 21:02:24 +01:00
VirtualTam
122d90ef8d Merge pull request #438 from virtualtam/utils/logm/date-format 
Logging: improve formatting to enable fail2ban parsing
 2016-01-17 20:11:42 +01:00
VirtualTam
478ce8afb4 Logging: improve formatting to enable fail2ban parsing 
Fixes #436

Modifications:
- remove calls to strval() on safe data
- update the date format: 'Y/m/d_H:i:s' => 'Y/m/d H:i:s'

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-16 16:19:44 +01:00
VirtualTam
73151d9546 Merge pull request #437 from virtualtam/refactor/utils/logm 
Logging: move logm() from index.php to application/Utils.php
 2016-01-16 16:10:14 +01:00
VirtualTam
1abe655597 Logging: move logm() from index.php to application/Utils.php 
Relates to #436

Modifications:
- inject dependencies to global variables ($_SERVER, $GLOBALS)
- apply coding conventions
- add test coverage

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-16 16:07:16 +01:00
VirtualTam
92ba7b573f Merge pull request #432 from ArthurHoaro/title-retrieve 
Fixes #410 - Retrieve title fails in multiple cases
 2016-01-11 21:47:00 +01:00
ArthurHoaro
1557cefbd7 Fixes #410 - Retrieve title fails in multiple cases 
* `get_http_url()` renamed to `get_http_response()`.
  * Use the same HTTP context to retrieve response headers and content.
  * Follow HTTP 301 and 302 redirections to retrieve the title (default max 3 redirections).
  * Add `LinkUtils` to extract titles and charset.
  * Try to retrieve charset from HTTP headers first (new), then HTML content.
  * Use mb_string to re-encode title if necessary.
 2016-01-11 21:19:31 +01:00
ArthurHoaro
c0a50f3663 Git *wants* to rewrite this file in the exact same way... 
Probably a line ending issue...
 2016-01-06 20:40:17 +01:00
Arthur
88c15abb2a Merge pull request #424 from ArthurHoaro/search 
Link filter refactoring
 2016-01-06 19:57:42 +01:00
ArthurHoaro
eefb636cea Fixes a bug preventing to remove a tag with special chars when searching 2016-01-06 19:54:44 +01:00
ArthurHoaro
2c75f8e780 Fixes #426 - Do not filter with blank tags. 2016-01-06 19:53:25 +01:00
ArthurHoaro
822bffced8 Link filter refactoring 
* introduce class LinkFilter to handle link filter operation (and lighten LinkDB).
  * handle 'private only' in filtering.
  * update template to prefill search fields with current search terms.
  * coding style.
  * unit test (mostly move from LinkDB to LinkFilter).

PS: preparation for #358 #315 and 'AND' search.
 2016-01-06 19:53:04 +01:00
ArthurHoaro
1be4afacf9 PLUGIN Markdown 
Parse link description in Markdown (HTML) before rendering.

      * hard remove of Shaarli's HTML before parsing.
      * Using Parsedown <https://github.com/erusev/parsedown> PHP lib.
      * Includes basic markdown CSS.
      * Style: removed 400px height max limit for shaares.
      * Unit tests.
 2016-01-03 17:36:10 +01:00
VirtualTam
a327d891b3 Merge pull request #429 from ArthurHoaro/changetag-buttons 
Fixes #428: validate buttons presence instead of value
 2016-01-03 16:54:13 +01:00
ArthurHoaro
6a6aa2b96d Fixes #428: validate buttons presence instead of value 
Also adds a validation where renaming with 'fromtag' specified and empty 'totag'.
It was causing a 404, now it just re-render the form.
 2016-01-03 14:42:43 +01:00
VirtualTam
defc8a3f03 Merge pull request #417 from ArthurHoaro/wallabag-improve 
Wallabag plugin improvement
 2016-01-02 20:09:29 +01:00
VirtualTam
66d86ea521 Merge pull request #423 from virtualtam/docker 
Docker: move Dockerfiles to the main repository
 2016-01-02 19:19:16 +01:00
VirtualTam
453f4653c3 Docker: move Dockerfiles to the main repository 
Relates to #420

Fixes:
- [all] remove Nginx' 'server_name' attribute
- [dev] create the phpinfo() script from the Dockerfile

Modifications:
- [all] remove documentation/guide (to be added to the wiki)
- [all] update maintainer information
- [prod] differentiate 'master' (:latest) and 'stable' (:stable) images

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-01-02 19:01:33 +01:00
ArthurHoaro
938d9cce77 Wallabag plugin improvement 
* Fixes a bug where URL weren't properly encoded.
  * Adds Wallabag V2 support.
  * Adds a URL function to handle trailing slash.
  * UT.
  * README updated.
 2015-12-27 15:30:34 +01:00
VirtualTam
0baf7842fc Merge pull request #419 from virtualtam/gitattributes 
Add a .gitattributes to ease repository management
 2015-12-24 16:01:23 +01:00
VirtualTam
c6a7972de5 Add a .gitattributes to ease repository management 
Features:
- enforce LF (Unix) line endings
- omit dev/test resources & code from Git(Hub) archives
- treat minified resources (CSS, JS) as binaries to avoid cluttered diffs

Resources:
- http://git-scm.com/docs/gitattributes
- https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes
- https://help.github.com/articles/dealing-with-line-endings/
- http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
- https://github.com/Danimoth/gitattributes

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-12-23 23:40:15 +01:00
VirtualTam
ba83317573 Bump version to v0.6.2 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-12-23 19:54:37 +01:00
VirtualTam
ccb7cf9855 Merge pull request #418 from ArthurHoaro/qrcode-bug 
QRCode plugin: use url instead of real_url
 2015-12-23 19:50:33 +01:00
ArthurHoaro
49e62f22ad QRCode plugin: use url instead of real_url 
Fixes #414 and avoid usage of redirector in QRCode.

Also fixed a bug with URL encoding.
 2015-12-22 10:59:41 +01:00
VirtualTam
70a35e2a6d Merge pull request #413 from ArthurHoaro/qrcode-effect 
Fixes QRCode style
 2015-12-21 22:31:45 +01:00
ArthurHoaro
28a4fc546f Fixes QRCode style 
* fixes a regression misplacing QRCode popup.
 * adds a 'show' class in JS to handle CSS transition.
 2015-12-21 14:01:52 +01:00
VirtualTam
79851b4890 Merge pull request #406 from ArthurHoaro/qrcode-style 
Fixes #403 : Remove QRCode in core CSS and fix plugin layout
 2015-12-09 01:00:52 +01:00
VirtualTam
2f3e74090a Merge pull request #408 from ArthurHoaro/gototop 
Adding a new placeholder in render_footer hook.
 2015-12-09 00:55:52 +01:00
VirtualTam
6ff636cdd4 Merge pull request #407 from ArthurHoaro/daily-router 
Fixes #402: build the daily page through renderPage()
 2015-12-08 21:41:31 +01:00
ArthurHoaro
40a5f296a6 Adding a new placeholder in render_footer hook. 
Allow free elements at the end of the page.
 2015-12-08 16:02:46 +01:00
ArthurHoaro
38603b2450 Fixes #403: build the daily page through renderPage() 
* new entry in the Router for daily page.
  * add an always displayed button in demo_plugin
 2015-12-08 15:51:49 +01:00
ArthurHoaro
aca447a713 Reset permissions on index.php (changed in 18cca483b0 ). 2015-12-08 15:09:17 +01:00
VirtualTam
b16e3dc590 Merge pull request #393 from ArthurHoaro/tools-js-indent 
Minimal indent of tools.html
 2015-12-07 21:48:57 +01:00
ArthurHoaro
6a6f6c32e5 Fixes #403 : Remove QRCode in core CSS and fix plugin layout 2015-12-07 11:03:30 +01:00
ArthurHoaro
0504659db7 Minimal indent of tools.html 2015-12-07 10:58:22 +01:00