aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2013-10-085-5/+20
|\
| * Merge pull request #273 from jcsaaddupuy/emded-dependenciesNicolas Lœuillet2013-10-083-2/+10
| |\ | | | | | | Emdeded Roboto webfont
| | * Merge branch 'dev' into emded-dependenciesJean-Christophe Saad-Dupuy2013-10-084-2/+101
| | |\ | | |/ | |/|
| * | Merge pull request #272 from jcsaaddupuy/custom_ssl_portNicolas Lœuillet2013-10-082-3/+10
| |\ \ | | | | | | | | Custom ssl port
| | | * Added font-face linked to local fontJean-Christophe Saad-Dupuy2013-10-081-1/+10
| | | |
| | | * Removed google font linkJean-Christophe Saad-Dupuy2013-10-081-1/+0
| | | |
| | | * Added Roboto font from ↵Jean-Christophe Saad-Dupuy2013-10-081-0/+0
| | |/ | | | | | | | | | https://themes.googleusercontent.com/static/fonts/roboto/v9/2UX7WLTfW3W8TclTUvlFyQ.woff
| | * Merge remote branch 'upstream/dev' into devJean-Christophe Saad-Dupuy2013-10-0710-204/+65
| | |\ | | | | | | | | | | | | | | | | Conflicts: themes/default/_head.twig
| | * | Added support for custom SSL portJean-Christophe Saad-Dupuy2013-10-072-4/+7
| | | |
| | * | Merge branch 'dev' into custom_portJean-Christophe Saad-Dupuy2013-10-071-1/+1
| | |\ \
| | | * | Fixed typoJean-Christophe Saad-Dupuy2013-10-071-1/+1
| | | | |
| | * | | Added support for custom ssl portJean-Christophe Saad-Dupuy2013-10-071-2/+6
| | |/ /
* | / / add czech locale, thanks to @dstanclNicolas Lœuillet2013-10-082-0/+233
|/ / /
* | | bug fix: changing password was buggyNicolas Lœuillet2013-10-071-2/+2
| | |
* | | bug fix #215: change language from config screenNicolas Lœuillet2013-10-073-0/+99
| |/ |/|
* | what this f* F?Nicolas Lœuillet2013-10-071-2/+2
| |
* | bug fix #268: move POCHE_VERSION in index.php and change the name to avoid ↵Nicolas Lœuillet2013-10-077-158/+6
| | | | | | | | conflicts when updating
* | bug fix #266: make installation steps easierNicolas Lœuillet2013-10-073-44/+57
| |
* | delete hrefNicolas Lœuillet2013-10-071-1/+1
| |
* | missing }Nicolas Lœuillet2013-10-071-1/+1
| |
* | Merge pull request #264 from jcsaaddupuy/devNicolas Lœuillet2013-10-072-1/+2
|\| | | | | Embeding jquery
| * Embeded jquery 2.0.3 dependancieNicolas Lœuillet2013-10-06139-156/+1614
| |\
| * \ Merge pull request #226 from inthepoche/dev1.0-beta5Nicolas Lœuillet2013-09-2076-1677/+1294
| |\ \ | | | | | | | | beta5
| * \ \ Merge pull request #181 from inthepoche/devNicolas Lœuillet2013-08-2584-376/+21095
| |\ \ \ | | | | | | | | | | beta4
* | \ \ \ Merge pull request #261 from NumEricR/toolbar-heightNicolas Lœuillet2013-10-061-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix #255 : increase article toolbar height if necessary
| * | | | Fix #255 : increase article toolbar height if necessaryNumEricR2013-10-051-1/+1
|/ / / /
* | | | change doc link1.0.0Nicolas Lœuillet2013-10-031-1/+1
| | | |
* | | | change export linkNicolas Lœuillet2013-10-032-9/+1
| | | |
* | | | reopen #219 when archive last poched links from a page, redirect to an other ↵Nicolas Lœuillet2013-10-031-5/+0
| | | | | | | | | | | | | | | | page
* | | | remove print_rNicolas Lœuillet2013-10-031-1/+0
| | | |
* | | | Merge branch 'dev' of git://github.com/tcitworld/poche into tcitworld-devNicolas Lœuillet2013-10-032-7/+8
|\ \ \ \
| * | | | Changed Flattr Caching SystemThomas Citharel2013-09-272-7/+8
| | | | | | | | | | | | | | | | | | | | From md5(url) to the ID of an article. Easier and faster.
| * | | | Changed url's encryption from base64 to md5Thomas Citharel2013-09-261-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.0Nicolas Lœuillet2013-10-031-1/+1
| | | | |
* | | | | bug fix #227: Deleting element in archive redirect to homeNicolas Lœuillet2013-10-031-1/+1
| | | | |
* | | | | bug fix #219: when archive last poched links from a page, redirect to an ↵Nicolas Lœuillet2013-10-031-0/+6
| | | | | | | | | | | | | | | | | | | | other page
* | | | | change instructions messagesNicolas Lœuillet2013-10-031-6/+9
| | | | |
* | | | | change reading time displayingNicolas Lœuillet2013-10-0312-25/+5
| | | | |
* | | | | embed themesNicolas Lœuillet2013-10-03125-0/+1533
| | | | |
* | | | | remove themesNicolas Lœuillet2013-10-031-0/+0
| | | | |
* | | | | embed themes with pocheNicolas Lœuillet2013-10-031-0/+0
| | | | |
* | | | | remove themesNicolas Lœuillet2013-10-031-0/+0
| | | | |
* | | | | change submodule & gitignoreNicolas Lœuillet2013-10-032-8/+0
| | | | |
* | | | | site_config is now embedded with pocheNicolas Lœuillet2013-10-0310-77/+52
| | | | |
* | | | | Merge pull request #250 from NumEricR/dl-exportNicolas Lœuillet2013-10-031-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Force download on poche export
| * | | | | Add .htaccess file to force download of poche exportNumEricR2013-09-281-0/+8
|/ / / / /
* | | | | Merge pull request #245 from NumEricR/themes-listNicolas Lœuillet2013-09-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Avoid ".git" option in themes list of config page
| * | | | | Avoid ".git" option in themes list of config pageNumEricR2013-09-261-1/+1
|/ / / / /
* | | | | change import files constantsNicolas Lœuillet2013-09-211-3/+7
| | | | |
* | | | | bug fix #229: theme not stored on updated pochesNicolas Lœuillet2013-09-211-3/+11
| | | | |