aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1686 from mruminski/v2Jeremy Benoist2016-02-182-0/+25
|\ | | | | Polish translation
| * Update config.ymlmruminski2016-02-171-0/+1
| | | | | | add Polish
| * Create CraueConfigBundle.pl.ymlmruminski2016-02-171-0/+24
| | | | | | Polish translation
* | Merge pull request #1687 from 0wnrepo/v2Jeremy Benoist2016-02-181-0/+24
|\ \ | |/ |/| Translated another two files into romanian.
| * Translated another two files into romanian.steve2016-02-171-0/+24
| |
* | Create CraueConfigBundle.fa.ymlMasoud Abkenar2016-02-171-0/+24
| |
* | Merge pull request #1680 from wallabag/v2-capistrano-sf3Jeremy Benoist2016-02-171-2/+5
|\ \ | |/ |/| Update Capistrano configuration for symfony3
| * Update Capistrano configuration for symfony3Nicolas Lœuillet2016-02-171-2/+5
| |
* | Translation file for the 'Romanian' language. Also recognised by ro_RO. ↵steve2016-02-171-0/+1
|/ | | | Known in romanian as "Română".
* Added Persian (fa) (فارسی)Masoud Abkenar2016-02-161-0/+1
|
* translate craue config buttonThomas Citharel2016-02-112-0/+6
|
* translation craue_config_panelThomas Citharel2016-02-111-0/+4
|
* CSNicolas Lœuillet2016-02-045-1/+9
|
* Fix #1622: parameter for FosUser confirmationNicolas Lœuillet2016-02-045-1/+5
|
* Merge pull request #1612 from wallabag/v2-settings-pageNicolas Lœuillet2016-02-0412-168/+101
|\ | | | | Settings page
| * Fix Shaarli url traductionJeremy Benoist2016-02-011-1/+1
| |
| * Fix from_email & fos_userJeremy Benoist2016-01-314-0/+8
| |
| * Add new export configJeremy Benoist2016-01-313-1/+9
| |
| * Fix permission to settings pageJeremy Benoist2016-01-311-1/+1
| |
| * We don't need migration yetJeremy Benoist2016-01-312-51/+0
| |
| * Add CraueConfig for internal settingsJeremy Benoist2016-01-3112-131/+140
| |
| * Always include warning messageJeremy Benoist2016-01-315-17/+0
| | | | | | | | We'll remove it later, on the stable release
| * Move default configuration out of parametersJeremy Benoist2016-01-315-28/+4
| | | | | | | | These default configuration value shouldn't be in parameters.yml.
* | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsightJeremy Benoist2016-02-011-1/+1
|\ \ | | | | | | [#1604] First draft to fix SensioLabsInsight report
| * | SensioLabsInsight fixesNicolas Lœuillet2016-01-224-8/+0
| | |
| * | [#1604] First draft to fix SensioLabsInsight reportNicolas Lœuillet2016-01-224-1/+9
| | |
* | | Fix #1635: change database name for test environments (mysql/pgsql)Nicolas Lœuillet2016-02-012-2/+2
| |/ |/|
* | Merge pull request #1629 from wallabag/fixexportformatsNicolas Lœuillet2016-01-245-0/+20
|\ \ | | | | | | fix #1620 and introduce new parameters to export
| * | fix #1620 and introduce new parameters to exportThomas Citharel2016-01-245-0/+20
| | |
* | | Add Turkish translationOgün Karakuş2016-01-241-0/+1
|/ / | | | | | | Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
* / [#1621] Add default address for FosUserNicolas Lœuillet2016-01-231-1/+3
|/
* Update HTML 2FA templateJeremy Benoist2016-01-211-3/+0
| | | | | | Split paragraph in translation Inject wallabag_url for image in HTML template Remove username & password from config_dev.yml (null are already the default value)
* Merge pull request #1584 from wallabag/v2-cleanupJeremy Benoist2016-01-153-0/+25
|\ | | | | some cleanup
| * some cleanup:Nicolas Lœuillet2016-01-153-0/+25
| | | | | | | | | | * move capistrano config files * remove useless files
* | remove flattr on about pageNicolas Lœuillet2016-01-151-1/+0
|/
* Add assets configJeremy Benoist2016-01-151-0/+1
| | | | | To avoid : > Twig_Error_Syntax: Unknown "asset" function in
* Switch to Symfony 3 structureJeremy Benoist2016-01-158-942/+24
|
* Remove some commented codeJeremy Benoist2016-01-152-14/+0
|
* Update bundle & stock fileJeremy Benoist2016-01-158-24/+24
| | | | | | - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler
* Add Docker configuration for Postgres and MariaDBFabien MEURILLON2016-01-101-0/+10
|
* Installation & configuration of Doctrine MigrationsNicolas Lœuillet2016-01-082-0/+7
|
* Remove real consumer keyJeremy Benoist2016-01-024-4/+4
| | | | We should never commit them :)
* Add tagged services for importJeremy Benoist2016-01-021-1/+1
| | | | | | | | | - list services in /import - add url to import service - ImportBundle routing are now prefixed by /import - optimize flush in each import (flushing each 20 contents) - improve design of each import - add more tests
* Rewrote Wallabag v1 importJeremy Benoist2016-01-021-0/+1
|
* Update after previous mergeJeremy Benoist2016-01-021-2/+3
| | | | PR #1443 was merged into this branch to handle all import type in the same place.
* - remove importers configurationNicolas Lœuillet2016-01-021-8/+0
| | | | - add check on userId for findOneByURL for entries
* fix #1502 avoid duplicate entry and store pocket url in configNicolas Lœuillet2016-01-021-0/+8
|
* forgot test parametersNicolas Lœuillet2016-01-023-0/+9
|
* 1st draft for Pocket import via APINicolas Lœuillet2016-01-023-0/+9
|
* form to upload fileNicolas Lœuillet2016-01-021-0/+2
|