aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Add Requirements section in README (link to wiki).ArthurHoaro2015-07-241-2/+4
| | | | Fixes #297
* Merge pull request #295 from Knah-Tsaeb/patch-1Arthur2015-07-231-2/+4
|\ | | | | [fix] #293 - Black thumbnails on picture wall after upgrade
| * [fix] #293Knah Tsaeb2015-07-221-2/+4
| | | | | | Black thumbnails on picture wall after upgrade #293
* | Merge pull request #289 from virtualtam/make-cleanVirtualTam2015-07-232-5/+6
|\ \ | |/ |/| Makefile: do not call `clean` before `test`
| * Makefile: do not call `clean` before `test`VirtualTam2015-07-182-5/+6
|/ | | | | | | | | | Fixes #288 Modifications: - call `make clean` explicitely to clean the workspace - add `make clean` to Travis instructions Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #290 from virtualtam/travis-containerVirtualTam2015-07-181-0/+1
|\ | | | | Travis: use the container-based infrastructure
| * Travis: use the container-based infrastructureVirtualTam2015-07-181-0/+1
|/ | | | | | See http://docs.travis-ci.com/user/migrating-from-legacy/ Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* Merge pull request #271 from virtualtam/php53Arthur2015-07-1510-102/+288
|\ | | | | PHP: ensure 5.3 compatibility
| * PHP: ensure 5.3 compatibility, refactor timezone utilitiesVirtualTam2015-07-1310-102/+288
|/ | | | | | | | | | | | | | | | | 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>
* Merge pull request #257 from ArthurHoaro/tag-http-refererVirtualTam2015-07-123-44/+108
|\ | | | | Prevent redirection loop everytime we rely on HTTP_REFERER
| * Prevent redirection loop everytime we rely on HTTP_REFERER:ArthurHoaro2015-07-123-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#221Arthur2015-07-121-1/+1
| |
* | Fixes warning 'Undefined index: searchtags' while filtering by tags.ArthurHoaro2015-07-121-1/+5
| | | | | | | | Happened if there were not any searchtags already present in the query.
* | Merge pull request #262 from ArthurHoaro/dup-tagsArthur2015-07-122-1/+24
|\ \ | | | | | | Avoid tag duplicates
| * | Avoid tag duplicatesArthurHoaro2015-07-122-5/+28
| | | | | | | | | | | | | | | | | | | | | * Prevent duplicate client side with awesomplete * Prevent duplicate server side (save_edit processing) Fixes #261
* | | Merge pull request #268 from ArthurHoaro/dailrss-templateVirtualTam2015-07-112-49/+75
|\ \ \ | | | | | | | | Include the whole <item> in Daily RSS template
| * | | Include the whole <item> in dailyRSSArthurHoaro2015-07-112-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-configVirtualTam2015-07-111-2/+8
|\ \ \ \ | | | | | | | | | | Fix: data/config.php was not imported
| * | | | Fix: data/config.php was not importedVirtualTam2015-07-111-2/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | Relates to #255 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | | Merge pull request #267 from virtualtam/linkdb/private-namesVirtualTam2015-07-103-74/+74
|\ \ \ \ | |/ / / |/| | | LinkDB: prefix private members with an underscore
| * | | LinkDB: prefix private members with an underscoreVirtualTam2015-07-093-74/+74
|/ / / | | | | | | | | | | | | | | | Relates to #95, #218 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | | Merge pull request #255 from ArthurHoaro/configVirtualTam2015-07-093-34/+358
|\ \ \ | |_|/ |/| | All settings are now stored in config.php
| * | All settings are now stored in config.phpArthurHoaro2015-07-093-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-formatVirtualTam2015-07-095-12/+58
|\ \ | | | | | | LinkDB::filterDay(): check input date format
| * | LinkDB::filterDay(): check input date formatVirtualTam2015-07-095-12/+58
|/ / | | | | | | Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | Merge pull request #264 from ArthurHoaro/daily-navVirtualTam2015-07-091-6/+6
|\ \ | |/ |/| Fixes #260: previous/next day links in daily
| * Fixes #260: previous/next day links in dailyArthurHoaro2015-07-081-6/+6
|/ | | | The bug was occuring only if we tried to access to the first day.
* Merge pull request #254 from virtualtam/test/linkdb/datastorenodiscc2015-06-281-10/+4
|\ | | | | LinkDBTest: only check that the datastore is created and non-empty
| * LinkDBTest: only check that the datastore is created and non-emptyVirtualTam2015-06-281-10/+4
|/ | | | | | | Fixes #252 Relates to #238 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* doc: bump php requirement to php 5.4, fixes ↵nodiscc2015-06-271-1/+1
| | | | https://github.com/shaarli/Shaarli/issues/250
* Merge remote-tracking branch 'ArthurHoaro/default-links'nodiscc2015-06-262-13/+17
|\
| * Fixes unit tests: checking datastore filesize instead of hash.ArthurHoaro2015-06-241-7/+7
| | | | | | | | date() makes the hash validation worthless because it changes at every generation.
| * Change fresh install default linkArthurHoaro2015-06-241-6/+10
| | | | | | | | | | | | Fixes #200 Let me know if you want to change anything in the description.
* | Merge remote-tracking branch 'virtualtam/linkdb/remove-globals'nodiscc2015-06-264-35/+40
|\ \
| * | LinkDB: do not access global variablesVirtualTam2015-06-244-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 HTMLnodiscc2015-06-269-233/+443
| |
* | [doc] update CONTRIBUTINGnodiscc2015-06-261-0/+1
| |
* | duplicated id removednicolasm2015-06-261-1/+1
| |
* | awesome.css restored. width bug fixed.nicolasm2015-06-262-0/+6
| |
* | Merge pull request #249 from fbartels/patch-1nodiscc2015-06-261-1/+1
|\ \ | |/ |/| Restore compatibility with php 5.3
| * Restore compatability with php 5.3Felix Bartels2015-06-261-1/+1
|/
* move escape() and sanitizeLink() to application/Utils.phpnodiscc2015-06-242-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 nextnodiscc2015-06-2412-97/+117
|\ | | | | | | | | Conflicts: index.php
| * Working on shaarli/Shaarli#224ArthurHoaro2015-06-2312-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 constructorVirtualTam2015-06-243-20/+59
| | | | | | | | | | | | | | Fixes #236 Relates to #237 Signed-off-by: VirtualTam <virtualtam@flibidi.net>
* | add travis-ci.org build status to READMEnodiscc2015-06-241-1/+1
| |
* | Add link to 'Running unit tests wiki page'nodiscc2015-06-231-0/+1
| | | | | | Fixes https://github.com/shaarli/Shaarli/issues/234
* | Merge remote-tracking branch 'nicolasdanelon/master' into nextnodiscc2015-06-232-7/+7
|\ \
| * | cursor pointer for label (ux improvement)Nicolas Danelon2015-06-231-0/+1
| | |
| * | fix no javascriptNicolas Danelon2015-06-232-6/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 09:40:12 +0000