Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote-tracking branch 'origin/doc-contributing' | nodiscc | 2015-06-23 | 1 | -0/+80 | |
|\ | ||||||
| * | Create CONTIBUTING.md | nodiscc | 2015-06-10 | 1 | -0/+80 | |
| | | | | | | Contributing guidelines, fixes https://github.com/shaarli/Shaarli/issues/154 | |||||
* | | Merge remote-tracking branch 'ArthurHoaro/daily-date' into next | nodiscc | 2015-06-23 | 2 | -2/+2 | |
|\ \ | ||||||
| * | | Daily page: date format in template | ArthurHoaro | 2015-06-19 | 2 | -2/+2 | |
| |/ | | | | | | | | | | | | | | | 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 'nicolasdanelon/master' into next | nodiscc | 2015-06-23 | 2 | -4/+30 | |
|\ \ | ||||||
| * | | fix login desktop | nda | 2015-06-19 | 1 | -0/+10 | |
| | | | ||||||
| * | | login enhance for mobile | nda | 2015-06-19 | 2 | -4/+20 | |
| |/ | ||||||
* | | re-add readDb() missing from previous merge | nodiscc | 2015-06-23 | 1 | -0/+7 | |
| | | ||||||
* | | Merge remote-tracking branch 'virtualtam/test/link-db' into next | nodiscc | 2015-06-23 | 12 | -264/+1231 | |
|\ \ | | | | | | | | | | | | | Conflicts: index.php | |||||
| * | | LinkDB: move to a proper file, add test coverage | VirtualTam | 2015-06-11 | 12 | -257/+1231 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 next | nodiscc | 2015-06-23 | 3 | -3/+23 | |
|\ \ | ||||||
| * | | Add awesomplete to tag search shaarli/Shaarli#49 | ArthurHoaro | 2015-06-09 | 3 | -3/+23 | |
| |/ | ||||||
* | | Merge remote-tracking branch 'virtualtam/travis' into next | nodiscc | 2015-06-23 | 1 | -0/+10 | |
|\ \ | ||||||
| * | | Add Travis CI config | VirtualTam | 2015-06-05 | 1 | -0/+10 | |
| |/ | | | | | | | | | | | Relates to #71 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | |||||
* / | Do not load links if they're hidden (also fix shaarli/Shaarli#202) | ArthurHoaro | 2015-06-09 | 1 | -20/+8 | |
|/ | ||||||
* | split annoyingpatterns list on multpile lines, add new patterns for removal: | nodiscc | 2015-06-03 | 1 | -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 next | nodiscc | 2015-05-22 | 1 | -2/+23 | |
|\ | ||||||
| * | Properly hide all links | feula | 2015-05-11 | 1 | -2/+23 | |
| | | | | | | | | >searchtags | |||||
* | | Merge remote-tracking branch 'Marsup/firefox-social' into next | nodiscc | 2015-05-22 | 3 | -7/+39 | |
|\ \ | ||||||
| * | | Add Firefox Social API to the tools. Fixes #101. | Marsup | 2015-05-15 | 3 | -7/+39 | |
| |/ | ||||||
* / | Display date as today if no articles published | Jonathan Druart | 2015-05-11 | 1 | -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?) | |||||
* | doc: add demo to README | nodiscc | 2015-04-20 | 1 | -0/+6 | |
| | | | | fixes https://github.com/shaarli/Shaarli/issues/198 | |||||
* | change wording and variable names for "Hide public links" feature | nodiscc | 2015-04-10 | 2 | -6/+6 | |
| | ||||||
* | Merge remote-tracking branch 'pikzen/disable-public' into next | nodiscc | 2015-04-10 | 2 | -0/+14 | |
|\ | ||||||
| * | Allow disabling all public links, fixes #188 | feula | 2015-04-09 | 2 | -0/+14 | |
| | | ||||||
* | | Merge remote-tracking branch 'ArthurHoaro/localecharset' into next | nodiscc | 2015-04-10 | 1 | -3/+4 | |
|\ \ | ||||||
| * | | #193 add UTF8 by default to autoLocale | ArthurHoaro | 2015-04-08 | 1 | -3/+4 | |
| |/ | ||||||
* | | Merge branch 'pandoc' into next | nodiscc | 2015-04-10 | 11 | -242/+1264 | |
|\ \ | ||||||
| * | | doc: remove old mdwiki index.html | nodiscc | 2015-04-05 | 1 | -212/+0 | |
| | | | ||||||
| * | | doc: point footer link to local html documentation | nodiscc | 2015-04-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | doc: sync doc/github-markdown.css from wiki | nodiscc | 2015-04-05 | 1 | -0/+277 | |
| | | | ||||||
| * | | add local HTML documentation | nodiscc | 2015-04-05 | 6 | -0/+907 | |
| | | | | | | | | | | | | generated with 'make htmldoc' | |||||
| * | | use pandoc to generate local HTML documentation | nodiscc | 2015-04-05 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | fixes https://github.com/shaarli/Shaarli/issues/178 run 'make htmldoc' | |||||
| * | | doc: update documentation (sync from wiki) | nodiscc | 2015-04-05 | 1 | -8/+55 | |
| | | | ||||||
| * | | cleanup: makefile comments | nodiscc | 2015-04-05 | 1 | -21/+18 | |
| |/ | ||||||
* | | Merge commit '326ae54' into next | nodiscc | 2015-04-10 | 1 | -1/+0 | |
|\ \ | |/ |/| | ||||||
| * | Fix missing permalink title when logged in | dimtion | 2015-04-05 | 1 | -1/+0 | |
| | | ||||||
* | | Fixes autoLocale function by trying several way to find a correct one. | ArthurHoaro | 2015-04-05 | 1 | -4/+9 | |
|/ | | | | Fix https://github.com/shaarli/Shaarli/issues/184 | |||||
* | Merge pull request #183 from pikzen/fix-absolute-urls | nodiscc | 2015-04-01 | 1 | -0/+6 | |
|\ | | | | | Display notes as absolute URLs (for real) | |||||
| * | Display notes as absolute URLs | Florian Eula | 2015-04-01 | 1 | -0/+6 | |
|/ | ||||||
* | Fix bad merge commit | ArthurHoaro | 2015-04-01 | 1 | -23/+6 | |
| | | | | | | | | Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html | |||||
* | update doc | nodiscc | 2015-03-31 | 1 | -5/+23 | |
| | ||||||
* | Display notes as absolute urls | pikzen | 2015-03-31 | 2 | -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. | feula | 2015-03-29 | 2 | -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 RSS | nodiscc | 2015-03-31 | 1 | -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. | ArthurHoaro | 2015-03-31 | 1 | -4/+9 | |
| | | ||||||
* | | Define date format in templates instead of index.php. | ArthurHoaro | 2015-03-31 | 4 | -17/+7 | |
|/ | ||||||
* | bump version to 0.0.45betav0.0.45beta | nodiscc | 2015-03-16 | 2 | -3/+3 | |
| | ||||||
* | restore normal font size for the "Add link" input field | nodiscc | 2015-03-16 | 1 | -0/+1 | |
| | | | | * Fixes second part of #172 | |||||
* | Revert to non-unicode characters for search buttons | nodiscc | 2015-03-16 | 1 | -2/+2 | |
| | | | | * Fixes #172 |