Commit graph

1446 commits

Author SHA1 Message Date
VirtualTam
bba021defc Merge pull request #268 from ArthurHoaro/dailrss-template
Include the whole <item> in Daily RSS template
2015-07-11 19:09:52 +02:00
VirtualTam
1b73f35ebf Merge pull request #269 from virtualtam/fix/read-config
Fix: data/config.php was not imported
2015-07-11 12:48:24 +02:00
ArthurHoaro
f3b8f9f0f8 Include the whole <item> in dailyRSS
Allow custom date format and title in templates.

Also a bit of code style review.

Fixes #182
2015-07-11 10:25:25 +02:00
VirtualTam
50c9a12ee6 Fix: data/config.php was not imported
Relates to #255

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-07-11 00:12:13 +02:00
VirtualTam
49ca756950 Merge pull request #267 from virtualtam/linkdb/private-names
LinkDB: prefix private members with an underscore
2015-07-10 17:43:00 +02:00
VirtualTam
07b6fa750b LinkDB: prefix private members with an underscore
Relates to #95, #218

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-07-09 21:46:01 +02:00
VirtualTam
e92f1ba59e Merge pull request #255 from ArthurHoaro/config
All settings are now stored in config.php
2015-07-09 21:34:46 +02:00
ArthurHoaro
dd484b90b1 All settings are now stored in config.php
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).
2015-07-09 20:46:03 +02:00
VirtualTam
7f1dfd1c12 Merge pull request #251 from virtualtam/linkdb/date-format
LinkDB::filterDay(): check input date format
2015-07-09 01:00:40 +02:00
VirtualTam
9186ab9594 LinkDB::filterDay(): check input date format
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-07-09 00:44:19 +02:00
VirtualTam
46d83c20d7 Merge pull request #264 from ArthurHoaro/daily-nav
Fixes #260: previous/next day links in daily
2015-07-09 00:16:07 +02:00
ArthurHoaro
f3db3774f9 Fixes #260: previous/next day links in daily
The bug was occuring only if we tried to access to the first day.
2015-07-08 17:12:06 +02:00
nodiscc
eee711c0a8 Merge pull request #254 from virtualtam/test/linkdb/datastore
LinkDBTest: only check that the datastore is created and non-empty
2015-06-28 15:53:27 +02:00
VirtualTam
0037fbe1e0 LinkDBTest: only check that the datastore is created and non-empty
Fixes #252
Relates to #238

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-06-28 14:53:26 +02:00
nodiscc
fe4e8839b3 doc: bump php requirement to php 5.4, fixes https://github.com/shaarli/Shaarli/issues/250 2015-06-27 16:30:54 +02:00
nodiscc
d72ae3d7e8 Merge remote-tracking branch 'ArthurHoaro/default-links' 2015-06-26 22:03:25 +02:00
nodiscc
2fbadc3c63 Merge remote-tracking branch 'virtualtam/linkdb/remove-globals' 2015-06-26 22:03:10 +02:00
nodiscc
da9b0e3e80 [doc] sync doc with latest wiki, build HTML 2015-06-26 21:58:07 +02:00
nodiscc
927a84119c [doc] update CONTRIBUTING 2015-06-26 21:58:07 +02:00
nicolasm
eae648d4fd duplicated id removed 2015-06-26 21:58:07 +02:00
nicolasm
41145f7050 awesome.css restored. width bug fixed. 2015-06-26 21:57:12 +02:00
nodiscc
d257f25c96 Merge pull request #249 from fbartels/patch-1
Restore compatibility with php 5.3
2015-06-26 21:49:18 +02:00
Felix Bartels
ddfc400465 Restore compatability with php 5.3 2015-06-26 16:57:07 +02:00
VirtualTam
9c8752a206 LinkDB: do not access global variables
Relates to #218

Removes "hidden" access to the following variables:
 - $GLOBALS['config']['datastore']
 - PHPPREFIX
 - PHPSUFFIX

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-06-24 23:26:52 +02:00
ArthurHoaro
30e6f1ca2f Fixes unit tests: checking datastore filesize instead of hash.
date() makes the hash validation worthless because it changes at every generation.
2015-06-24 11:58:01 +02:00
ArthurHoaro
598376d4cf Change fresh install default link
Fixes #200

Let me know if you want to change anything in the description.
2015-06-24 11:58:00 +02:00
nodiscc
64bc92e3ac move escape() and sanitizeLink() to application/Utils.php
prevents 'PHP Fatal error:  Call to undefined function sanitizeLink() in Shaarli/application/LinkDB.php on line 255' in tests
2015-06-24 01:08:30 +02:00
nodiscc
eaefcba724 Merge remote-tracking branch 'ArthurHoaro/input-escape' into next
Conflicts:
	index.php
2015-06-24 00:51:38 +02:00
VirtualTam
9f15ca9ee7 LinkDB: add 'hidePublicLinks' parameter to the constructor
Fixes #236
Relates to #237

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2015-06-24 00:26:59 +02:00
nodiscc
ae63027010 add travis-ci.org build status to README 2015-06-24 00:17:28 +02:00
nodiscc
b6a88fab55 Add link to 'Running unit tests wiki page'
Fixes https://github.com/shaarli/Shaarli/issues/234
2015-06-23 20:51:16 +02:00
nodiscc
4c68c20cdd Merge remote-tracking branch 'nicolasdanelon/master' into next 2015-06-23 20:45:15 +02:00
Nicolas Danelon
38eb1e7770 cursor pointer for label (ux improvement) 2015-06-23 15:32:23 -03:00
Nicolas Danelon
504a425409 fix no javascript 2015-06-23 15:30:13 -03:00
ArthurHoaro
c68da3ffbf Page title if there is a single link
Fixes #232
2015-06-23 20:22:02 +02:00
ArthurHoaro
5f85fcd863 Working on shaarli/Shaarli#224
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.
2015-06-23 16:35:36 +02:00
Nicolas Danelon
3d713bd18f Update awesomplete.css 2015-06-23 11:22:11 -03:00
Nicolas Danelon
e6cd88bbc0 filter input search responsive fixed (mobile) 2015-06-23 11:03:11 -03:00
nodiscc
0923a2bc1b add tabindex 1/2 to search and tags fields 2015-06-23 15:32:45 +02:00
nodiscc
e88368518d Merge remote-tracking branch 'origin/doc-contributing' 2015-06-23 15:11:17 +02:00
nodiscc
4a5827ff5a Merge remote-tracking branch 'ArthurHoaro/daily-date' into next 2015-06-23 15:07:03 +02:00
nodiscc
adb1d6c213 Merge remote-tracking branch 'nicolasdanelon/master' into next 2015-06-23 15:03:01 +02:00
nodiscc
578a84bda0 re-add readDb() missing from previous merge 2015-06-23 14:57:54 +02:00
nodiscc
38a0c256d2 Merge remote-tracking branch 'virtualtam/test/link-db' into next
Conflicts:
	index.php
2015-06-23 14:38:43 +02:00
nodiscc
0fe36414c8 Merge remote-tracking branch 'ArthurHoaro/search-tag-awesomplete' into next 2015-06-23 14:18:31 +02:00
nodiscc
7d338fa531 Merge remote-tracking branch 'virtualtam/travis' into next 2015-06-23 14:18:04 +02:00
nda
25c46408a3 fix login desktop 2015-06-19 17:42:16 -03:00
nda
f30aa976e1 login enhance for mobile 2015-06-19 17:37:38 -03:00
ArthurHoaro
4de71445d3 Daily page: date format in template
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.
2015-06-19 20:23:58 +02:00
VirtualTam
ca74886f30 LinkDB: move to a proper file, add test coverage
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>
2015-06-11 00:45:45 +02:00