aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/UserBundle
Commit message (Expand)AuthorAgeFilesLines
* Re-use FOSUser master branchJeremy Benoist2016-11-221-1/+1
* Use the correct templateJeremy Benoist2016-11-221-1/+1
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-033-10/+11
|\
| * Merge pull request #2519 from Jibec/masterJeremy Benoist2016-11-021-4/+4
| |\
| | * Translation update - FrenchJean-Baptiste2016-10-301-4/+4
| * | Inject parameter instead of serviceJeremy Benoist2016-10-302-6/+7
| |/
* | Added relation between API Client and UserNicolas Lœuillet2016-10-241-0/+26
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-241-3/+3
|\|
| * Improved side menu, reduced the font size on small screens, fixed a form to a...Alexandr Danilov2016-10-151-3/+3
* | Cleanup subscriber / listener definitionJeremy Benoist2016-10-221-1/+1
* | Remove unnecessary user serializationJeremy Benoist2016-10-081-11/+1
* | Fix PostgreSQL queryJeremy Benoist2016-10-081-1/+1
* | Added check if there is only one userNicolas Lœuillet2016-10-081-0/+14
* | CSThomas Citharel2016-10-081-6/+6
* | workThomas Citharel2016-10-081-1/+11
|/
* Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-071-1/+1
* Create config even if user is disabledJeremy Benoist2016-10-041-4/+0
* Disabled delete button for the logged userJeremy Benoist2016-10-021-1/+1
* Add users management UIJeremy Benoist2016-10-028-1/+507
* Fix bad template nameJeremy Benoist2016-09-301-0/+0
* Create user config in one placeJeremy Benoist2016-09-302-0/+74
* Update wallabag_user.pl.ymlMateusz Rumiński2016-09-191-1/+1
* polish versionMateusz Rumiński2016-09-191-0/+11
* Send every imported item to the queueJeremy Benoist2016-09-111-0/+6
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-282-1/+12
|\
| * Occitan versionQuent-in2016-08-271-0/+11
| * Changes in the login form:Alexandr Danilov2016-08-251-1/+1
* | CSJeremy Benoist2016-08-232-2/+2
* | Proper parameter name, simplify logic & phpdocThomas Citharel2016-08-232-5/+6
* | Add option to disable registrationThomas Citharel2016-08-235-1/+50
* | Merge branch 'master' into 2.1Jeremy Benoist2016-06-231-84/+0
|\|
| * Jump to Symfony 3.1Jeremy Benoist2016-06-221-84/+0
* | manage assets through npmThomas Citharel2016-06-097-10/+10
|/
* Forgot a double quoteBaptiste Mille-Mathias2016-05-191-1/+1
* Fix image path in 2-factor authentification emailBaptiste Mille-Mathias2016-05-181-1/+1
* Fix translation for Go to your account button after subscriptionNicolas Lœuillet2016-04-201-1/+1
* Convert array + phpDocJeremy Benoist2016-04-124-6/+6
* Convert english translation fileJeremy Benoist2016-03-2023-223/+47
* Remove extra definitionJeremy Benoist2016-02-291-5/+0
* Make English welcome message more naturalOlivier Mehani2016-02-252-2/+2
* Add some missing french translationsNicolas Lœuillet2016-02-182-2/+2
* Fix #1643: fix the way to load the HTML template in 2factor authNicolas Lœuillet2016-02-042-3/+3
* Fix from_email & fos_userJeremy Benoist2016-01-311-0/+5
* CSJeremy Benoist2016-01-311-1/+1
* Fix testsJeremy Benoist2016-01-311-2/+10
* Add CraueConfig for internal settingsJeremy Benoist2016-01-312-7/+6
* Add Turkish translationOgün Karakuş2016-01-241-0/+7
* Move public assets for themesJeremy Benoist2016-01-221-1/+1
* CSJeremy Benoist2016-01-221-2/+2
* Use FOSUserEvents instead of c/p a controllerJeremy Benoist2016-01-213-75/+48