Commit graph

50 commits

Author SHA1 Message Date
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet a42f38d9fb
Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet 68e0efffb8
Fixed review 2016-10-31 17:20:27 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist 206bade58a
Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Thomas Citharel d9a30ef301 Fix tabs on material
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
Jeremy Benoist 876d77a67d
Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
Jeremy Benoist eed812afd0
Logout user before deleting it
And add a smal description
2016-10-08 19:39:12 +02:00
Nicolas Lœuillet 71254701b7
Changed tests 2016-10-08 13:27:18 +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 e4b46f77ef
work 2016-10-08 13:27:17 +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 bf3dc999e7
Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
Jeremy Benoist ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Nicolas Lœuillet b1e0a586e8
Fixed different font-size for labels in config screen
Fix #1788
2016-09-02 10:53:22 +02:00
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Nicolas Lœuillet 8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +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
Nicolas Lœuillet 7a2157b8d7
Fix typo on configuration page 2016-04-09 14:04:43 +02:00
Nicolas Lœuillet 8687bcd0c9 Remove keybaord shortcut and add tagging rule panel in baggy 2016-04-05 22:29:47 +02:00
Jeremy Benoist f3e49264f2 Add reading time translation 2016-03-21 10:00:41 +01: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
Nicolas Lœuillet 6432b9277e Replace slider with select 2016-03-14 13:49:47 +01:00
Nicolas Lœuillet bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Thomas Citharel 4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Jeremy Benoist 26975877d7 Always include warning message
We'll remove it later, on the stable release
2016-01-31 14:37:19 +01:00
Jeremy Benoist 23ff8d3619 Add custom email for 2FA
Related #1490
2015-12-29 11:17:06 +01:00
Kévin Gomez c13eda461f Clean the tagging rule creation form 2015-11-16 14:01:43 +01:00
Kévin Gomez aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
Kévin Gomez 5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +01:00
Kévin Gomez 9b88658c04 Update baggy theme 2015-11-11 16:27:19 +01:00
Kévin Gomez 52e423f307 Provide a way to delete tagging rules 2015-11-11 16:27:19 +01:00
Kévin Gomez 71ef0ed254 Rename the « Tags » tab to « Tagging rules » 2015-11-11 16:23:49 +01:00
Kévin Gomez e9fbd2d12e Add a table explaining the available variables 2015-11-11 16:23:49 +01:00
Kévin Gomez 981cacf7b9 Display the tagging rules in the config 2015-11-11 16:23:49 +01:00
Kévin Gomez f19f9f62d1 Add a form to create tagging rules 2015-11-11 16:23:49 +01:00
Jeremy Benoist 33fe61f92f Fix form_enctype deprecation
Use form_start instead
2015-11-07 00:18:06 +01:00
Nicolas Lœuillet 18cf594f8a move 2factor activation in parameters 2015-10-15 13:17:21 +02:00
Nicolas Lœuillet 2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
Nicolas Lœuillet fcb1fba5c2 * public registration
* remove WSSE implementation
* add oAuth2 implementation
2015-10-03 13:30:43 +02:00
Nicolas Lœuillet 4aafa7f0df french translation 2015-09-30 18:09:18 +02:00
Nicolas Lœuillet 4f0dfac6a6 add french translation 2015-09-30 17:06:41 +02:00
Jeremy Benoist 83aaf84195 Fix display issue in config rss tab 2015-08-22 12:30:06 +02:00
Nicolas Lœuillet 8b8cdabc89 config: redirect on correct tab in material theme 2015-08-19 15:10:11 +02:00
Nicolas Lœuillet 43e6f47d5b fix #1299: change send buttons on config page 2015-08-12 13:35:48 +02:00
Alexandr Danilov 9948d899d3 Fixes and improve css @media 2015-08-04 19:39:26 +03:00
Alexandr Danilov 53e121881b Added Material theme 2015-08-04 17:18:15 +03:00