Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Added multi-user functionnality in all themes | tcit | 2014-04-23 | 2 | -0/+67 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | tcit | 2014-04-23 | 17 | -29/+190 | |
|\| | ||||||
| * | Merge pull request #659 from mariroz/dev | Nicolas Lœuillet | 2014-04-22 | 1 | -0/+63 | |
| |\ | | | | | | | last error: config.inc.default.php missed | |||||
| | * | last error: config.inc.default.php missed | Maryana Rozhankivska | 2014-04-22 | 1 | -0/+63 | |
| | | | ||||||
| * | | Merge pull request #658 from mariroz/dev | Nicolas Lœuillet | 2014-04-22 | 1 | -63/+0 | |
| |\| | | | | | | | inc/poche/config.inc.php.new removed | |||||
| | * | inc/poche/config.inc.php.new removed | Maryana Rozhankivska | 2014-04-22 | 1 | -63/+0 | |
| | | | ||||||
| * | | Merge pull request #653 from mariroz/dev | Nicolas Lœuillet | 2014-04-22 | 15 | -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.php | Maryana Rozhankivska | 2014-04-22 | 3 | -10/+3 | |
| | | | ||||||
| | * | default config is included after user config to prevent undefined constant ↵ | Maryana Rozhankivska | 2014-04-22 | 1 | -0/+1 | |
| | | | | | | | | | | | | warning | |||||
| | * | print view fixed in baggy; print link added; read percent added in default ↵ | Maryana Rozhankivska | 2014-04-22 | 13 | -8/+176 | |
| | | | | | | | | | | | | theme; archive and favorite re-factored to be ajax action in article view | |||||
| * | | Merge pull request #655 from julien-m/patch-2 | Nicolas Lœuillet | 2014-04-22 | 1 | -0/+6 | |
| |\ \ | | |/ | |/| | parse mobile.lemondeinformatique.fr | |||||
| | * | parse mobile.lemondeinformatique.fr | jmlrt | 2014-04-22 | 1 | -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-636 | Nicolas Lœuillet | 2014-04-15 | 1 | -12/+5 | |
| |\ | | | | | | | [fix] rss feed content type set to text/xml #636 | |||||
| | * | [fix] rss feed content type set to text/xml #636 | Nicolas Lœuillet | 2014-04-15 | 1 | -12/+5 | |
| |/ | ||||||
* / | Fixed Multi-user system | tcit | 2014-04-23 | 4 | -1/+128 | |
|/ | ||||||
* | Merge pull request #642 from jplock/patch-2 | Nicolas Lœuillet | 2014-04-14 | 1 | -7/+7 | |
|\ | | | | | Added IF NOT EXISTS | |||||
| * | Added IF NOT EXISTS | Justin Plock | 2014-04-14 | 1 | -7/+7 | |
|/ | ||||||
* | Merge pull request #637 from Bubbendorf/dev | Nicolas Lœuillet | 2014-04-13 | 2 | -50/+27 | |
|\ | | | | | Improvements on french translation | |||||
| * | Improved french translation | Amaury Carrade | 2014-04-13 | 2 | -50/+27 | |
|/ | ||||||
* | Merge pull request #635 from DmitrySandalov/dev | Nicolas Lœuillet | 2014-04-11 | 1 | -0/+0 | |
|\ | | | | | added missing image to dmagenta theme | |||||
| * | added missing image to dmagenta theme | Dmitry Sandalov | 2014-04-12 | 1 | -0/+0 | |
|/ | ||||||
* | 1.6.1 version | Nicolas Lœuillet | 2014-04-11 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #633 from mariroz/dev | Nicolas Lœuillet | 2014-04-11 | 2 | -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 Rozhankivska | 2014-04-11 | 2 | -8/+16 | |
| | | | | | | | | allowd in content now. | |||||
* | | Merge pull request #632 from mariroz/dev | Nicolas Lœuillet | 2014-04-11 | 2 | -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 Rozhankivska | 2014-04-11 | 2 | -3/+10 | |
|/ | ||||||
* | Merge pull request #623 from wallabag/fix-610 | Nicolas Lœuillet | 2014-04-08 | 1 | -8/+8 | |
|\ | | | | | Fix display problem with smartphone and Baggy #610 | |||||
| * | responsive for search form #610 | Nicolas Lœuillet | 2014-04-08 | 1 | -5/+5 | |
| | | ||||||
| * | [fix] display problem with smartphone and Baggy #610 | Nicolas Lœuillet | 2014-04-08 | 1 | -3/+3 | |
|/ | ||||||
* | Merge pull request #622 from wallabag/fix-612 | Nicolas Lœuillet | 2014-04-08 | 1 | -1/+1 | |
|\ | | | | | [fix] Escap key displays save a link form #612 | |||||
| * | [fix] Escap key displays save a link form #612 | Nicolas Lœuillet | 2014-04-08 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #621 from wallabag/fix-613 | Nicolas Lœuillet | 2014-04-08 | 4 | -18/+26 | |
|\ | | | | | can't close search popup with the cross picture #613 | |||||
| * | can't close search popup with the cross picture #613 | Nicolas Lœuillet | 2014-04-08 | 4 | -18/+26 | |
| | | ||||||
* | | Merge pull request #618 from mariroz/dev | Nicolas Lœuillet | 2014-04-08 | 1 | -57/+56 | |
|\ \ | | | | | | | remove duplicates by import; code formatting changes: tabs replaced with spaces | |||||
| * \ | code formatting changes: tabs replaced with spaces, some other small ↵ | Maryana Rozhankivska | 2014-04-08 | 6 | -684/+723 | |
| |\ \ | |/ / |/| | | | | | formatting enhancements | |||||
* | | | Merge pull request #614 from wallabag/fix-host-getpocheurl | Nicolas Lœuillet | 2014-04-07 | 1 | -1/+3 | |
|\ \ \ | |_|/ |/| | | [fix] with some config, http host is different | |||||
| * | | [fix] with some config, http host is different | Nicolas Lœuillet | 2014-04-07 | 1 | -1/+3 | |
|/ / | ||||||
* | | Merge pull request #611 from wallabag/fix-french-locale | Nicolas Lœuillet | 2014-04-07 | 2 | -44/+72 | |
|\ \ | | | | | | | update french locale, thx to @goofy-bz and @Draky50110 #596 | |||||
| * | | update french locale, thx to @goofy-bz and @Draky50110 #596 | Nicolas Lœuillet | 2014-04-07 | 2 | -44/+72 | |
| | | | ||||||
* | | | Merge pull request #609 from wallabag/fix-desciption-typo | Nicolas Lœuillet | 2014-04-06 | 2 | -422/+420 | |
|\ \ \ | |/ / |/| | | remove unnecessary variable declaration | |||||
| * | | remove unnecessary variable declaration | Nicolas Lœuillet | 2014-04-06 | 2 | -422/+420 | |
|/ / | ||||||
* | | Merge pull request #606 from wallabag/fix-556 | Nicolas Lœuillet | 2014-04-06 | 2 | -203/+216 | |
|\ \ | | | | | | | in RSS feed, add link to wallabag URL #556 | |||||
| * | | in RSS feed, add link to wallabag URL #556 | Nicolas Lœuillet | 2014-04-06 | 2 | -203/+216 | |
|/ / | ||||||
* | | Merge pull request #605 from wallabag/fix-604 | Nicolas Lœuillet | 2014-04-06 | 1 | -1/+1 | |
|\ \ | | | | | | | [fix] Use of undefined constant ATOM #604 | |||||
| * | | [fix] Use of undefined constant ATOM #604 | Nicolas Lœuillet | 2014-04-06 | 1 | -1/+1 | |
|/ / | ||||||
| * | remove duplicates by import, code changes: tabs replaced with spaces | Maryana Rozhankivska | 2014-04-08 | 1 | -36/+37 | |
|/ | ||||||
* | Merge pull request #603 from mariroz/dev | Nicolas Lœuillet | 2014-04-05 | 1 | -1/+1 | |
|\ | | | | | postgres sequence error fix, issue #602 | |||||
| * | postgres sequence error fix, issue #602 | Maryana Rozhankivska | 2014-04-05 | 1 | -1/+1 | |
| | | ||||||
* | | Fix to #600 | tcitworld | 2014-04-04 | 1 | -4/+6 | |
| | | ||||||
* | | Changed copyright to 2014 | tcitworld | 2014-04-04 | 1 | -1/+1 | |
| | | | | | | Happy new year ! |