aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Add a .gitattributes to ease repository managementVirtualTam2015-12-231-0/+28
| | | | | | | | | | | | | | | | 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>
* Bump version to v0.6.2v0.6.2VirtualTam2015-12-232-3/+3
| | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #418 from ArthurHoaro/qrcode-bugVirtualTam2015-12-233-4/+10
|\ | | | | QRCode plugin: use url instead of real_url
| * QRCode plugin: use url instead of real_urlArthurHoaro2015-12-223-4/+10
| | | | | | | | | | | | Fixes #414 and avoid usage of redirector in QRCode. Also fixed a bug with URL encoding.
* | Merge pull request #413 from ArthurHoaro/qrcode-effectVirtualTam2015-12-215-24/+52
|\ \ | |/ |/| Fixes QRCode style
| * Fixes QRCode styleArthurHoaro2015-12-215-24/+52
|/ | | | | * fixes a regression misplacing QRCode popup. * adds a 'show' class in JS to handle CSS transition.
* Merge pull request #406 from ArthurHoaro/qrcode-styleVirtualTam2015-12-092-15/+3
|\ | | | | Fixes #403 : Remove QRCode in core CSS and fix plugin layout
| * Fixes #403 : Remove QRCode in core CSS and fix plugin layoutArthurHoaro2015-12-072-15/+3
| |
* | Merge pull request #408 from ArthurHoaro/gototopVirtualTam2015-12-093-0/+17
|\ \ | | | | | | Adding a new placeholder in render_footer hook.
| * | Adding a new placeholder in render_footer hook.ArthurHoaro2015-12-083-0/+17
| |/ | | | | | | Allow free elements at the end of the page.
* | Merge pull request #407 from ArthurHoaro/daily-routerVirtualTam2015-12-083-6/+22
|\ \ | | | | | | Fixes #402: build the daily page through renderPage()
| * | Fixes #403: build the daily page through renderPage()ArthurHoaro2015-12-083-6/+22
| |/ | | | | | | | | * new entry in the Router for daily page. * add an always displayed button in demo_plugin
* | Reset permissions on index.php (changed in ↵ArthurHoaro2015-12-081-0/+0
| | | | | | | | 18cca483b0b51f190bd875fc4273a0fff3fedebd ).
* | Merge pull request #393 from ArthurHoaro/tools-js-indentVirtualTam2015-12-071-4/+47
|\ \ | | | | | | Minimal indent of tools.html
| * | Minimal indent of tools.htmlArthurHoaro2015-12-071-4/+47
| | |
* | | Merge pull request #405 from ArthurHoaro/titles-fixArthur2015-12-071-1/+4
|\ \ \ | |_|/ |/| | Temporary fix for head titles
| * | Temporary fix for head titlesArthurHoaro2015-12-071-1/+4
|/ / | | | | | | only set the title on permalink.
* | Merge pull request #400 from ArthurHoaro/title-399VirtualTam2015-12-061-0/+1
|\ \ | | | | | | Fixes #399 - show single link title as page title
| * | Fixes #399 - show single link title as page titleArthurHoaro2015-12-051-0/+1
|/ /
* | Merge pull request #398 from virtualtam/fix/initialize-version-varsVirtualTam2015-12-032-0/+4
|\ \ | | | | | | fix: assign template variables to empty values so they can be evaluated
| * | fix: assign template variables to empty values so they can be evaluatedVirtualTam2015-12-032-0/+4
|/ / | | | | | | | | | | Regression introduced in #394 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Remove dummycache folder on tear down.ArthurHoaro2015-12-031-1/+10
| |
* | Bump version to v0.6.1v0.6.1VirtualTam2015-12-012-3/+3
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | [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