Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
690 commits 8 branches 1 tag 12 MiB
Commit graph

690 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
465266243f Don't redirect to ?post if ?addlink is reached while logged out 2016-05-11 22:10:31 +02:00
ArthurHoaro
5046bcb6ab Fix startsWith and endsWith case 2016-05-10 23:31:41 +02:00
Arthur
d95533778d Merge pull request #557 from ArthurHoaro/remove-delicious 
Remove delicious from Shaarli description
 2016-05-10 20:11:41 +02:00
ArthurHoaro
70860f30d5 Remove delicious from Shaarli description 2016-05-08 18:58:59 +02:00
VirtualTam
00be05aaf5 Merge pull request #554 from virtualtam/fix/bookmark-export 
Export: allow prepending notes with the Shaarli instance's URL
 2016-05-06 21:50:55 +02:00
ArthurHoaro
85c4bdc235 Prefill the login field when the authentication has failed 2016-05-06 20:03:10 +02:00
ArthurHoaro
dbcd06e988 Reindent the login template 2016-05-06 19:58:19 +02:00
VirtualTam
bb4a23aa86 Export: allow prepending notes with the Shaarli instance's URL 
Relates to #102

Additions:
- application:
  - export: allow prepending note permalinks with the instance's URL
  - test coverage

Modifications:
- export template: switch to an HTML form
  - link selection (all/private/public)
  - prepend note permalinks with the instance's URL

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-05-06 16:12:46 +02:00
Arthur
6275a65969 Merge pull request #552 from shaarli/readme-doc-plugins 
add link to plugins doc
 2016-05-05 14:41:20 +02:00
nodiscc
d8bf246357 add link to plugins doc 2016-05-05 14:37:19 +02:00
Arthur
501939622a Merge pull request #553 from ArthurHoaro/typo 
typo
 2016-05-05 13:31:13 +02:00
ArthurHoaro
caa69b5853 typo 2016-05-05 13:28:43 +02:00
Arthur
86deafe0ff Merge pull request #551 from ArthurHoaro/hotfix/timezone 
Use correct 'UTC' timezone
 2016-05-05 13:21:36 +02:00
ArthurHoaro
12ff86c961 Use correct 'UTC' timezone 2016-05-03 20:09:24 +02:00
Arthur
47be060983 Merge pull request #532 from ArthurHoaro/hotfix/title-retrieve-the-return 
Fixes #531 - Title retrieving is failing with multiple use case
 2016-05-03 19:53:57 +02:00
ArthurHoaro
ce7b0b6480 Fixes #531 - Title retrieving is failing with multiple use case 
see https://github.com/shaarli/Shaarli/issues/531 for details
 2016-05-03 19:51:29 +02:00
Arthur
5a63c34f3a Merge pull request #550 from kalvn/master 
Renames Awesomeplete dollar variable to avoid conflicts with jQuery
 2016-05-03 19:23:15 +02:00
kalvn
69a1a90c27 Renames Awesomeplete dollar variable to avoid conflicts with jQuery 2016-05-03 19:05:36 +02:00
Arthur
fa72470d5d Merge pull request #539 from daniellowtw/bugfix/array_filter-messes-with-keys 
Fix error when filtering search tags
 2016-04-14 14:48:00 +01:00
Arthur
62a5ba083d Merge pull request #540 from ArthurHoaro/doc/update20160414 
Update docs from Wiki
 2016-04-14 14:25:50 +01:00
ArthurHoaro
5409ade28c Update docs from Wiki 2016-04-14 15:18:25 +02:00
D Low
20f89623c0 Fix error when filtering search tags 
Arrays are key-value maps. We should reindex the array after a filter
since we are using the key and count to do array access in filterTags.
An example would be searching for "foo, bar", after the array filter,
our array is actually (0 -> foo, 2 -> bar) which will cause an error
when trying to access $searchtags[1].
 2016-04-14 00:10:39 +01:00
VirtualTam
9f400b0dad Merge pull request #538 from virtualtam/fix/bookmark-export 
Refactor Netscape bookmark exporting
 2016-04-12 23:48:00 +02:00
VirtualTam
cd5327bee8 Refactor Netscape bookmark exporting 
Relates to https://github.com/shaarli/netscape-bookmark-parser/issues/5

Fixes:
- respect the Netscape bookmark format "specification"

Modifications:
- [application] introduce the NetscapeBookmarkUtils class
- [template] export           - improve formatting, rename export selection parameter
- [template] export.bookmarks - template for Netscape exports
- [tests] bookmark filtering, additional field generation

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-04-10 21:28:04 +02:00
VirtualTam
745304c842 Merge pull request #537 from virtualtam/tests/dependencies 
Tests: update PHPUnit to 4.8.x
 2016-04-10 01:17:43 +02:00
VirtualTam
129793b537 Tests: update PHPUnit to 4.8.x 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2016-04-10 01:13:09 +02:00
Arthur
9ad2950deb Merge pull request #524 from ArthurHoaro/hotfix/redirectorurl 
Fixes #480: add an option to urlencode redirector URL
 2016-04-09 16:55:39 +02:00
ArthurHoaro
043eae70c4 Fixes #480: add an option to urlencode redirector URL 
* New config: `$GLOBALS['config']['REDIRECTOR_URLENCODE']` (default `true`).
  * Parameter added to LinkDB constructor.
  * Fixes a bug with urlencode and escaped url.
  * In `index.php`, LinkDB is now instanciate once for `importFile()` and `showDaily()`.
  * TU
 2016-04-09 16:52:32 +02:00
Arthur
9486a2e929 Merge pull request #525 from ArthurHoaro/plugins/feeds-markdown2 
Process feeds content with Markdown
 2016-04-09 16:35:41 +02:00
Arthur
a1703c44c6 Merge pull request #527 from ArthurHoaro/hotfix/tagcloud-size 
Fixes #526: bad font size separator in tagcloud with some locale
 2016-04-09 16:35:14 +02:00
ArthurHoaro
b0128609f4 Fixes #526: bad font size separator in tagcloud with some locale 
* Force the number format with number_format().
      * Reduce the size deciment number to 2.
 2016-03-31 18:01:05 +02:00
VirtualTam
11609d9fd8 Merge pull request #522 from ArthurHoaro/hotfix/readershaare 
Refactor and rebase #380: Firefox reader view links
 2016-03-30 19:31:19 +02:00
ArthurHoaro
635d38c241 Process feeds content with Markdown 2016-03-26 17:13:58 +01:00
ArthurHoaro
5f143b72ea Remove dev cache disabling 2016-03-26 16:59:22 +01:00
Arthur
1a84bf1e2b Merge pull request #520 from ArthurHoaro/plugins/nomarkdown 
Markdown: Add the 'meta-tag' `.nomarkdown` which prevent a shaare fro…
 2016-03-26 16:46:04 +01:00
ArthurHoaro
340252ae5d Update markdown plugin README documentation 
* Add the `.nomarkdown` section.
  * Update misleading statements.
 2016-03-26 16:43:14 +01:00
ArthurHoaro
c9da01e749 Refactor and rebase #380: Firefox reader view links 
Fixes #366
Closes #380
 2016-03-26 16:26:23 +01:00
Arthur
f66a1990e5 Merge pull request #515 from ArthurHoaro/template-feeds 
Refactor RSS feeds generation, and do it through templates
 2016-03-25 19:20:55 +01:00
ArthurHoaro
528a6f8a23 Refactor filter in LinkDB 
* search type now carried by LinkDB in order to factorize code between different search sources.
  * LinkDB->filter split in 3 method: filterSearch, filterHash, filterDay (we know what type of filter is needed).
  * filterHash now throw a LinkNotFoundException if it doesn't exist: internal implementation choice, still displays a 404.
  * Smallhash regex has been rewritten.
  * Unit tests update
 2016-03-25 19:17:59 +01:00
ArthurHoaro
ee88a4bcc2 Makes escape a recursive function which handle array of strings 2016-03-25 19:17:59 +01:00
ArthurHoaro
89baf23ddf FeedBuilder unit tests 2016-03-25 19:17:59 +01:00
ArthurHoaro
82e3680203 Create a FeedBuilder class which build data for both ATOM and RSS feed. 2016-03-25 19:17:55 +01:00
Kevin Canévet
ecd051905f Fix issue 366, Problem when shaaring a link in Reader View of Firefox. 2016-03-24 08:34:47 +01:00
VirtualTam
b2764886c7 Merge pull request #521 from ArthurHoaro/hotfix/404login 
Use generateLocation to set the redirection in login (and don't escape the url)
 2016-03-24 00:27:15 +01:00
ArthurHoaro
e15f08d72a Use generateLocation to set the redirection in login (and don't escape the url) 2016-03-21 19:06:46 +01:00
ArthurHoaro
3ce20d9e84 Markdown: Add the 'meta-tag' .nomarkdown which prevent a shaare from being parsed with markdown 
Also add the tag in tag list in edit_link, so it will appear on autocompletion.
 2016-03-21 18:46:34 +01:00
ArthurHoaro
d4542fdb0d Reword the ENABLE_RSS_PERMALINKS in the settings. 2016-03-18 19:13:48 +01:00
ArthurHoaro
bcd078bf0a Plugin: add render_feed hook and call it while generating ATOM and RSS feed. 
Create an example of the new hook in the demo plugin.
 2016-03-18 19:13:48 +01:00
ArthurHoaro
e67712ba0f Refactor showRSS, and make it use the RSS template 2016-03-18 19:13:48 +01:00
ArthurHoaro
69c474b966 Refactor showAtom, and make it use the ATOM template 
Minor changes:

  * Fix the date which was in a invalid format.
  * Avoid empty categories (tags).
  * Use the locale to set the language
 2016-03-18 19:13:48 +01:00