aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix estimated reading time in material viewNicolas Lœuillet2016-04-101-2/+1
| | | | Fix #1893
* Merge pull request #1824 from wallabag/v2-alternative-envJeremy Benoist2016-04-083-11/+12
|\ | | | | Remove SMTP configuration environment overrides
| * Add documentationNicolas Lœuillet2016-04-082-0/+10
| |
| * Remove SMTP configuration environment overridesMathieu Bruyen2016-03-291-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMTP configuration has been added in #1518 to use ParameterHandle's env-map. But Symfony actually has a native way of allowing parameters to be overriden from environment so rather than having to define a mapping for each possible parameter, users can define any override in parameters.yml: > parameters: > database_host: %WALLABAG_DB_HOST% and define an environment variable SYMFONY__WALLABAG_DB_HOST. Links: env-map: https://github.com/Incenteev/ParameterHandler#using-environment-variables-to-set-the-parameters Symfony external parameters: http://symfony.com/doc/current/cookbook/configuration/external_parameters.html
* | Merge pull request #1879 from wallabag/v2-tag-field-positionJeremy Benoist2016-04-081-4/+4
|\ \ | | | | | | Move tag form in Material theme
| * | Move tag form in Material themeNicolas Lœuillet2016-04-071-4/+4
| | |
* | | Merge pull request #1884 from wallabag/nicosomb-patch-1Jeremy Benoist2016-04-081-1/+1
|\ \ \ | | | | | | | | Change the installation method in issue template
| * | | Change the installation method in issue templateNicolas Lœuillet2016-04-081-1/+1
|/ / /
* | | Merge pull request #1804 from wallabag/j0k3r-patch-1Nicolas Lœuillet2016-04-081-1/+16
|\ \ \ | | | | | | | | Force user-agent for iansommerville.com
| * | | Force user-agent for iansommerville.comJeremy Benoist2016-03-181-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the default User Agent, the website returns a 403. By forcing the User Agent for this domain, we got the proper behavior: a 200 Since we can't _append_ new user agent to the default graby configuration, we need to rewrite all the default config + the new one. Fix #1801
* | | | 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
| | |