Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | resolve conflicts | Nicolas Lœuillet | 2013-08-23 | 4 | -41/+38 | |
|\ \ | ||||||
| * | | Add SHAARLI support to view template | nicofrand | 2013-08-23 | 1 | -0/+2 | |
| * | | Revert "Add SHAARLI support to view template" | Nicolas Frandeboeuf | 2013-08-23 | 64 | -2/+0 | |
| * | | Add SHAARLI support to view template | nicofrand | 2013-08-23 | 64 | -0/+2 | |
| * | | Restore config modifications related to #162 | nicofrand | 2013-08-23 | 1 | -4/+8 | |
| * | | Clean up the templates markup | nicofrand | 2013-08-23 | 5 | -33/+31 | |
| * | | Clean markup | Nicolas Frandeboeuf | 2013-08-23 | 1 | -1/+2 | |
| * | | Revert "Clean markup in templates" | Nicolas Frandeboeuf | 2013-08-23 | 10 | -45/+261 | |
| * | | Clean markup in templates | Nicolas Frandeboeuf | 2013-08-23 | 10 | -261/+45 | |
* | | | changes in md files | Nicolas Lœuillet | 2013-08-23 | 6 | -24/+9 | |
| |/ |/| | ||||||
* | | preparing to beta4 | Nicolas Lœuillet | 2013-08-23 | 2 | -2/+73 | |
* | | new messages when update / install | Nicolas Lœuillet | 2013-08-23 | 3 | -6/+5 | |
* | | new default content in poche.sqlite | Nicolas Lœuillet | 2013-08-23 | 1 | -0/+0 | |
* | | text in shaarli link | Nicolas Lœuillet | 2013-08-23 | 1 | -2/+2 | |
* | | encode url to share with twitter / email / shaarli | Nicolas Lœuillet | 2013-08-23 | 1 | -4/+6 | |
* | | fix bug #162 links to firefox / chrome / android apps | Nicolas Lœuillet | 2013-08-23 | 1 | -4/+10 | |
|/ | ||||||
* | notice with poche_version undefined' | Nicolas Lœuillet | 2013-08-23 | 1 | -18/+13 | |
* | gitignore | Nicolas Lœuillet | 2013-08-23 | 2 | -1/+2 | |
* | assets directory | Nicolas Lœuillet | 2013-08-23 | 1 | -0/+0 | |
* | Merge branch 'dev' of github.com:inthepoche/poche into dev | Nicolas Lœuillet | 2013-08-23 | 3 | -25/+21 | |
|\ | ||||||
| * | Merge pull request #163 from NumEricR/tools-list | Nicolas Lœuillet | 2013-08-23 | 3 | -25/+21 | |
| |\ | ||||||
| | * | Add textual content on tools links | NumEricR | 2013-08-23 | 3 | -16/+20 | |
| | * | Fix HTML code of tools lists | NumEricR | 2013-08-23 | 2 | -25/+17 | |
* | | | tabs2spaces | Nicolas Lœuillet | 2013-08-23 | 1 | -6/+7 | |
* | | | fix bug #151: HTML entities in titles are encoded twice | Nicolas Lœuillet | 2013-08-23 | 2 | -2/+2 | |
* | | | set shaarli to false | Nicolas Lœuillet | 2013-08-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | fix bug #150 Add support of text files by setting a default title | Nicolas Lœuillet | 2013-08-23 | 1 | -1/+1 | |
* | | fix bug #147 add db directory in versionning | Nicolas Lœuillet | 2013-08-23 | 1 | -0/+0 | |
|/ | ||||||
* | updated german translation, thanks to HLFH | Nicolas Lœuillet | 2013-08-23 | 2 | -67/+333 | |
* | Merge pull request #159 from NumEricR/css-cleanup | Nicolas Lœuillet | 2013-08-23 | 1 | -65/+55 | |
|\ | ||||||
| * | CSS clean up on style.css file | NumEricR | 2013-08-23 | 1 | -65/+55 | |
* | | Merge pull request #160 from nicofrand/dev | Nicolas Lœuillet | 2013-08-23 | 2 | -0/+20 | |
|\ \ | |/ |/| | ||||||
| * | Fix #157 | Nicolas Frandeboeuf | 2013-08-23 | 2 | -0/+20 | |
* | | Merge pull request #154 from nicofrand/dev | Nicolas Lœuillet | 2013-08-22 | 1 | -2/+9 | |
|\| | ||||||
| * | Merge branch 'dev' of https://github.com/nicofrand/poche into dev | Nicolas Frandeboeuf | 2013-08-22 | 7 | -4/+15 | |
| |\ | |/ |/| | ||||||
* | | fix bug #148 Use of undefined constant POCHE_VERSION | Nicolas Lœuillet | 2013-08-20 | 3 | -3/+8 | |
* | | fix bug #112 link to shaarli | Nicolas Lœuillet | 2013-08-20 | 3 | -0/+6 | |
* | | typo in gitignore | Nicolas Lœuillet | 2013-08-17 | 1 | -1/+1 | |
* | | Merge branch 'dev' of github.com:inthepoche/poche into dev | Nicolas Lœuillet | 2013-08-17 | 0 | -0/+0 | |
|\ \ | ||||||
* | | | gitignore | Nicolas Lœuillet | 2013-08-17 | 1 | -1/+1 | |
| | * | Fix #149 | Nicolas Frandeboeuf | 2013-08-22 | 1 | -2/+9 | |
| | * | Merge pull request #141 from inthepoche/dev1.0-beta3 | Nicolas Lœuillet | 2013-08-17 | 21 | -149/+827 | |
| | |\ | | |/ | |/| | ||||||
| * | | Merge pull request #140 from inthepoche/master | Nicolas Lœuillet | 2013-08-17 | 0 | -0/+0 | |
|/| | | |/ | ||||||
| * | Merge pull request #132 from inthepoche/dev | Nicolas Lœuillet | 2013-08-12 | 14 | -22/+54 | |
| |\ | ||||||
| * | | installation | Nicolas Lœuillet | 2013-08-08 | 2 | -1/+5 | |
| * | | Merge pull request #109 from inthepoche/dev | Nicolas Lœuillet | 2013-08-08 | 101 | -3281/+3733 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'dev'0.3 | Nicolas Lœuillet | 2013-07-31 | 18 | -1101/+1331 | |
| |\ \ \ | ||||||
| * | | | | typo in readme | Nicolas Lœuillet | 2013-07-31 | 1 | -1/+1 | |
| * | | | | google groups link | Nicolas Lœuillet | 2013-07-31 | 1 | -1/+1 | |
* | | | | | typo | Nicolas Lœuillet | 2013-08-16 | 1 | -1/+1 |