aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fixed Multi-user systemtcit2014-04-234-1/+128
|
* Merge pull request #642 from jplock/patch-2Nicolas Lœuillet2014-04-141-7/+7
|\ | | | | Added IF NOT EXISTS
| * Added IF NOT EXISTSJustin Plock2014-04-141-7/+7
|/
* Merge pull request #637 from Bubbendorf/devNicolas Lœuillet2014-04-132-50/+27
|\ | | | | Improvements on french translation
| * Improved french translationAmaury Carrade2014-04-132-50/+27
|/
* Merge pull request #635 from DmitrySandalov/devNicolas Lœuillet2014-04-111-0/+0
|\ | | | | added missing image to dmagenta theme
| * added missing image to dmagenta themeDmitry Sandalov2014-04-121-0/+0
|/
* 1.6.1 versionNicolas Lœuillet2014-04-111-1/+1
|
* Merge pull request #633 from mariroz/devNicolas Lœuillet2014-04-112-8/+16
|\ | | | | error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now.
| * error with empty content by import fixed. Also youtube and vimeo videos are ↵Maryana Rozhankivska2014-04-112-8/+16
| | | | | | | | allowd in content now.
* | Merge pull request #632 from mariroz/devNicolas Lœuillet2014-04-112-3/+10
|\| | | | | logging by import added; error by creation table if exists in postgresql...
| * logging by import added; error by creation table if exists in postgresql fixed.Maryana Rozhankivska2014-04-112-3/+10
|/
* Merge pull request #623 from wallabag/fix-610Nicolas Lœuillet2014-04-081-8/+8
|\ | | | | Fix display problem with smartphone and Baggy #610
| * responsive for search form #610Nicolas Lœuillet2014-04-081-5/+5
| |
| * [fix] display problem with smartphone and Baggy #610Nicolas Lœuillet2014-04-081-3/+3
|/
* Merge pull request #622 from wallabag/fix-612Nicolas Lœuillet2014-04-081-1/+1
|\ | | | | [fix] Escap key displays save a link form #612
| * [fix] Escap key displays save a link form #612Nicolas Lœuillet2014-04-081-1/+1
|/
* Merge pull request #621 from wallabag/fix-613Nicolas Lœuillet2014-04-084-18/+26
|\ | | | | can't close search popup with the cross picture #613
| * can't close search popup with the cross picture #613Nicolas Lœuillet2014-04-084-18/+26
| |
* | Merge pull request #618 from mariroz/devNicolas Lœuillet2014-04-081-57/+56
|\ \ | | | | | | remove duplicates by import; code formatting changes: tabs replaced with spaces
| * \ code formatting changes: tabs replaced with spaces, some other small ↵Maryana Rozhankivska2014-04-086-684/+723
| |\ \ | |/ / |/| | | | | formatting enhancements
* | | Merge pull request #614 from wallabag/fix-host-getpocheurlNicolas Lœuillet2014-04-071-1/+3
|\ \ \ | |_|/ |/| | [fix] with some config, http host is different
| * | [fix] with some config, http host is differentNicolas Lœuillet2014-04-071-1/+3
|/ /
* | Merge pull request #611 from wallabag/fix-french-localeNicolas Lœuillet2014-04-072-44/+72
|\ \ | | | | | | update french locale, thx to @goofy-bz and @Draky50110 #596
| * | update french locale, thx to @goofy-bz and @Draky50110 #596Nicolas Lœuillet2014-04-072-44/+72
| | |
* | | Merge pull request #609 from wallabag/fix-desciption-typoNicolas Lœuillet2014-04-062-422/+420
|\ \ \ | |/ / |/| | remove unnecessary variable declaration
| * | remove unnecessary variable declarationNicolas Lœuillet2014-04-062-422/+420
|/ /
* | Merge pull request #606 from wallabag/fix-556Nicolas Lœuillet2014-04-062-203/+216
|\ \ | | | | | | in RSS feed, add link to wallabag URL #556
| * | in RSS feed, add link to wallabag URL #556Nicolas Lœuillet2014-04-062-203/+216
|/ /
* | Merge pull request #605 from wallabag/fix-604Nicolas Lœuillet2014-04-061-1/+1
|\ \ | | | | | | [fix] Use of undefined constant ATOM #604
| * | [fix] Use of undefined constant ATOM #604Nicolas Lœuillet2014-04-061-1/+1
|/ /
| * remove duplicates by import, code changes: tabs replaced with spacesMaryana Rozhankivska2014-04-081-36/+37
|/
* Merge pull request #603 from mariroz/devNicolas Lœuillet2014-04-051-1/+1
|\ | | | | postgres sequence error fix, issue #602
| * postgres sequence error fix, issue #602Maryana Rozhankivska2014-04-051-1/+1
| |
* | Fix to #600tcitworld2014-04-041-4/+6
| |
* | Changed copyright to 2014tcitworld2014-04-041-1/+1
| | | | | | Happy new year !
* | [add] link on config page to fetch contentNicolas Lœuillet2014-04-032-0/+2
| |
* | yeah, 1.6, one year after the 1st commitNicolas Lœuillet2014-04-031-1/+1
|/
* import w/o cron: fix of "click to finish import" in baggy themeMaryana Rozhankivska2014-04-031-1/+3
|
* import w/o cron: explanation addedMaryana Rozhankivska2014-04-032-2/+2
|
* import w/o cron: error in url fixMaryana Rozhankivska2014-04-031-1/+1
|
* import w/o cronMaryana Rozhankivska2014-04-032-323/+46
|
* import without cronMaryana Rozhankivska2014-04-0210-48/+61
|\
| * Important fixes for search engine (thx @mariroz)tcit2014-04-027-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | So sorry for the mess... :( * search only in users' own articles * sanitized what is searched * display what is searched * pagination, sorting available when searching * use existing function to query db * bad encoding caracters fixed * link to JQuery into default theme, no longer in each theme * some spaces instead of tabs
* | import without cronMaryana Rozhankivska2014-04-029-262/+352
|/
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-03-306-14/+7
|\
| * Merge pull request #588 from mariroz/devNicolas Lœuillet2014-03-306-14/+7
| |\ | | | | | | fix of bug with default theme constant
| | * fix of bug with default theme constantMaryana Rozhankivska2014-03-286-14/+7
| | |
* | | oops, restore @tcitworld commit. I'm so tiredNicolas Lœuillet2014-03-301-10/+58
|/ /
* | [fix] undefined vars in install scriptNicolas Lœuillet2014-03-301-56/+8
| |