aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1868 from wallabag/v2-tagrule-baggyJeremy Benoist2016-04-073-84/+156
|\ | | | | Remove keyboard shortcut and add tagging rule panel in baggy
| * Remove keybaord shortcut and add tagging rule panel in baggyNicolas Lœuillet2016-04-053-84/+156
| |
* | Lock ocramius/proxy-managerJeremy Benoist2016-04-061-1/+2
| | | | | | To avoid problem with PHP < 7.0
* | Documentation about wallabag APINicolas Lœuillet2016-04-0616-3/+486
|/
* Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cliJeremy Benoist2016-04-052-2/+2
|\ | | | | Add production environment for CLI import
| * Add production environment for CLI importNicolas Lœuillet2016-04-052-2/+2
| |
* | Merge pull request #1861 from wallabag/v2-round-estimated-timeJeremy Benoist2016-04-052-11/+9
|\ \ | |/ |/| Round estimated time and add reading speed for Baggy
| * Round estimated time and add reading speed for BaggyNicolas Lœuillet2016-04-052-11/+9
| |
* | Merge pull request #1856 from wallabag/v2-doc-import-wllbg1-cliThomas Citharel2016-04-052-0/+44
|\ \ | |/ |/| Documentation about wallabag v1 CLI import
| * Documentation about wallabag v1 CLI importNicolas Lœuillet2016-04-052-0/+44
|/
* Add migrate link in french documentationNicolas Lœuillet2016-04-051-0/+1
|
* Add migrate link in english documentationNicolas Lœuillet2016-04-051-0/+1
|
* Merge pull request #1840 from wallabag/v2-fix-archive-page-titleJeremy Benoist2016-04-0410-10/+10
|\ | | | | Fix Archive page title translation
| * Fix Archive page title translationNicolas Lœuillet2016-04-0410-10/+10
|/
* Merge pull request #1835 from wallabag/v2-prepare-v22.0.0Thomas Citharel2016-04-0310-44/+23
|\ | | | | :rocket: Prepare v2.0.0 :birthday:
| * Remove useless CSSNicolas Lœuillet2016-04-031-14/+0
| |
| * :rocket: Prepare v2.0.0 :birthday:Nicolas Lœuillet2016-04-039-30/+23
| |
* | Merge pull request #1838 from wallabag/v2-hide-searchThomas Citharel2016-04-032-4/+4
|\ \ | |/ |/| Hide search buttons
| * Hide search buttonsNicolas Lœuillet2016-04-032-4/+4
|/
* Merge pull request #1832 from wallabag/pdo-driverNicolas Lœuillet2016-04-021-3/+4
|\ | | | | Check selected PDO driver on install
| * Check selected PDO driver on installJeremy Benoist2016-04-011-3/+4
|/ | | | Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.
* Merge branch 'Quent-in-v2' into v2Jeremy Benoist2016-04-014-0/+456
|\
| * Add Occitan to available languageJeremy Benoist2016-04-011-0/+1
| |
| * Fix quotes for OCJeremy Benoist2016-04-011-6/+6
| |
| * Merge pull request #3 from j0k3r/patch-1Quent-in2016-04-011-3/+3
| |\ | | | | | | Fix simple quote
| | * Fix simple quoteJeremy Benoist2016-04-011-3/+3
| |/
| * Occitan versionQuent-in2016-04-011-0/+2
| |
| * OC versionQuent-in2016-04-011-0/+29
| |
| * Update oc versionQuent-in2016-04-011-194/+194
| | | | | | Complet
| * Trad. OccitanQuent-in2016-03-301-0/+424
|/ | | WIP
* Merge pull request #1822 from jami7/patch-4Jeremy Benoist2016-03-291-4/+4
|\ | | | | Update messages.es.yml
| * Update messages.es.ymljami72016-03-281-4/+4
|/
* Merge pull request #1820 from wallabag/import-refactoNicolas Lœuillet2016-03-288-316/+361
|\ | | | | Refacto wallabag import
| * Refacto wallabag importJeremy Benoist2016-03-286-308/+353
| | | | | | | | | | Use an abstract class to store all common action from wallabag vX import. Move specificity in v1 & v2 import.
| * Remove some complexicity in InstallCommandJeremy Benoist2016-03-282-8/+8
| |
* | Merge pull request #1821 from jami7/patch-3Thomas Citharel2016-03-281-10/+10
|\ \ | |/ |/| Update messages.es.yml
| * Update messages.es.ymljami72016-03-281-10/+10
|/
* Merge pull request #1805 from wallabag/v2-assign-comma-tagsNicolas Lœuillet2016-03-283-15/+40
|\ | | | | Fix #1768 Split tags with commas from UI
| * Simplify tag creation from entryJeremy Benoist2016-03-273-21/+40
| | | | | | | | | | Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job. So it simplify the controller.
| * Split tags with commas from UINicolas Loeuillet2016-03-211-2/+8
| |
* | Merge pull request #1819 from wallabag/cleanupNicolas Lœuillet2016-03-2817-92/+247
|\ \ | | | | | | Some cleanup
| * | Tags were not imported in wallabag v2 importJeremy Benoist2016-03-276-54/+58
| | | | | | | | | | | | Also, simplify exportAs matching format
| * | Fix some Scrutinizer issuesJeremy Benoist2016-03-279-31/+182
| | |
| * | Some cleanupJeremy Benoist2016-03-273-7/+7
| | | | | | | | | | | | | | | - travis tabulation - extra namespace definition in entities
* | | Merge pull request #1818 from wallabag/v2-add-migration-docNicolas Lœuillet2016-03-285-0/+80
|\ \ \ | |/ / |/| | add migration docs
| * | add migration docsThomas Citharel2016-03-275-0/+80
|/ /
* | Merge pull request #1817 from mruminski/v2Nicolas Lœuillet2016-03-271-1/+1
|\ \ | | | | | | Correct translation
| * | Correct translationMateusz Rumiński2016-03-261-1/+1
|/ /
* | Fix Indentation problemMateusz Rumiński2016-03-261-15/+15
| |
* | Update messages.pl.ymlMateusz Rumiński2016-03-251-219/+219
| | | | | | Complete polish translation of messages file