Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/dev' into dev | Jean-Christophe Saad-Dupuy | 2013-10-07 | 10 | -204/+65 |
|\ | |||||
| * | what this f* F? | Nicolas Lœuillet | 2013-10-07 | 1 | -2/+2 |
| * | bug fix #268: move POCHE_VERSION in index.php and change the name to avoid co... | Nicolas Lœuillet | 2013-10-07 | 7 | -158/+6 |
| * | bug fix #266: make installation steps easier | Nicolas Lœuillet | 2013-10-07 | 3 | -44/+57 |
| * | delete href | Nicolas Lœuillet | 2013-10-07 | 1 | -1/+1 |
| * | missing } | Nicolas Lœuillet | 2013-10-07 | 1 | -1/+1 |
| * | Merge pull request #264 from jcsaaddupuy/dev | Nicolas Lœuillet | 2013-10-07 | 2 | -1/+2 |
| |\ | |||||
| * \ | Merge pull request #261 from NumEricR/toolbar-height | Nicolas Lœuillet | 2013-10-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix #255 : increase article toolbar height if necessary | NumEricR | 2013-10-05 | 1 | -1/+1 |
| |/ / | |||||
* | | | Added support for custom SSL port | Jean-Christophe Saad-Dupuy | 2013-10-07 | 2 | -4/+7 |
* | | | Merge branch 'dev' into custom_port | Jean-Christophe Saad-Dupuy | 2013-10-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed typo | Jean-Christophe Saad-Dupuy | 2013-10-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Added support for custom ssl port | Jean-Christophe Saad-Dupuy | 2013-10-07 | 1 | -2/+6 |
|/ / | |||||
* | | Embeded jquery 2.0.3 dependancie | Nicolas Lœuillet | 2013-10-06 | 139 | -156/+1614 |
|\| | |||||
| * | change doc link1.0.0 | Nicolas Lœuillet | 2013-10-03 | 1 | -1/+1 |
| * | change export link | Nicolas Lœuillet | 2013-10-03 | 2 | -9/+1 |
| * | reopen #219 when archive last poched links from a page, redirect to an other ... | Nicolas Lœuillet | 2013-10-03 | 1 | -5/+0 |
| * | remove print_r | Nicolas Lœuillet | 2013-10-03 | 1 | -1/+0 |
| * | Merge branch 'dev' of git://github.com/tcitworld/poche into tcitworld-dev | Nicolas Lœuillet | 2013-10-03 | 2 | -7/+8 |
| |\ | |||||
| | * | Changed Flattr Caching System | Thomas Citharel | 2013-09-27 | 2 | -7/+8 |
| | * | Changed url's encryption from base64 to md5 | Thomas Citharel | 2013-09-26 | 1 | -3/+3 |
| * | | preparing to 1.0.0 | Nicolas Lœuillet | 2013-10-03 | 1 | -1/+1 |
| * | | bug fix #227: Deleting element in archive redirect to home | Nicolas Lœuillet | 2013-10-03 | 1 | -1/+1 |
| * | | bug fix #219: when archive last poched links from a page, redirect to an othe... | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+6 |
| * | | change instructions messages | Nicolas Lœuillet | 2013-10-03 | 1 | -6/+9 |
| * | | change reading time displaying | Nicolas Lœuillet | 2013-10-03 | 12 | -25/+5 |
| * | | embed themes | Nicolas Lœuillet | 2013-10-03 | 125 | -0/+1533 |
| * | | remove themes | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+0 |
| * | | embed themes with poche | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+0 |
| * | | remove themes | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+0 |
| * | | change submodule & gitignore | Nicolas Lœuillet | 2013-10-03 | 2 | -8/+0 |
| * | | site_config is now embedded with poche | Nicolas Lœuillet | 2013-10-03 | 10 | -77/+52 |
| * | | Merge pull request #250 from NumEricR/dl-export | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+8 |
| |\ \ | |||||
| | * | | Add .htaccess file to force download of poche export | NumEricR | 2013-09-28 | 1 | -0/+8 |
| |/ / | |||||
| * | | Merge pull request #245 from NumEricR/themes-list | Nicolas Lœuillet | 2013-09-27 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Avoid ".git" option in themes list of config page | NumEricR | 2013-09-26 | 1 | -1/+1 |
| |/ / | |||||
| * | | change import files constants | Nicolas Lœuillet | 2013-09-21 | 1 | -3/+7 |
| * | | bug fix #229: theme not stored on updated poches | Nicolas Lœuillet | 2013-09-21 | 1 | -3/+11 |
| * | | unactivate debug | Nicolas Lœuillet | 2013-09-21 | 1 | -1/+1 |
| * | | upgrading themes1.0-beta5.2 | Nicolas Lœuillet | 2013-09-20 | 1 | -0/+0 |
| |/ | |||||
| * | fix bug #225: blank page on article page1.0-beta5.1 | Nicolas Lœuillet | 2013-09-20 | 1 | -9/+9 |
| * | remove define.inc.php | Nicolas Lœuillet | 2013-09-20 | 1 | -39/+0 |
* | | Merge pull request #226 from inthepoche/dev1.0-beta5 | Nicolas Lœuillet | 2013-09-20 | 76 | -1677/+1294 |
|\| | |||||
| * | update themes submodule | Nicolas Lœuillet | 2013-09-20 | 1 | -0/+0 |
| * | update themes | Nicolas Lœuillet | 2013-09-20 | 1 | -0/+0 |
| * | update themes | Nicolas Lœuillet | 2013-09-20 | 2 | -1/+4 |
| * | remove themes | Nicolas Lœuillet | 2013-09-20 | 2 | -4/+1 |
| * | add themes | Nicolas Lœuillet | 2013-09-20 | 2 | -1/+4 |
| * | remove themes | Nicolas Lœuillet | 2013-09-20 | 1 | -0/+0 |
| * | remove themes | Nicolas Lœuillet | 2013-09-20 | 1 | -4/+1 |