Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2013-10-08 | 5 | -5/+20 |
|\ | |||||
| * | Merge pull request #273 from jcsaaddupuy/emded-dependencies | Nicolas Lœuillet | 2013-10-08 | 3 | -2/+10 |
| |\ | | | | | | | Emdeded Roboto webfont | ||||
| | * | Merge branch 'dev' into emded-dependencies | Jean-Christophe Saad-Dupuy | 2013-10-08 | 4 | -2/+101 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #272 from jcsaaddupuy/custom_ssl_port | Nicolas Lœuillet | 2013-10-08 | 2 | -3/+10 |
| |\ \ | | | | | | | | | Custom ssl port | ||||
| | | * | Added font-face linked to local font | Jean-Christophe Saad-Dupuy | 2013-10-08 | 1 | -1/+10 |
| | | | | |||||
| | | * | Removed google font link | Jean-Christophe Saad-Dupuy | 2013-10-08 | 1 | -1/+0 |
| | | | | |||||
| | | * | Added Roboto font from ↵ | Jean-Christophe Saad-Dupuy | 2013-10-08 | 1 | -0/+0 |
| | |/ | | | | | | | | | | https://themes.googleusercontent.com/static/fonts/roboto/v9/2UX7WLTfW3W8TclTUvlFyQ.woff | ||||
| | * | Merge remote branch 'upstream/dev' into dev | Jean-Christophe Saad-Dupuy | 2013-10-07 | 10 | -204/+65 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: themes/default/_head.twig | ||||
| | * | | 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 |
| | |/ / | |||||
* | / / | add czech locale, thanks to @dstancl | Nicolas Lœuillet | 2013-10-08 | 2 | -0/+233 |
|/ / / | |||||
* | | | bug fix: changing password was buggy | Nicolas Lœuillet | 2013-10-07 | 1 | -2/+2 |
| | | | |||||
* | | | bug fix #215: change language from config screen | Nicolas Lœuillet | 2013-10-07 | 3 | -0/+99 |
| |/ |/| | |||||
* | | 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 ↵ | Nicolas Lœuillet | 2013-10-07 | 7 | -158/+6 |
| | | | | | | | | conflicts when updating | ||||
* | | 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 |
|\| | | | | | Embeding jquery | ||||
| * | Embeded jquery 2.0.3 dependancie | Nicolas Lœuillet | 2013-10-06 | 139 | -156/+1614 |
| |\ | |||||
| * \ | Merge pull request #226 from inthepoche/dev1.0-beta5 | Nicolas Lœuillet | 2013-09-20 | 76 | -1677/+1294 |
| |\ \ | | | | | | | | | beta5 | ||||
| * \ \ | Merge pull request #181 from inthepoche/dev | Nicolas Lœuillet | 2013-08-25 | 84 | -376/+21095 |
| |\ \ \ | | | | | | | | | | | beta4 | ||||
* | \ \ \ | 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 | ||||
| * | | | | Fix #255 : increase article toolbar height if necessary | NumEricR | 2013-10-05 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | page | ||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | From md5(url) to the ID of an article. Easier and faster. | ||||
| * | | | | Changed url's encryption from base64 to md5 | Thomas Citharel | 2013-09-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #243. md5 hashes are only coded on 32 hexadecimal characters, so it won't make too long file names. | ||||
* | | | | | 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 ↵ | Nicolas Lœuillet | 2013-10-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | other page | ||||
* | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Force download on poche export | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 |
| | | | | |