aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #262 from ArthurHoaro/dup-tagsArthur2015-07-122-1/+24
|\ \
| * | Avoid tag duplicatesArthurHoaro2015-07-122-5/+28
* | | Merge pull request #268 from ArthurHoaro/dailrss-templateVirtualTam2015-07-112-49/+75
|\ \ \
| * | | Include the whole <item> in dailyRSSArthurHoaro2015-07-112-49/+75
* | | | Merge pull request #269 from virtualtam/fix/read-configVirtualTam2015-07-111-2/+8
|\ \ \ \
| * | | | Fix: data/config.php was not importedVirtualTam2015-07-111-2/+8
|/ / / /
* | | | Merge pull request #267 from virtualtam/linkdb/private-namesVirtualTam2015-07-103-74/+74
|\ \ \ \ | |/ / / |/| | |
| * | | LinkDB: prefix private members with an underscoreVirtualTam2015-07-093-74/+74
|/ / /
* | | Merge pull request #255 from ArthurHoaro/configVirtualTam2015-07-093-34/+358
|\ \ \ | |_|/ |/| |
| * | All settings are now stored in config.phpArthurHoaro2015-07-093-38/+362
| |/
* | Merge pull request #251 from virtualtam/linkdb/date-formatVirtualTam2015-07-095-12/+58
|\ \
| * | LinkDB::filterDay(): check input date formatVirtualTam2015-07-095-12/+58
|/ /
* | Merge pull request #264 from ArthurHoaro/daily-navVirtualTam2015-07-091-6/+6
|\ \ | |/ |/|
| * Fixes #260: previous/next day links in dailyArthurHoaro2015-07-081-6/+6
|/
* Merge pull request #254 from virtualtam/test/linkdb/datastorenodiscc2015-06-281-10/+4
|\
| * LinkDBTest: only check that the datastore is created and non-emptyVirtualTam2015-06-281-10/+4
|/
* doc: bump php requirement to php 5.4, fixes https://github.com/shaarli/Shaarl...nodiscc2015-06-271-1/+1
* 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
| * Change fresh install default linkArthurHoaro2015-06-241-6/+10
* | Merge remote-tracking branch 'virtualtam/linkdb/remove-globals'nodiscc2015-06-264-35/+40
|\ \
| * | LinkDB: do not access global variablesVirtualTam2015-06-244-35/+40
| |/
* | [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 compatability with php 5.3Felix Bartels2015-06-261-1/+1
|/
* move escape() and sanitizeLink() to application/Utils.phpnodiscc2015-06-242-17/+27
* Merge remote-tracking branch 'ArthurHoaro/input-escape' into nextnodiscc2015-06-2412-97/+117
|\
| * Working on shaarli/Shaarli#224ArthurHoaro2015-06-2312-95/+113
* | LinkDB: add 'hidePublicLinks' parameter to the constructorVirtualTam2015-06-243-20/+59
* | 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
* | 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
| * | Update awesomplete.cssNicolas Danelon2015-06-231-1/+0
| * | filter input search responsive fixed (mobile)Nicolas Danelon2015-06-232-2/+8
| |/
* / Page title if there is a single linkArthurHoaro2015-06-231-2/+4
|/
* add tabindex 1/2 to search and tags fieldsnodiscc2015-06-231-2/+3
* Merge remote-tracking branch 'origin/doc-contributing'nodiscc2015-06-231-0/+80
|\
| * Create CONTIBUTING.mdnodiscc2015-06-101-0/+80
* | Merge remote-tracking branch 'ArthurHoaro/daily-date' into nextnodiscc2015-06-232-2/+2
|\ \
| * | Daily page: date format in templateArthurHoaro2015-06-192-2/+2
| |/
* | Merge remote-tracking branch 'nicolasdanelon/master' into nextnodiscc2015-06-232-4/+30
|\ \
| * | fix login desktopnda2015-06-191-0/+10
| * | login enhance for mobilenda2015-06-192-4/+20
| |/
* | re-add readDb() missing from previous mergenodiscc2015-06-231-0/+7
* | Merge remote-tracking branch 'virtualtam/test/link-db' into nextnodiscc2015-06-2312-264/+1231
|\ \