Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makefile: add a generic rule to run PHPCS against different coding standards | VirtualTam | 2015-07-12 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | 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> | ||||
* | Merge pull request #257 from ArthurHoaro/tag-http-referer | VirtualTam | 2015-07-12 | 3 | -44/+108 |
|\ | | | | | Prevent redirection loop everytime we rely on HTTP_REFERER | ||||
| * | Prevent redirection loop everytime we rely on HTTP_REFERER: | ArthurHoaro | 2015-07-12 | 3 | -44/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | English mistake cf sebsauvage/Shaarli#221 | Arthur | 2015-07-12 | 1 | -1/+1 |
| | | |||||
* | | Fixes warning 'Undefined index: searchtags' while filtering by tags. | ArthurHoaro | 2015-07-12 | 1 | -1/+5 |
| | | | | | | | | Happened if there were not any searchtags already present in the query. | ||||
* | | Merge pull request #262 from ArthurHoaro/dup-tags | Arthur | 2015-07-12 | 2 | -1/+24 |
|\ \ | | | | | | | Avoid tag duplicates | ||||
| * | | Avoid tag duplicates | ArthurHoaro | 2015-07-12 | 2 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | * Prevent duplicate client side with awesomplete * Prevent duplicate server side (save_edit processing) Fixes #261 | ||||
* | | | Merge pull request #268 from ArthurHoaro/dailrss-template | VirtualTam | 2015-07-11 | 2 | -49/+75 |
|\ \ \ | | | | | | | | | Include the whole <item> in Daily RSS template | ||||
| * | | | Include the whole <item> in dailyRSS | ArthurHoaro | 2015-07-11 | 2 | -49/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom date format and title in templates. Also a bit of code style review. Fixes #182 | ||||
* | | | | Merge pull request #269 from virtualtam/fix/read-config | VirtualTam | 2015-07-11 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | Fix: data/config.php was not imported | ||||
| * | | | | Fix: data/config.php was not imported | VirtualTam | 2015-07-11 | 1 | -2/+8 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Relates to #255 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | | Merge pull request #267 from virtualtam/linkdb/private-names | VirtualTam | 2015-07-10 | 3 | -74/+74 |
|\ \ \ \ | |/ / / |/| | | | LinkDB: prefix private members with an underscore | ||||
| * | | | LinkDB: prefix private members with an underscore | VirtualTam | 2015-07-09 | 3 | -74/+74 |
|/ / / | | | | | | | | | | | | | | | | Relates to #95, #218 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | | Merge pull request #255 from ArthurHoaro/config | VirtualTam | 2015-07-09 | 3 | -34/+358 |
|\ \ \ | |_|/ |/| | | All settings are now stored in config.php | ||||
| * | | All settings are now stored in config.php | ArthurHoaro | 2015-07-09 | 3 | -38/+362 |
| |/ | | | | | | | | | | | | | | | | | | | 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). | ||||
* | | Merge pull request #251 from virtualtam/linkdb/date-format | VirtualTam | 2015-07-09 | 5 | -12/+58 |
|\ \ | | | | | | | LinkDB::filterDay(): check input date format | ||||
| * | | LinkDB::filterDay(): check input date format | VirtualTam | 2015-07-09 | 5 | -12/+58 |
|/ / | | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | Merge pull request #264 from ArthurHoaro/daily-nav | VirtualTam | 2015-07-09 | 1 | -6/+6 |
|\ \ | |/ |/| | Fixes #260: previous/next day links in daily | ||||
| * | Fixes #260: previous/next day links in daily | ArthurHoaro | 2015-07-08 | 1 | -6/+6 |
|/ | | | | The bug was occuring only if we tried to access to the first day. | ||||
* | Merge pull request #254 from virtualtam/test/linkdb/datastore | nodiscc | 2015-06-28 | 1 | -10/+4 |
|\ | | | | | LinkDBTest: only check that the datastore is created and non-empty | ||||
| * | LinkDBTest: only check that the datastore is created and non-empty | VirtualTam | 2015-06-28 | 1 | -10/+4 |
|/ | | | | | | | Fixes #252 Relates to #238 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | doc: bump php requirement to php 5.4, fixes ↵ | nodiscc | 2015-06-27 | 1 | -1/+1 |
| | | | | https://github.com/shaarli/Shaarli/issues/250 | ||||
* | Merge remote-tracking branch 'ArthurHoaro/default-links' | nodiscc | 2015-06-26 | 2 | -13/+17 |
|\ | |||||
| * | Fixes unit tests: checking datastore filesize instead of hash. | ArthurHoaro | 2015-06-24 | 1 | -7/+7 |
| | | | | | | | | date() makes the hash validation worthless because it changes at every generation. | ||||
| * | Change fresh install default link | ArthurHoaro | 2015-06-24 | 1 | -6/+10 |
| | | | | | | | | | | | | Fixes #200 Let me know if you want to change anything in the description. | ||||
* | | Merge remote-tracking branch 'virtualtam/linkdb/remove-globals' | nodiscc | 2015-06-26 | 4 | -35/+40 |
|\ \ | |||||
| * | | LinkDB: do not access global variables | VirtualTam | 2015-06-24 | 4 | -35/+40 |
| |/ | | | | | | | | | | | | | | | | | | | | | Relates to #218 Removes "hidden" access to the following variables: - $GLOBALS['config']['datastore'] - PHPPREFIX - PHPSUFFIX Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | [doc] sync doc with latest wiki, build HTML | nodiscc | 2015-06-26 | 9 | -233/+443 |
| | | |||||
* | | [doc] update CONTRIBUTING | nodiscc | 2015-06-26 | 1 | -0/+1 |
| | | |||||
* | | duplicated id removed | nicolasm | 2015-06-26 | 1 | -1/+1 |
| | | |||||
* | | awesome.css restored. width bug fixed. | nicolasm | 2015-06-26 | 2 | -0/+6 |
| | | |||||
* | | Merge pull request #249 from fbartels/patch-1 | nodiscc | 2015-06-26 | 1 | -1/+1 |
|\ \ | |/ |/| | Restore compatibility with php 5.3 | ||||
| * | Restore compatability with php 5.3 | Felix Bartels | 2015-06-26 | 1 | -1/+1 |
|/ | |||||
* | move escape() and sanitizeLink() to application/Utils.php | nodiscc | 2015-06-24 | 2 | -17/+27 |
| | | | | 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 next | nodiscc | 2015-06-24 | 12 | -97/+117 |
|\ | | | | | | | | | Conflicts: index.php | ||||
| * | Working on shaarli/Shaarli#224 | ArthurHoaro | 2015-06-23 | 12 | -95/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 constructor | VirtualTam | 2015-06-24 | 3 | -20/+59 |
| | | | | | | | | | | | | | | Fixes #236 Relates to #237 Signed-off-by: VirtualTam <virtualtam@flibidi.net> | ||||
* | | add travis-ci.org build status to README | nodiscc | 2015-06-24 | 1 | -1/+1 |
| | | |||||
* | | Add link to 'Running unit tests wiki page' | nodiscc | 2015-06-23 | 1 | -0/+1 |
| | | | | | | Fixes https://github.com/shaarli/Shaarli/issues/234 | ||||
* | | Merge remote-tracking branch 'nicolasdanelon/master' into next | nodiscc | 2015-06-23 | 2 | -7/+7 |
|\ \ | |||||
| * | | cursor pointer for label (ux improvement) | Nicolas Danelon | 2015-06-23 | 1 | -0/+1 |
| | | | |||||
| * | | fix no javascript | Nicolas Danelon | 2015-06-23 | 2 | -6/+0 |
| | | | |||||
| * | | Update awesomplete.css | Nicolas Danelon | 2015-06-23 | 1 | -1/+0 |
| | | | |||||
| * | | filter input search responsive fixed (mobile) | Nicolas Danelon | 2015-06-23 | 2 | -2/+8 |
| |/ | |||||
* / | Page title if there is a single link | ArthurHoaro | 2015-06-23 | 1 | -2/+4 |
|/ | | | | Fixes #232 | ||||
* | add tabindex 1/2 to search and tags fields | nodiscc | 2015-06-23 | 1 | -2/+3 |
| | |||||
* | 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. |