aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix for #664 - Missing source url attribute in RSS feedstcit2014-04-241-1/+2
|
* Added default statement for db systemtcit2014-04-231-0/+2
|
* Fix #657 and postgresql problemstcit2014-04-231-3/+3
|
* Added multi-user functionnality in all themestcit2014-04-232-0/+67
|
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devtcit2014-04-2317-29/+190
|\
| * Merge pull request #659 from mariroz/devNicolas Lœuillet2014-04-221-0/+63
| |\ | | | | | | last error: config.inc.default.php missed
| | * last error: config.inc.default.php missedMaryana Rozhankivska2014-04-221-0/+63
| | |
| * | Merge pull request #658 from mariroz/devNicolas Lœuillet2014-04-221-63/+0
| |\| | | | | | | inc/poche/config.inc.php.new removed
| | * inc/poche/config.inc.php.new removedMaryana Rozhankivska2014-04-221-63/+0
| | |
| * | Merge pull request #653 from mariroz/devNicolas Lœuillet2014-04-2215-17/+179
| |\| | | | | | | print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
| | * config.inc.php.new renamed in config.inc.default.phpMaryana Rozhankivska2014-04-223-10/+3
| | |
| | * default config is included after user config to prevent undefined constant ↵Maryana Rozhankivska2014-04-221-0/+1
| | | | | | | | | | | | warning
| | * print view fixed in baggy; print link added; read percent added in default ↵Maryana Rozhankivska2014-04-2213-8/+176
| | | | | | | | | | | | theme; archive and favorite re-factored to be ajax action in article view
| * | Merge pull request #655 from julien-m/patch-2Nicolas Lœuillet2014-04-221-0/+6
| |\ \ | | |/ | |/| parse mobile.lemondeinformatique.fr
| | * parse mobile.lemondeinformatique.frjmlrt2014-04-221-0/+6
| |/ | | | | site_config file created because the title isn't parsed by default for mobile version of lemondeinformatique.fr
| * Merge pull request #643 from wallabag/fix-636Nicolas Lœuillet2014-04-151-12/+5
| |\ | | | | | | [fix] rss feed content type set to text/xml #636
| | * [fix] rss feed content type set to text/xml #636Nicolas Lœuillet2014-04-151-12/+5
| |/
* / 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