Commit graph

235 commits

Author SHA1 Message Date
adev f3c300e485 Translate error message in login page
Fix #2933
2017-05-06 22:21:04 +02:00
Nicolas Lœuillet b5b6877976 Merged list and search methods 2017-05-02 15:30:32 +02:00
Thomas Citharel d01dc5a81e rename index to list
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel a2daa32d0c Fix tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel 50cfd8108b Add pagination
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel c37515f880 Add filter to users management page
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
ngosang 82749439ac Update Spanish translation 2017-02-15 15:41:06 +01:00
Jeremy Benoist 24879db1f7
Add default value for list_mode 2016-12-12 17:41:03 +01:00
Nicolas Lœuillet 1093e979ff Merge pull request #2677 from wallabag/add-wallabag_user.de.yml
add translations/wallabag_user.de.yml (fixes #2673)
2016-12-01 19:08:12 +01:00
Strubbl 10d85dbae3 Update wallabag_user.de.yml
Wallabag->wallabag
2016-12-01 18:23:41 +01:00
Sven Fischer 87958ce645 add translations/wallabag_user.de.yml (fixes #2673) 2016-12-01 18:03:36 +01:00
Nicolas Lœuillet 68da51d2a3
Fixed 404 for wallabag logo in 2FA 2016-12-01 10:51:04 +01:00
Nicolas Lœuillet cda0662311
Removed FOSUser attributes removed in alpha4
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
2016-11-28 12:44:17 +01:00
Jeremy Benoist 5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist d7acde5cc3
Use the correct template
When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
2016-11-22 21:23:58 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist 3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
Jeremy Benoist 4b3c983ab8
Inject parameter instead of service
We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!
2016-10-30 20:27:41 +01:00
Jean-Baptiste 2087e499b4 Translation update - French 2016-10-30 12:11:24 +01:00
Nicolas Lœuillet 23406ca3f1
Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist 2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Alexandr Danilov 38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Jeremy Benoist 9810f30821
Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
Jeremy Benoist 3f60446756
Fix PostgreSQL query
PostgreSQL doesn’t like when we compare interger and boolean :)
2016-10-08 20:26:06 +02:00
Nicolas Lœuillet bb0c78f4a6
Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
Thomas Citharel abb5291cd5
CS 2016-10-08 13:27:17 +02:00
Thomas Citharel e4b46f77ef
work 2016-10-08 13:27:17 +02:00
Nicolas Lœuillet 5e7786f3c4
Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +02:00
Jeremy Benoist 755ff9e835
Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
2016-10-04 10:42:46 +02:00
Jeremy Benoist ccc7faec09
Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
Jeremy Benoist 152fcccd44
Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
Jeremy Benoist fb7354c4a4
Fix bad template name
When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
2016-09-30 21:02:44 +02:00
Jeremy Benoist ca17abce2d
Create user config in one place
Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
2016-09-30 21:01:36 +02:00
Mateusz Rumiński 267b9d62dc Update wallabag_user.pl.yml
add missing "
2016-09-19 22:37:03 +02:00
Mateusz Rumiński a00bed8b59 polish version
create wallabag_user.pl.yml file
2016-09-19 20:42:55 +02:00
Jeremy Benoist ef75e1220e
Send every imported item to the queue
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
2016-09-11 21:57:46 +02:00
Jeremy Benoist cdd3010b47
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
Quent-in 985f5f9d05 Occitan version
Occitan translation, I hope I properly put it where it has to be.
If there reminds other textes to translate, please let me know!
2016-08-27 12:24:18 +02:00
Alexandr Danilov 5aba43d92c Changes in the login form:
* The alignment of the login form centered in WebKit
* Indent after the reference password recovery
2016-08-25 16:09:55 +03:00
Jeremy Benoist ee4442f42a
CS 2016-08-23 07:40:36 +02:00
Thomas Citharel 7149aa5781
Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
Thomas Citharel de3d716ae4
Add option to disable registration 2016-08-23 07:40:36 +02:00
Jeremy Benoist f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist 23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Thomas Citharel 5ecdfcd041 manage assets through npm
first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
2016-06-09 17:12:51 +02:00
Baptiste Mille-Mathias 2dcb1dbf05 Forgot a double quote 2016-05-19 01:51:50 +02:00
Baptiste Mille-Mathias 871f667a55 Fix image path in 2-factor authentification email
Fix the broken url to image ressource hosted on wallabag.org
2016-05-18 21:18:41 +02:00
Nicolas Lœuillet 2499cdbf29
Fix translation for Go to your account button after subscription
Fix #1956
2016-04-20 15:53:20 +02:00
Jeremy Benoist 4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
Jeremy Benoist 0d42217e4e Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
2016-03-20 21:12:22 +01:00
Jeremy Benoist a19a371ae7 Remove extra definition
Since Symfony 3.0.3 has been released
2016-02-29 09:23:15 +01:00
Olivier Mehani ef186de38a Make English welcome message more natural
sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2016-02-25 11:32:40 +11:00
Nicolas Lœuillet 04c0737817 Add some missing french translations 2016-02-18 13:59:02 +01:00
Nicolas Lœuillet 855a4c680f Fix #1643: fix the way to load the HTML template in 2factor auth 2016-02-04 17:29:14 +01:00
Jeremy Benoist 48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
Jeremy Benoist 1c7d66645b CS 2016-01-31 14:48:26 +01:00
Jeremy Benoist 2a58606983 Fix tests 2016-01-31 14:48:26 +01:00
Jeremy Benoist 63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Ogün Karakuş f47101e0c4
Add Turkish translation
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
2016-01-24 17:27:26 +02:00
Jeremy Benoist 30d81a47c6 Move public assets for themes
So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
2016-01-22 13:45:14 +01:00
Jeremy Benoist 23afdf3a70 CS 2016-01-22 08:01:32 +01:00
Jeremy Benoist 0f0e8eb82a Use FOSUserEvents instead of c/p a controller
The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`.
Instead of copying the whole method we can simply use FOSUserEvents to handle that.
2016-01-21 16:39:13 +01:00
Jeremy Benoist abd454c456 Update HTML 2FA template
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)
2016-01-21 11:03:27 +01:00
Alexandr Danilov 5f736213af #1490 HTML in E-Mails 2016-01-21 11:03:27 +01:00
Jeremy Benoist d1f1333f48 CS 2016-01-21 11:03:27 +01:00
Jeremy Benoist 7ce895bf5e Use HTML email for 2FA
Related to #1490
2016-01-21 11:03:27 +01:00
Jeremy Benoist e678c4752a Use translator interface instead of final class
Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585
2016-01-17 12:56:04 +01:00
Nicolas Lœuillet 1930c19d82 Merge pull request #1524 from wallabag/sf2.8
Upgrade to Symfony 3.0
2016-01-15 15:38:31 +01:00
Nicolas Lœuillet 5c072d2b57 Quickstart for beginners 2016-01-15 15:01:30 +01:00
Jeremy Benoist 5c895a7fd1 Update bundle & stock file
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
2016-01-15 09:35:38 +01:00
Jeremy Benoist 619cc45359 Symfony Upgrade Fixer FTW
symfony-upgrade-fixer fix src/Wallabag/
2016-01-15 09:35:38 +01:00
Nicolas Lœuillet dad1c546a5 Merge pull request #1545 from wallabag/v2-user-tag
v2 – Remove user reference in tag
2016-01-02 12:46:52 +01:00
Jeremy Benoist fc73222723 Remove user reference in tag
Fix #1543
2015-12-29 14:50:52 +01:00
Jeremy Benoist 23ff8d3619 Add custom email for 2FA
Related #1490
2015-12-29 11:17:06 +01:00
Kévin Gomez 625acf3352 Add a command to automatically tag all entries for a user 2015-11-11 16:27:19 +01:00
Jeremy Benoist bd0f3d32c9 Quoted entity to avoid reserved keyword
Should fix #1498
2015-11-07 14:15:33 +01:00
Nicolas Lœuillet 0d6a7929e1 add tests for 2factor authentication 2015-10-14 17:10:12 +02:00
Nicolas Lœuillet 2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
Nicolas Lœuillet 8263e71192 use form widget for registration 2015-10-06 07:44:10 +02:00
Nicolas Lœuillet e0d188809c move css 2015-10-05 22:49:46 +02:00
Nicolas Lœuillet d30262154a last changes for baggy theme 2015-10-05 22:45:44 +02:00
Nicolas Lœuillet ec3ce598f6 material design for register/login/recover pages 2015-10-05 22:16:18 +02:00
Nicolas Lœuillet 0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet 1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00