aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix bad merge commitArthurHoaro2015-04-011-23/+6
| | | | | | | | Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html
* update docnodiscc2015-03-311-5/+23
|
* Display notes as absolute urlspikzen2015-03-312-18/+27
|\ | | | | | | | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/177 Merge commit '3ea318dad05954e2043d5bb2f8572b103d7c3930' into notes-absolute-url Conflicts: index.php
| * Display notes as absolute urls.feula2015-03-292-10/+17
| | | | | | | | | | The deletion is related to Windows not handling quotes in filenames, see #179. It shouldn't delete the real file. Probably. Check it out.
* | Fix php error in daily RSSnodiscc2015-03-311-1/+1
| | | | | | | | | | Use of undefined constant htmlspecialchars - assumed 'htmlspecialchars' in /var/www/links/tmp/dailyrss.* Thanks @alexisju in https://github.com/shaarli/Shaarli/commit/bec18701801cc140d760c261dd115fda1507a0dd
* | Fixes autoLocale function by trying several way to find a correct one.ArthurHoaro2015-03-311-4/+9
| |
* | Define date format in templates instead of index.php.ArthurHoaro2015-03-314-17/+7
|/
* bump version to 0.0.45betav0.0.45betanodiscc2015-03-162-3/+3
|
* restore normal font size for the "Add link" input fieldnodiscc2015-03-161-0/+1
| | | | * Fixes second part of #172
* Revert to non-unicode characters for search buttonsnodiscc2015-03-161-2/+2
| | | | * Fixes #172
* Merge branch 'picwall-direct-link' into nextv0.0.44betanodiscc2015-03-152-2/+1
|\
| * picwall: link directly to the target URL (not the permalink)nodiscc2015-03-112-2/+1
| |
* | bump version to 0.0.44betanodiscc2015-03-152-3/+3
| |
* | Merge branch 'cleaner-searchfields' into nextnodiscc2015-03-151-2/+2
|\ \
| * | add placeholder text for search fields, change button text to magnifying ↵nodiscc2015-03-121-2/+2
| |/ | | | | | | glass unicode symbol
* | Merge remote-tracking branch 'ArthurHoaro/autocomplete' into nextnodiscc2015-03-1513-27028/+562
|\ \
| * | Use awesomplete as autocomplete lib and remove jQuery - shaarli/Shaarli#148ArthurHoaro2015-03-1213-27028/+562
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add awesomplete dependancy (source + min + CSS) * Remove jQuery and jQuery-UI dependancy * Few CSS ajustements * Use tags complete list as RainTPL var (and display it as HTML) * Remove "disable jQuery" feature * Remove tag list web service
* | | Merge branch 'include-doc' into nextnodiscc2015-03-1516-2/+1040
|\ \ \
| * | | Include documentation/wiki locally:nodiscc2015-03-1416-2/+1040
| | |/ | |/| | | | | | | | | | | | | | | | * sync current wiki (https://github.com/shaarli/Shaarli/wiki) to the doc/ directory * fix missing logo in README * add link to local documentation in the page footer * add Makefile targets for doc generation by @virtualtam
* | | theme: decrease border-radius to 3px everywherenodiscc2015-03-121-8/+8
| | |
* | | update COPYINGnodiscc2015-03-121-0/+1
| | |
* | | added menu div and cleaned up codeMiloš Jovanović2015-03-111-14/+29
| | |
* | | Fix menu dynamic resize, padding, private icon pixelationMiloš Jovanović2015-03-112-35/+58
|/ /
* | Merge pull request #119 from ArthurHoaro/js-linknodiscc2015-03-111-1/+1
|\ \ | | | | | | allow 'javascript:' links sharing (bookmarklets)
| * | Fixes shaarli/Shaarli#46: allow 'javascript:' links sharingArthurHoaro2015-02-201-1/+1
| | |
* | | Merge pull request #151 from nodiscc/addnote-buttonnodiscc2015-03-071-0/+1
|\ \ \ | | | | | | | | tools dialog: add a 'Add Note' bookmarklet to immediatly open a note (text post) compose window
| * | | tools dialog: add a 'Add Note' bookmarklet to immediatly open a note (text ↵nodiscc2015-03-071-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | post) compose window * Fixes https://github.com/shaarli/Shaarli/issues/142 * Fixes https://github.com/sebsauvage/Shaarli/issues/59
* | | Merge pull request #124 from virtualtam/static-analysisnodiscc2015-03-073-1/+116
|\ \ \ | |/ / |/| | Code quality: Makefile to run static code checkers
| * | Code quality: Makefile to run static code checkersVirtualTam2015-03-053-1/+116
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #71 Relates to #95 Additions: - Makefile for easy usage, - Composer file to declare dev & test dependencies. Features: - PHP Copy/Paste Detect: detect duplicate code; - PHP Code Sniffer: static analysis, syntax checking, - PHP Mess Detector: static analysis, syntax checking. Signed-off-by: VirtualTam <virtualtam@flibidi.org>
* | fix broken URL for user.cssnodiscc2015-03-051-1/+1
| |
* | fix broken CSS file URL introduced in 1f7f8ce067b278a4837364191513d04f7548cef9nodiscc2015-03-051-1/+1
| |
* | Merge pull request #140 from nodiscc/masternodiscc2015-03-054-127/+7
|\ \ | | | | | | Various fixes
| * | add bountysource.com badgenodiscc2015-03-051-1/+1
| | | | | | | | | | | | | | | * Bountysource is the funding platform for open-source software. Users can improve the open-source projects they love by creating/collecting bounties and pledging to fundraisers. * https://github.com/bountysource/frontend/wiki/Frequently-Asked-Questions
| * | Redirect to homepage after adding a link via "Add Link" dialognodiscc2015-03-051-0/+1
| | | | | | | | | | | | * Fixes https://github.com/shaarli/Shaarli/issues/115
| * | update README: add note about php-gd and git-based upgradenodiscc2015-03-051-4/+3
| | |
| * | remove duplicate license information, fixes ↵nodiscc2015-03-051-120/+0
| | | | | | | | | | | | https://github.com/shaarli/Shaarli/issues/135
| * | cleanup: remove version number from CSS linksnodiscc2015-03-051-2/+2
|/ / | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/134
* | Merge pull request #141 from nodiscc/cleanurl-filtersnodiscc2015-03-051-4/+7
|\ \ | | | | | | Add URL cleaning filters + refactoring
| * | Improve URL cleaning:nodiscc2015-03-051-1/+1
| | | | | | | | | | | | * also remove action_type_map, action_ref_map and action_object maps params used by facebook
| * | Improve annoying URL parameters cleaning:nodiscc2015-03-051-2/+3
| | | | | | | | | | | | | | | | | | * Use regular expressions to avoid suplicating params depending on their position in the URL (&param=,?param=) * Only remove the relevant URL pattern and don't remove following params, fixes https://github.com/shaarli/Shaarli/issues/136 * Credits to Marcus Rohrmoser (https://github.com/mro)
| * | cleanup: refactor annoying URL patterns in a single loopnodiscc2015-03-041-9/+6
| | | | | | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/133
| * | Add some filters to clean URLsAlexis J2015-03-041-0/+5
| | |
* | | Merge pull request #132 from ArthurHoaro/picwallnodiscc2015-03-049-280/+256
|\ \ \ | |/ / |/| | Lazy load images with the light lib bLazy.js instead of jQuery
| * | Lazy load images with the light lib bLazy.js instead of jQuery:ArthurHoaro2015-03-019-280/+256
|/ / | | | | | | | | | | | | * Remove jquery.lazyload lib * Add blazy lib * Add a bit of CSS animation * Delete unused picwall2 template
* | Merge pull request #123 from nodiscc/dont-disclose-versionEmilien Klein2015-02-253-3/+3
|\ \ | | | | | | Prevent visitors from reading shaarli version
| * | Prevent visitors from reading shaarli versionnodiscc2015-02-253-3/+3
|/ / | | | | | | | | | | | | * fixes https://github.com/shaarli/Shaarli/issues/122 * the shaarli version is now in a php comment block, which prevents visitors from reading it when it is place on a PHP-enabled server, but still allows the update mechanism to read it from the source on github.
* | Merge pull request #120 from ArthurHoaro/optionalupdateEmilien Klein2015-02-213-11/+22
|\ \ | |/ |/| shaarli/Shaarli#34: Make update check optional
| * shaarli/Shaarli#34: Make update check optionalArthurHoaro2015-02-203-11/+22
|/ | | | | * Add a check box at installation (checked by default) * Add a check box in configuration page
* bump version to 0.0.43betav0.0.43betanodiscc2015-02-202-3/+3
|
* Merge pull request #86 from pikzen/fix-cookiesnodiscc2015-02-191-22/+57
|\ | | | | Prevent shaarli from sending thousands of cookies.