aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #169 from NumEricR/entries-heightNicolas Lœuillet2013-08-241-8/+9
|\ \
| * | Fix issue on entries' heightNumEricR2013-08-241-0/+4
| * | CSS clean up againNumEricR2013-08-241-8/+5
* | | Merge pull request #170 from NumEricR/login-buttonNicolas Lœuillet2013-08-243-5/+5
|\ \ \
| * | | Fix login button wordingNumEricR2013-08-243-5/+5
| |/ /
* | | Merge pull request #173 from EliasZ/devNicolas Lœuillet2013-08-243-16/+39
|\ \ \
| * | | config template its import section reflects definesEliasZ2013-08-241-3/+3
| * | | graceful error-handling with imports, define where import files are storedEliasZ2013-08-242-13/+36
* | | | Merge pull request #174 from nicofrand/devNicolas Lœuillet2013-08-241-4/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add IPv4 url support (and others beginning by a digit)nicofrand2013-08-241-1/+1
| * | | Add IPv4 url support (and others beginning by a digit)nicofrand2013-08-241-3/+1
| * | | Add IPv4 url support (and others beginning by a digit)nicofrand2013-08-241-2/+2
|/ / /
* | | resolve conflictsNicolas Lœuillet2013-08-234-41/+38
|\ \ \
| * | | Add SHAARLI support to view templatenicofrand2013-08-231-0/+2
| * | | Revert "Add SHAARLI support to view template"Nicolas Frandeboeuf2013-08-2364-2/+0
| * | | Add SHAARLI support to view templatenicofrand2013-08-2364-0/+2
| * | | Restore config modifications related to #162nicofrand2013-08-231-4/+8
| * | | Clean up the templates markupnicofrand2013-08-235-33/+31
| * | | Clean markupNicolas Frandeboeuf2013-08-231-1/+2
| * | | Revert "Clean markup in templates"Nicolas Frandeboeuf2013-08-2310-45/+261
| * | | Clean markup in templatesNicolas Frandeboeuf2013-08-2310-261/+45
* | | | changes in md filesNicolas Lœuillet2013-08-236-24/+9
| |/ / |/| |
* | | preparing to beta4Nicolas Lœuillet2013-08-232-2/+73
* | | new messages when update / installNicolas Lœuillet2013-08-233-6/+5
* | | new default content in poche.sqliteNicolas Lœuillet2013-08-231-0/+0
* | | text in shaarli linkNicolas Lœuillet2013-08-231-2/+2
* | | encode url to share with twitter / email / shaarliNicolas Lœuillet2013-08-231-4/+6
* | | fix bug #162 links to firefox / chrome / android appsNicolas Lœuillet2013-08-231-4/+10
|/ /
* | notice with poche_version undefined'Nicolas Lœuillet2013-08-231-18/+13
* | gitignoreNicolas Lœuillet2013-08-232-1/+2
* | assets directoryNicolas Lœuillet2013-08-231-0/+0
* | Merge branch 'dev' of github.com:inthepoche/poche into devNicolas Lœuillet2013-08-233-25/+21
|\ \
| * \ Merge pull request #163 from NumEricR/tools-listNicolas Lœuillet2013-08-233-25/+21
| |\ \
| | * | Add textual content on tools linksNumEricR2013-08-233-16/+20
| | * | Fix HTML code of tools listsNumEricR2013-08-232-25/+17
* | | | tabs2spacesNicolas Lœuillet2013-08-231-6/+7
* | | | fix bug #151: HTML entities in titles are encoded twiceNicolas Lœuillet2013-08-232-2/+2
* | | | set shaarli to falseNicolas Lœuillet2013-08-231-1/+1
|/ / /
* | | fix bug #150 Add support of text files by setting a default titleNicolas Lœuillet2013-08-231-1/+1
* | | fix bug #147 add db directory in versionningNicolas Lœuillet2013-08-231-0/+0
|/ /
* | updated german translation, thanks to HLFHNicolas Lœuillet2013-08-232-67/+333
* | Merge pull request #159 from NumEricR/css-cleanupNicolas Lœuillet2013-08-231-65/+55
|\ \
| * | CSS clean up on style.css fileNumEricR2013-08-231-65/+55
* | | Merge pull request #160 from nicofrand/devNicolas Lœuillet2013-08-232-0/+20
|\ \ \ | |/ / |/| |
| * | Fix #157Nicolas Frandeboeuf2013-08-232-0/+20
* | | Merge pull request #154 from nicofrand/devNicolas Lœuillet2013-08-221-2/+9
|\| |
| * | Merge branch 'dev' of https://github.com/nicofrand/poche into devNicolas Frandeboeuf2013-08-227-4/+15
| |\ \ | |/ / |/| |
* | | fix bug #148 Use of undefined constant POCHE_VERSIONNicolas Lœuillet2013-08-203-3/+8
* | | fix bug #112 link to shaarliNicolas Lœuillet2013-08-203-0/+6
* | | typo in gitignoreNicolas Lœuillet2013-08-171-1/+1