Commit Graph

77 Commits

Author SHA1 Message Date
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
10d85dbae3 Update wallabag_user.de.yml
Wallabag->wallabag
2016-12-01 18:23:41 +01:00
87958ce645 add translations/wallabag_user.de.yml (fixes #2673) 2016-12-01 18:03:36 +01:00
68da51d2a3 Fixed 404 for wallabag logo in 2FA 2016-12-01 10:51:04 +01:00
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
5066c3e066 Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
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
5a619812ca Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
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
2087e499b4 Translation update - French 2016-10-30 12:11:24 +01:00
23406ca3f1 Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
64a8781e45 Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
2f82e7f8e1 Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
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
9810f30821 Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
3f60446756 Fix PostgreSQL query
PostgreSQL doesn’t like when we compare interger and boolean :)
2016-10-08 20:26:06 +02:00
bb0c78f4a6 Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
abb5291cd5 CS 2016-10-08 13:27:17 +02:00
e4b46f77ef work 2016-10-08 13:27:17 +02:00
5e7786f3c4 Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +02:00
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
ccc7faec09 Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
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
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
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
267b9d62dc Update wallabag_user.pl.yml
add missing "
2016-09-19 22:37:03 +02:00
a00bed8b59 polish version
create wallabag_user.pl.yml file
2016-09-19 20:42:55 +02:00
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
cdd3010b47 Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
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
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
ee4442f42a CS 2016-08-23 07:40:36 +02:00
7149aa5781 Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
de3d716ae4 Add option to disable registration 2016-08-23 07:40:36 +02:00
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
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
2dcb1dbf05 Forgot a double quote 2016-05-19 01:51:50 +02:00
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
2499cdbf29 Fix translation for Go to your account button after subscription
Fix #1956
2016-04-20 15:53:20 +02:00
4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
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
a19a371ae7 Remove extra definition
Since Symfony 3.0.3 has been released
2016-02-29 09:23:15 +01:00
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
04c0737817 Add some missing french translations 2016-02-18 13:59:02 +01:00
855a4c680f Fix #1643: fix the way to load the HTML template in 2factor auth 2016-02-04 17:29:14 +01:00
48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
1c7d66645b CS 2016-01-31 14:48:26 +01:00
2a58606983 Fix tests 2016-01-31 14:48:26 +01:00