aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* [doc] add apache2 CSP confignodiscc2015-11-301-1/+9
|
* remove obsolete docnodiscc2015-11-301-8/+8
|
* Merge pull request #394 from virtualtam/app-utils/check-update/stable-branchVirtualTam2015-11-304-21/+55
|\ | | | | application: default to the "stable" branch for update checks
| * application: default to the "stable" branch for update checksVirtualTam2015-11-274-21/+55
|/ | | | | | | Relates to #372 Relates to #390 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #390 from virtualtam/app-utils/check-updateVirtualTam2015-11-268-35/+331
|\ | | | | application: refactor version checks, move to ApplicationUtils
| * application: refactor version checks, move to ApplicationUtilsVirtualTam2015-11-268-35/+331
|/ | | | | | | | | | | | | | | 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>
* Merge pull request #355 from ArthurHoaro/redirector-urlVirtualTam2015-11-2610-37/+160
|\ | | | | URL encode links when a redirector is set
| * URL encode links when a redirector is set.ArthurHoaro2015-11-2610-37/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixes incorrect call toArthurHoaro2015-11-261-1/+1
|/ | | | From 2e28269baed195d58bbe169841eed176b171db76
* Merge pull request #391 from nicolasdanelon/patch-1Arthur2015-11-251-39/+0
|\ | | | | json_encode removed
| * cleanup: remove json_encode() (built-in since PHP 5.2)Nicolas Danelon2015-11-251-39/+0
|/ | | | | | 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
* Merge pull request #389 from virtualtam/utils/check-php-versionVirtualTam2015-11-245-52/+52
|\ | | | | application: move checkPHPVersion from Utils to ApplicationUtils
| * application: move checkPHPVersion from Utils to ApplicationUtilsVirtualTam2015-11-245-52/+52
|/ | | | | | Relates to #372 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #375 from virtualtam/utils/permissionsVirtualTam2015-11-246-20/+213
|\ | | | | tools: check file/directory permissions for Shaarli resources
| * install: check file/directory permissions for Shaarli resourcesVirtualTam2015-11-246-20/+213
|/ | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge pull request #384 from roidelapluie/masterVirtualTam2015-11-231-10/+10
|\ | | | | fill session info when shaarli is in open mode
| * Fix authentification when Shaarli is in Open Mode.Julien Pivotto2015-11-231-10/+10
| |
* | Merge pull request #377 from ArthurHoaro/search-tag-autocompleteVirtualTam2015-11-223-43/+62
|\ \ | | | | | | Fixes #360 - Auto-complete more than one tag in tag filter field
| * | Fixes #360 - Auto-complete more than one tag in tag filter fieldArthurHoaro2015-11-173-43/+62
| | | | | | | | | | | | | | | | | | * Group awesomplete for multi data in a single JS file. * Use it in editlink and linklist. * Move awesomplete JS lib at the end of page in editlink.
* | | Merge pull request #277 from virtualtam/doxygenVirtualTam2015-11-223-1/+2383
|\ \ \ | | | | | | | | Add a target to generate Doxygen documentation
| * | | Add a target to generate Doxygen documentationVirtualTam2015-11-223-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Add default Doxygen configurationVirtualTam2015-11-221-0/+2362
|/ / / | | | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #387 from ArthurHoaro/bookmarklet-quoteVirtualTam2015-11-221-4/+4
|\ \ \ | | | | | | | | Fixes #382: Bookmarklet can not retrieve title when there is a quotation mark in it
| * | | Fixes #382: Bookmarklet can not retrieve title when there is a quotation ↵ArthurHoaro2015-11-221-4/+4
| | |/ | |/| | | | | | | | | | | | | mark in it bookmarklet fields weren't correctly escaped
* | | Merge pull request #376 from ArthurHoaro/opensearchVirtualTam2015-11-224-1/+61
|\ \ \ | | | | | | | | Fixes #176 - Add opensearch functionality
| * | | Fixes #176 - Add opensearch functionalityArthurHoaro2015-11-174-1/+61
| | |/ | |/| | | | | | | | | | * add a new page in Router: do=opensearch which displays the opensearch plugin * using base64 compressed image to avoid issue encountered with HTTPS
* | | Merge pull request #385 from ArthurHoaro/plugins-error-fixArthur2015-11-223-4/+4
|\ \ \ | |_|/ |/| | Bugfix: do not store plugin errors in data.php
| * | Bugfix: do not store plugin errors in data.phpArthurHoaro2015-11-223-4/+4
|/ / | | | | | | | | | | Before this, calling writeConfig() would have write error messages in data.php, because it uses 'plugins' array which is used for plugin configuration. Causing the message error appear everytime.
* | Merge pull request #383 from ArthurHoaro/masterArthur2015-11-182-3/+3
|\ \ | |/ |/| Bump version to v0.6.0
| * Bump version to v0.6.0v0.6.0ArthurHoaro2015-11-182-3/+3
|/ | | | Signed-off-by: ArthurHoaro <arthur@hoa.ro>
* Merge pull request #374 from virtualtam/cleanupVirtualTam2015-11-1114-0/+0
|\ | | | | cleanup: remove the executable bit from source scripts
| * cleanup: remove the executable bit from source scriptsVirtualTam2015-11-1114-0/+0
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #373 from virtualtam/index/format-globals-commentsVirtualTam2015-11-111-33/+99
|\ | | | | index.php: group globals by theme, format comments
| * index.php: group globals by theme, format commentsVirtualTam2015-11-111-33/+99
|/ | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #275 from shaarli/plugin-propositionArthur2015-11-0861-483/+13269
|\ | | | | Plugin proposition
| * Handle errors raised by plugins in template. fixes #370ArthurHoaro2015-11-084-22/+48
| |
| * Merge pull request #286 from ArthurHoaro/plugin-demo_pluginArthur2015-11-084-0/+327
| |\ | | | | | | PLUGIN demo_plugin
| | * PLUGIN demo_pluginArthurHoaro2015-11-084-0/+327
| | | | | | | | | | | | | | | This plugin try to cover Shaarli's plugin API entirely. Can be used by plugin developper to make their own.
| * | Merge pull request #281 from ArthurHoaro/plugin-wallabagArthur2015-11-087-0/+125
| |\ \ | | | | | | | | PLUGIN wallabag
| | * | unit tests for the wallabag pluginArthurHoaro2015-11-082-7/+64
| | | | | | | | | | | | | | | | | | | | + removed exit error if the config is not found + coding style
| | * | PLUGIN wallabagArthurHoaro2015-11-076-0/+68
| | |/ | | | | | | | | | Add a Wallabag icon in linklist for each link.
| * | Merge pull request #280 from ArthurHoaro/plugin-readityourselfArthur2015-11-085-0/+122
| |\ \ | | | | | | | | PLUGIN readityourself
| | * | unit tests for readityourself plugin + remove hard errorArthurHoaro2015-11-082-7/+90
| | | |
| | * | PLUGIN readityourselfArthurHoaro2015-11-084-0/+39
| | |/ | | | | | | | | | Add an icon for each link (linklist) for ReadItYourself
| * | Merge pull request #279 from ArthurHoaro/plugin-addlink_toolbarArthur2015-11-084-0/+148
| |\ \ | | | | | | | | PLUGIN: addlink_toolbar
| | * | unit test for addlink_toolbar + coding styleArthurHoaro2015-11-082-2/+111
| | | |
| | * | PLUGIN: addlink_toolbarArthurHoaro2015-11-083-0/+39
| | |/ | | | | | | | | | | | | | | | Add a field in linklist page to paste a new link. Displayed in fields toolbar.
| * | Merge pull request #284 from ArthurHoaro/plugin-playvideosArthur2015-11-077-0/+10719
| |\ \ | | | | | | | | PLUGIN playvideos
| | * | Add unit tests for Playvideos pluginArthurHoaro2015-11-072-2/+73
| | | | | | | | | | | | | | | | + coding style
| | * | PLUGIN playvideosArthurHoaro2015-11-076-0/+10648
| | |/ | | | | | | | | | Display a button in buttons toolbar which allows to play all videos found.