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

1261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur
f22a494a1e Merge pull request #295 from Knah-Tsaeb/patch-1 
[fix]  #293 - Black thumbnails on picture wall after upgrade
 2015-07-23 15:45:59 +02:00
VirtualTam
caaae9b32b Merge pull request #289 from virtualtam/make-clean 
Makefile: do not call `clean` before `test`
 2015-07-23 00:34:52 +02:00
Knah Tsaeb
bb2948c52a [fix] #293 
Black thumbnails on picture wall after upgrade #293
 2015-07-22 10:39:23 +02:00
VirtualTam
d0ce99e59e Makefile: do not call clean before test 
Fixes #288

Modifications:
 - call `make clean` explicitely to clean the workspace
 - add `make clean` to Travis instructions

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-18 13:43:19 +02:00
VirtualTam
2ac5938b67 Merge pull request #290 from virtualtam/travis-container 
Travis: use the container-based infrastructure
 2015-07-18 13:42:15 +02:00
VirtualTam
39d06fa545 Travis: use the container-based infrastructure 
See http://docs.travis-ci.com/user/migrating-from-legacy/

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-18 13:23:00 +02:00
Arthur
874f858b8f Merge pull request #271 from virtualtam/php53 
PHP: ensure 5.3 compatibility
 2015-07-15 11:05:07 +02:00
VirtualTam
d1e2f8e52c PHP: ensure 5.3 compatibility, refactor timezone utilities 
Relates to #250

Modifications
 - supported version
   - bump required version from 5.1.0 to 5.3.x
   - update README
   - add PHP 5.3 to Travis environments
 - rewrite array declarations: explicitely use array() instead of []
 - move checkPHPVersion to application/Utils.php
 - move timezone functions to application/TimeZone.php
   - cleanup code
   - improve test coverage

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-13 13:06:06 +02:00
VirtualTam
3e25f245f9 Makefile: add a generic rule to run PHPCS against different coding standards 
Relates to #95

Usage
 - list available standards
   $ ./vendor/bin/phpcs -i
 - run PHPCS against a given standard
   $ make PHPCS_<standard>

Examples
 $ make PHPCS_PSR1
 $ make PHPCS_Zend

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-12 23:04:43 +02:00
VirtualTam
5b0ebbc5de Merge pull request #257 from ArthurHoaro/tag-http-referer 
Prevent redirection loop everytime we rely on HTTP_REFERER
 2015-07-12 19:56:13 +02:00
ArthurHoaro
775803a05c Prevent redirection loop everytime we rely on HTTP_REFERER: 
* search tag
  * delete tag
  * pagination
  * display privates only
  * delete link
  * new/edit/cancel link return page

Move location generation to Utils.php + unit tests.

Fixes #256

ninja
 2015-07-12 17:43:13 +02:00
Arthur
1dcbe29611 English mistake cf sebsauvage/Shaarli#221 2015-07-12 15:16:37 +02:00
ArthurHoaro
6ac95d9cf1 Fixes warning 'Undefined index: searchtags' while filtering by tags. 
Happened if there were not any searchtags already present in the query.
 2015-07-12 11:36:42 +02:00
Arthur
7bd3542b1b Merge pull request #262 from ArthurHoaro/dup-tags 
Avoid tag duplicates
 2015-07-12 11:01:24 +02:00
ArthurHoaro
781e8aadea Avoid tag duplicates 
* Prevent duplicate client side with awesomplete
 * Prevent duplicate server side (save_edit processing)

Fixes #261
 2015-07-12 10:34:29 +02:00
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