aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #262 from ArthurHoaro/dup-tagsArthur2015-07-121-0/+1
|\ | | | | Avoid tag duplicates
| * Avoid tag duplicatesArthurHoaro2015-07-121-4/+5
| | | | | | | | | | | | | | * Prevent duplicate client side with awesomplete * Prevent duplicate server side (save_edit processing) Fixes #261
* | Merge pull request #268 from ArthurHoaro/dailrss-templateVirtualTam2015-07-111-41/+59
|\ \ | | | | | | Include the whole <item> in Daily RSS template
| * | Include the whole <item> in dailyRSSArthurHoaro2015-07-111-41/+59
| | | | | | | | | | | | | | | | | | | | | | | | Allow custom date format and title in templates. Also a bit of code style review. Fixes #182
* | | Fix: data/config.php was not importedVirtualTam2015-07-111-2/+8
|/ / | | | | | | | | | | Relates to #255 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #255 from ArthurHoaro/configVirtualTam2015-07-091-34/+52
|\ \ | | | | | | All settings are now stored in config.php
| * | All settings are now stored in config.phpArthurHoaro2015-07-091-38/+56
| |/ | | | | | | | | | | | | | | | | | | Isolate functions related to config in Config.php + add unit tests + code_sniffer. options.php is not supported anymore, but its content will be automatically saved into config.php Fixes #shaarli/Shaarli#41 *TODO*: update [documentation](https://github.com/shaarli/Shaarli/wiki#configuration).
* | LinkDB::filterDay(): check input date formatVirtualTam2015-07-091-1/+7
| | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Fixes #260: previous/next day links in dailyArthurHoaro2015-07-081-6/+6
|/ | | | The bug was occuring only if we tried to access to the first day.
* LinkDB: do not access global variablesVirtualTam2015-06-241-2/+6
| | | | | | | | | | | Relates to #218 Removes "hidden" access to the following variables: - $GLOBALS['config']['datastore'] - PHPPREFIX - PHPSUFFIX Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* move escape() and sanitizeLink() to application/Utils.phpnodiscc2015-06-241-17/+0
| | | | prevents 'PHP Fatal error: Call to undefined function sanitizeLink() in Shaarli/application/LinkDB.php on line 255' in tests
* Merge remote-tracking branch 'ArthurHoaro/input-escape' into nextnodiscc2015-06-241-75/+90
|\ | | | | | | | | Conflicts: index.php
| * Working on shaarli/Shaarli#224ArthurHoaro2015-06-231-73/+86
| | | | | | | | | | | | | | | | | | | | | | | | I reviewed character escaping everywhere with the following ideas: * use a single common function to escape user data: `escape` using `htmlspecialchars`. * sanitize fields in `index.php` after reading them from datastore and before sending them to templates. It means no escaping function in Twig templates. 2 reasons: * it reduces risks of security issue for future user made templates * more readable templates * sanitize user configuration fields after loading them.
* | LinkDB: add 'hidePublicLinks' parameter to the constructorVirtualTam2015-06-241-8/+26
| | | | | | | | | | | | | | Fixes #236 Relates to #237 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Page title if there is a single linkArthurHoaro2015-06-231-2/+4
|/ | | | Fixes #232
* Merge remote-tracking branch 'ArthurHoaro/daily-date' into nextnodiscc2015-06-231-1/+1
|\
| * Daily page: date format in templateArthurHoaro2015-06-191-1/+1
| | | | | | | | | | | | | | | | It only concerns the date of the day in the main title. Fixes #182 Note that daily RSS feed is not generated through templates. Date are still hard formatted in that case.
* | Merge remote-tracking branch 'virtualtam/test/link-db' into nextnodiscc2015-06-231-256/+10
|\ \ | | | | | | | | | | | | Conflicts: index.php
| * | LinkDB: move to a proper file, add test coverageVirtualTam2015-06-111-249/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #71 LinkDB - move to application/LinkDB.php - code cleanup - indentation - whitespaces - formatting - comment cleanup - add missing documentation - unify formatting Test coverage for LinkDB - constructor - public / private access - link-related methods Shaarli utilities (LinkDB dependencies) - move startsWith() and endsWith() functions to application/Utils.php - add test coverage Dev utilities - Composer: add PHPUnit to dev dependencies - Makefile: - update lint targets - add test targets - generate coverage reports Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge remote-tracking branch 'ArthurHoaro/search-tag-awesomplete' into nextnodiscc2015-06-231-0/+1
|\ \
| * | Add awesomplete to tag search shaarli/Shaarli#49ArthurHoaro2015-06-091-0/+1
| |/
* / Do not load links if they're hidden (also fix shaarli/Shaarli#202)ArthurHoaro2015-06-091-20/+8
|/
* split annoyingpatterns list on multpile lines, add new patterns for removal:nodiscc2015-06-031-1/+14
| | | | | | | | * utm_content= * fb= * xtor= closes https://github.com/shaarli/Shaarli/issues/136
* Merge branch 'really-hide' of https://github.com/pikzen/Shaarli into nextnodiscc2015-05-221-2/+23
|\
| * Properly hide all linksfeula2015-05-111-2/+23
| | | | | | | | >searchtags
* | Merge remote-tracking branch 'Marsup/firefox-social' into nextnodiscc2015-05-221-7/+8
|\ \
| * | Add Firefox Social API to the tools. Fixes #101.Marsup2015-05-151-7/+8
| |/
* / Display date as today if no articles publishedJonathan Druart2015-05-111-3/+6
|/ | | | | | | | | On "The Daily Shaarli" page (index.php?do=daily), the date is "Tuesday 30, November 1999" if no articles have been published/shared. This patch checks the parameter ($linkdate) before the mktime call to prevent and generate the "day 0" string. mktime(0,0,0,0,0,0) returns 943916400 (hum?)
* change wording and variable names for "Hide public links" featurenodiscc2015-04-101-4/+4
|
* Merge remote-tracking branch 'pikzen/disable-public' into nextnodiscc2015-04-101-0/+7
|\
| * Allow disabling all public links, fixes #188feula2015-04-091-0/+7
| |
* | Merge remote-tracking branch 'ArthurHoaro/localecharset' into nextnodiscc2015-04-101-3/+4
|\ \
| * | #193 add UTF8 by default to autoLocaleArthurHoaro2015-04-081-3/+4
| |/
* | Merge commit '326ae54' into nextnodiscc2015-04-101-1/+0
|\ \ | |/ |/|
| * Fix missing permalink title when logged indimtion2015-04-051-1/+0
| |
* | Fixes autoLocale function by trying several way to find a correct one.ArthurHoaro2015-04-051-4/+9
|/ | | | Fix https://github.com/shaarli/Shaarli/issues/184
* Display notes as absolute URLsFlorian Eula2015-04-011-0/+6
|
* Fix bad merge commitArthurHoaro2015-04-011-23/+6
| | | | | | | | Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html
* Display notes as absolute urlspikzen2015-03-311-15/+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-291-7/+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.
* | 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-311-13/+3
|/
* bump version to 0.0.45betav0.0.45betanodiscc2015-03-161-2/+2
|
* Merge branch 'picwall-direct-link' into nextv0.0.44betanodiscc2015-03-151-1/+0
|\
| * picwall: link directly to the target URL (not the permalink)nodiscc2015-03-111-1/+0
| |
* | bump version to 0.0.44betanodiscc2015-03-151-2/+2
| |
* | Merge remote-tracking branch 'ArthurHoaro/autocomplete' into nextnodiscc2015-03-151-40/+3
|\ \ | |/ |/|
| * Use awesomplete as autocomplete lib and remove jQuery - shaarli/Shaarli#148ArthurHoaro2015-03-121-40/+3
| | | | | | | | | | | | | | | | | | * 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 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
| |