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

697 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Arthur
b373ddc1df Merge pull request #405 from ArthurHoaro/titles-fix 
Temporary fix for head titles
 2015-12-07 10:54:45 +01:00
ArthurHoaro
18cca483b0 Temporary fix for head titles 
only set the title on permalink.
 2015-12-07 10:29:24 +01:00
VirtualTam
4c3df9aa12 Merge pull request #400 from ArthurHoaro/title-399 
Fixes #399 - show single link title as page title
 2015-12-06 17:40:29 +01:00
ArthurHoaro
2f5c136104 Fixes #399 - show single link title as page title 2015-12-05 11:05:08 +01:00
VirtualTam
a6aa37b96f Merge pull request #398 from virtualtam/fix/initialize-version-vars 
fix: assign template variables to empty values so they can be evaluated
 2015-12-03 21:13:51 +01:00
VirtualTam
4a7af9759a fix: assign template variables to empty values so they can be evaluated 
Regression introduced in #394

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-12-03 20:30:46 +01:00
ArthurHoaro
b6a54537b8 Remove dummycache folder on tear down. 2015-12-03 19:27:34 +01:00
VirtualTam
9ecdeb5452 Bump version to v0.6.1 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-12-01 21:25:50 +01:00
nodiscc
8025c63906 [doc] add apache2 CSP config 2015-11-30 23:17:01 +01:00
nodiscc
a33c574461 remove obsolete doc 2015-11-30 22:43:28 +01:00
VirtualTam
05f21ea821 Merge pull request #394 from virtualtam/app-utils/check-update/stable-branch 
application: default to the "stable" branch for update checks
 2015-11-30 02:03:32 +01:00
VirtualTam
4407b45fd3 application: default to the "stable" branch for update checks 
Relates to #372
Relates to #390

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-27 00:10:43 +01:00
VirtualTam
1b740e3de3 Merge pull request #390 from virtualtam/app-utils/check-update 
application: refactor version checks, move to ApplicationUtils
 2015-11-26 23:29:20 +01:00
VirtualTam
4bf35ba56b application: refactor version checks, move to ApplicationUtils 
Relates to #372

Modifications:
 - move checkUpdate() to ApplicationUtils
 - reduce file I/O operations during version checks
 - apply coding conventions
 - add test coverage

Tools:
 - create a sandbox directory for tests

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-26 23:19:37 +01:00
VirtualTam
61873e3ded Merge pull request #355 from ArthurHoaro/redirector-url 
URL encode links when a redirector is set
 2015-11-26 23:05:58 +01:00
ArthurHoaro
657f0e25ba Fixes incorrect call to 
From 2e28269bae
 2015-11-26 20:51:53 +01:00
ArthurHoaro
90e5bd65c9 URL encode links when a redirector is set. 
Fixes #328 - URL encode links when a redirector is set

  * WARNING - template edit - new variable available : "real_url"
  Contains the final real url (redirected or any other change on original URL)

  * Don't redirect shaares link in RSS/Atom.
  * Affects links shaared in description.
  * Move text2clickable and keepMultipleSpaces to Utils.php + unit test

UPDATE:

* keepMultipleSpaces renamed to space2nbsp
* space2nbsp improved to handle single space at line beginning
* links in text description aren't 'nofollow' anymore
 2015-11-26 20:14:38 +01:00
Arthur
986afb752b Merge pull request #391 from nicolasdanelon/patch-1 
json_encode removed
 2015-11-25 15:07:20 +01:00
Nicolas Danelon
1e57f90200 cleanup: remove json_encode() (built-in since PHP 5.2) 
See http://php.net/manual/en/function.json-encode.php

Legacy since php 5.2.x . If php5.3 is required for the install script
 2015-11-25 09:42:29 -03:00
VirtualTam
4409b9eb0f Merge pull request #389 from virtualtam/utils/check-php-version 
application: move checkPHPVersion from Utils to ApplicationUtils
 2015-11-24 01:42:52 +01:00
VirtualTam
c9cf2715f0 application: move checkPHPVersion from Utils to ApplicationUtils 
Relates to #372

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-24 01:40:44 +01:00
VirtualTam
0def004963 Merge pull request #375 from virtualtam/utils/permissions 
tools: check file/directory permissions for Shaarli resources
 2015-11-24 01:26:30 +01:00
VirtualTam
2e28269bae install: check file/directory permissions for Shaarli resources 
Relates to #40
Relates to #372

Additions:
 - FileUtils: IOException
 - ApplicationUtils:
   - check if Shaarli resources are accessible with sufficient permissions
   - basic test coverage
 - index.php:
   - check access permissions and redirect to an error page if needed:
     - before running the first installation

Modifications:
 - LinkDB:
   - factorize datastore write code
   - check if the datastore
     (exists AND is writeable) OR (doesn't exist AND its parent dir is writable)
   - raise an IOException if needed

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-24 01:12:35 +01:00
VirtualTam
c580024cfb Merge pull request #384 from roidelapluie/master 
fill session info when shaarli is in open mode
 2015-11-23 20:24:35 +01:00
Julien Pivotto
02ad8fb6ce Fix authentification when Shaarli is in Open Mode. 2015-11-23 14:53:34 +01:00
VirtualTam
98348200e3 Merge pull request #377 from ArthurHoaro/search-tag-autocomplete 
Fixes #360 - Auto-complete more than one tag in tag filter field
 2015-11-22 23:22:17 +01:00
VirtualTam
456d305329 Merge pull request #277 from virtualtam/doxygen 
Add a target to generate Doxygen documentation
 2015-11-22 21:01:02 +01:00
VirtualTam
05af6f5325 Add a target to generate Doxygen documentation 
Relates to #95

Customizations for PHP/Shaarli:
 - add project information
 - index PHP files
 - index global functions
 - exclude directories

Usage
 $ make doxygen
 $ firefox doxygen/index.html &

Notes
 - classes can be found under "Data Structures"
 - global functions can be found under "Files > Globals > Functions"

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-22 20:35:00 +01:00
VirtualTam
9b87c27439 Add default Doxygen configuration 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-11-22 20:18:39 +01:00
VirtualTam
3d79d82326 Merge pull request #387 from ArthurHoaro/bookmarklet-quote 
Fixes #382: Bookmarklet can not retrieve title when there is a quotation mark in it
 2015-11-22 18:10:50 +01:00
VirtualTam
c07e166aa2 Merge pull request #376 from ArthurHoaro/opensearch 
Fixes #176 - Add opensearch functionality
 2015-11-22 17:53:24 +01:00
Arthur
da08b65de1 Merge pull request #385 from ArthurHoaro/plugins-error-fix 
Bugfix: do not store plugin errors in data.php
 2015-11-22 17:32:17 +01:00