Commit graph

782 commits

Author SHA1 Message Date
jami7
661d5ae0cf Update messages.es.yml
On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks.
2016-04-10 14:18:03 +02:00
jami7
dd4997d705 Update messages.es.yml 2016-04-10 14:17:35 +02:00
Jeremy Benoist
54ecbb41d6 Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material
Fix estimated reading time in material view
2016-04-10 14:12:13 +02:00
Jeremy Benoist
19a7ea2a44 Merge pull request #1896 from wallabag/v2-fix-internal-settings
Fix internal settings
2016-04-10 09:49:10 +02:00
Jeremy Benoist
2504fe46ed Merge pull request #1894 from wallabag/v2-fix-doc-link
Fix documentation link in developer page
2016-04-10 09:44:48 +02:00
Nicolas Lœuillet
7ead8a0d9d
Fix estimated reading time in material view
Fix #1893
2016-04-10 08:48:53 +02:00
Nicolas Lœuillet
cb48a569e0
Fix internal settings
Fix #1867: remove download_picture setting and manage show_printlink in material theme
2016-04-09 21:34:50 +02:00
Nicolas Lœuillet
808f541ea9
Fix documentation link in developer page 2016-04-09 20:43:22 +02:00
Nicolas Lœuillet
7a2157b8d7
Fix typo on configuration page 2016-04-09 14:04:43 +02:00
Nicolas Lœuillet
b00a89e08f
Refactor EntryController 2016-04-09 13:44:54 +02:00
Nicolas Lœuillet
f652f41dab
Fix duplicate article when added via the bookmarklet 2016-04-08 15:41:05 +02:00
Jeremy Benoist
e969c2a7ef Merge pull request #1879 from wallabag/v2-tag-field-position
Move tag form in Material theme
2016-04-08 13:51:20 +02:00
Nicolas Lœuillet
77b9db87b8 Merge pull request #1804 from wallabag/j0k3r-patch-1
Force user-agent for iansommerville.com
2016-04-08 11:18:44 +02:00
Jeremy Benoist
6a986910b6 Merge pull request #1868 from wallabag/v2-tagrule-baggy
Remove keyboard shortcut and add tagging rule panel in baggy
2016-04-07 14:10:08 +02:00
Nicolas Lœuillet
c6cbe75b2e
Move tag form in Material theme 2016-04-07 13:47:35 +02:00
Nicolas Lœuillet
c802181126 Documentation about wallabag API 2016-04-06 11:30:41 +02:00
Nicolas Lœuillet
8687bcd0c9 Remove keybaord shortcut and add tagging rule panel in baggy 2016-04-05 22:29:47 +02:00
Nicolas Lœuillet
4a749cad8d Round estimated time and add reading speed for Baggy 2016-04-05 15:35:01 +02:00
Nicolas Lœuillet
b5cf84bdf6 Fix Archive page title translation 2016-04-04 08:00:31 +02:00
Thomas Citharel
a119acd15d Merge pull request #1835 from wallabag/v2-prepare-v2
🚀 Prepare v2.0.0 🎂
2016-04-03 22:11:17 +02:00
Nicolas Lœuillet
163517da79 Remove useless CSS 2016-04-03 20:35:53 +02:00
Nicolas Lœuillet
0795d04916 Hide search buttons 2016-04-03 20:25:43 +02:00
Nicolas Lœuillet
eff75729a1 🚀 Prepare v2.0.0 🎂 2016-04-03 18:56:53 +02:00
Jeremy Benoist
c61b68e8a6 Check selected PDO driver on install
Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.
2016-04-01 16:44:51 +02:00
Jeremy Benoist
1695a6fecd Fix quotes for OC 2016-04-01 10:34:51 +02:00
Jeremy Benoist
69726ec78e Fix simple quote 2016-04-01 10:16:06 +02:00
Quent-in
dc89968c58 Update oc version
Complet
2016-04-01 08:51:29 +02:00
Quent-in
9191d8a640 Trad. Occitan
WIP
2016-03-30 13:17:40 +02:00
jami7
4063d821a3 Update messages.es.yml 2016-03-28 10:53:35 -10:00
Nicolas Lœuillet
e2dda63152 Merge pull request #1820 from wallabag/import-refacto
Refacto wallabag import
2016-03-28 18:52:22 +02:00
jami7
ff6b683bb3 Update messages.es.yml 2016-03-28 05:34:56 -10:00
Jeremy Benoist
0e49487bb0 Remove some complexicity in InstallCommand 2016-03-28 14:18:50 +02:00
Nicolas Lœuillet
ba2157b270 Merge pull request #1805 from wallabag/v2-assign-comma-tags
Fix #1768 Split tags with commas from UI
2016-03-28 09:42:13 +02:00
Jeremy Benoist
8f336fda64 Tags were not imported in wallabag v2 import
Also, simplify exportAs matching format
2016-03-27 23:58:37 +02:00
Jeremy Benoist
4d0ec0e721 Fix some Scrutinizer issues 2016-03-27 20:54:57 +02:00
Jeremy Benoist
5d6f6f56a2 Some cleanup
- travis tabulation
- extra namespace definition in entities
2016-03-27 20:36:35 +02:00
Jeremy Benoist
2baca964f3 Simplify tag creation from entry
Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job.
So it simplify the controller.
2016-03-27 17:09:33 +02:00
Mateusz Rumiński
4dc9f8d037 Fix Indentation problem 2016-03-26 17:38:34 +01:00
Mateusz Rumiński
005c0d370f Update messages.pl.yml
Complete polish translation of messages file
2016-03-25 19:20:37 +01:00
Julian Oster
58a0ca1651 Complete messages.de.yml 2016-03-24 13:09:49 +01:00
Nicolas
842a62e293 fix type diaspora* share 2016-03-21 17:03:43 +01:00
Nicolas Lœuillet
7dbed56857 Translate flash message in baggy theme 2016-03-21 15:44:23 +01:00
Nicolas Loeuillet
5a4ee4ae0f Split tags with commas from UI 2016-03-21 14:06:07 +01:00
Jeremy Benoist
f3e49264f2 Add reading time translation 2016-03-21 10:00:41 +01:00
Jeremy Benoist
f92b5de7ac Convert more languages 2016-03-20 21:56:42 +01:00
Jeremy Benoist
1381db4835 Translation typos
Fix #1793
2016-03-20 21:56:42 +01:00
Jeremy Benoist
3fae7f1d08 Add missing developer page 2016-03-20 21:56:42 +01:00
Jeremy Benoist
a0c6c244d9 Convert french translation 2016-03-20 21:56:42 +01:00
Jeremy Benoist
b308b26339 CS 2016-03-20 21:12:22 +01:00
Jeremy Benoist
4204a06b77 Add flashes messages 2016-03-20 21:12:22 +01:00
Jeremy Benoist
4f9cf232f8 Improve test failure readability
If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text.
So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read.
2016-03-20 21:12:22 +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
Jeremy Benoist
e71c376db9 Force user-agent for iansommerville.com
When using the default User Agent, the website returns a 403. By forcing the User Agent for this domain, we got the proper behavior: a 200

Since we can't _append_ new user agent to the default graby configuration, we need to rewrite all the default config + the new one.

Fix #1801
2016-03-18 20:55:54 +01:00
Jeremy Benoist
f39e94ace3 Merge pull request #1767 from wallabag/v2-setting-for-reading-time
Setting for reading time
2016-03-18 14:30:38 +01:00
Nicolas Lœuillet
1b64a84b78 Improved tests 2016-03-18 14:01:50 +01:00
Nicolas Lœuillet
ec7c67badc Merge pull request #1799 from wallabag/v2-fix-tabs-display-material
fix tabs display on mobile view
2016-03-18 12:52:40 +01:00
Nicolas Lœuillet
78becd5401 Fix documentation and add help message in Baggy 2016-03-18 12:36:52 +01:00
Thomas Citharel
189ef6342a use integers for archived/starred status 2016-03-16 22:22:12 +01:00
Thomas Citharel
0d3043a29c fix api properties and typo 2016-03-16 22:22:12 +01:00
Thomas Citharel
2cc7de1e93 fix tabs display on mobile view 2016-03-16 22:15:01 +01:00
Nicolas Lœuillet
6432b9277e Replace slider with select 2016-03-14 13:49:47 +01:00
Nicolas Lœuillet
37b371726b Translation and documentation 2016-03-14 13:01:32 +01:00
Nicolas Lœuillet
db1d4b1e19 Fix default value and add baggy implementation 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
889c1cf328 Fixed fixtures for config 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
17b3d026fd Merge pull request #1786 from wallabag/v2-restrict-user-infos
API shows just what needed for user
2016-03-14 06:15:46 +01:00
Thomas Citharel
7d1fdab2bb API shows just what needed for user 2016-03-13 20:17:52 +01:00
Thomas Citharel
c9c8345a4a add refresh-token grant-type 2016-03-13 17:53:56 +01:00
Jeremy Benoist
09d8bb6fa2 Improve tests
- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges
2016-03-11 17:59:42 +01:00
Nicolas Lœuillet
cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
Nicolas Lœuillet
3b32c122ab Change documentation links in quickstart 2016-03-08 11:21:40 +01:00
Nicolas Lœuillet
807037884f Merge pull request #1675 from wallabag/v2-create-api-client
Ability to create new client for the API
2016-03-08 10:09:39 +01:00
Jeremy Benoist
d11eb2e461 Fix translations mistake
In Material template, move the developer link in the left menu (like in baggy)
2016-03-07 11:05:14 +01:00
Jeremy Benoist
f17281417c Translate "how to" page 2016-03-07 09:20:20 +01:00
Jeremy Benoist
2766668b59 Use external js & css 2016-03-07 08:58:08 +01:00
Jeremy Benoist
1256f6fe34 Add translations 2016-03-05 22:29:58 +01:00
Jeremy Benoist
9bf15f0269 Add listing clients
Rename route to be more consistive (ie: prefixed with developer_)
2016-03-05 21:44:39 +01:00
Jeremy Benoist
2c2308b783 Cleanup form
- Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !)
- Fix HTML syntax in client_parameters
- Add developer link in baggy menu
- Fix space between link in material footer
2016-03-05 20:04:19 +01:00
Jeremy Benoist
e68568cd5b Merge pull request #1750 from wallabag/v2-quickstart-documentation
Documentation about filters / Quickstart changes
2016-03-04 16:14:39 +01:00
Thomas Citharel
c10fcb3bbb french translation & pocket 2016-03-03 10:03:40 +01:00
Nicolas Lœuillet
76a9bc4797 Add new links in quickstart 2016-03-03 07:30:05 +01:00
Juanjo Benages
348e2b4852 Spanish translation 2016-03-01 22:24:34 +01:00
Juanjo Benages
bd5b3ea8ea Spanish translation 2016-03-01 22:20:42 +01:00
Juanjo Benages
0e576d2163 Start of the spanish translation 2016-03-01 21:00:35 +01:00
Jeremy Benoist
4be43814e2 Merge pull request #1738 from wallabag/v2-prepare-beta1
Prepare wallabag for first beta 🚀
2016-03-01 09:00:42 +01:00
goofy-bz
5d0f104bf0 minor typofix + missing quotes
Added quotes to be reviewed
2016-02-29 21:55:06 +01:00
Nicolas Lœuillet
6e3d65ccb0 Prepare wallabag for first beta 🚀 2016-02-29 21:34:36 +01:00
Nicolas Lœuillet
5bf8f3f164 Remove comments 2016-02-29 21:28:37 +01:00
Thomas Citharel
5bc2da5628 Add password for auth 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet
8a4690b6a5 add tests 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet
abc329453b Enhance documentation and create a form to create a new client 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet
6a2c524a2c API: rename application to client 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet
b6321bed7b Added developer documentation 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet
24152cdb5e Fix #1597: first draft to create new client for the API 2016-02-29 21:28:25 +01:00
Jeremy Benoist
3c39f5ac41 Skipping all Posgres test for wallabag:install
We already faced this problem but we are facing it again.
d502762598

It seems we can drop a database properly using wallabag:install.

The server log keep saying:
ERROR:  source database "template1" is being accessed by other users
DETAIL:  There is 1 other session using the database.
STATEMENT:  CREATE DATABASE "wallabag_test"

Which means, it can't remove the database wallabag_test because one other person is using it.
2016-02-29 16:23:36 +01:00
Morten Juhl-Johansen Zölde-Fejér
8249b988cc added newline 2016-02-27 17:19:17 +01:00
Morten Juhl-Johansen Zölde-Fejér
2b788cadab Adding Danish translations to Wallabag v2 2016-02-27 16:00:19 +01:00
Nicolas Lœuillet
b07c7dfe78 Regenerate Annotator with idAnnotation instead of idComment 2016-02-26 18:14:50 +01:00
Nicolas Lœuillet
4dc872238a Rename CommentBundle with AnnotationBundle 2016-02-26 18:14:42 +01:00
Thomas Citharel
9eab365e28 changed french translation from commentaire to annotation 2016-02-26 18:14:42 +01:00
Thomas Citharel
a772d16b12 display how much comments there are for an entry 2016-02-26 18:14:42 +01:00
Thomas Citharel
2b6e65a5e3 Move annotatorjs to the bottom of the body
So that the "article" tag is loaded before
2016-02-26 18:14:27 +01:00
Nicolas Lœuillet
7720cca532 Add annotator in baggy theme
+ Documentation about annotations
2016-02-26 18:14:12 +01:00
Thomas Citharel
f38e03dc02 Comment work with annotator v2
- add missing annotator.js file and fix typo
- edit & delete routes, started tests
- basic tests
2016-02-26 18:13:17 +01:00
Nicolas Lœuillet
575e6907e5 Change remove tag icon in entry view with material theme 2016-02-26 08:58:36 +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
Jeremy Benoist
f2fcb65b44 Fix wrong variable name
> The variable $requirement does not exist.
2016-02-24 14:49:51 +01:00
Jeremy Benoist
f83125d2f5 Merge pull request #1716 from wallabag/v2-enhance-requirements-installation
Fix #1603: Enhance requirements in InstallCommand
2016-02-24 14:47:35 +01:00
Jeremy Benoist
d7cc16c8b5 Merge pull request #1710 from wallabag/v2-message-graby-fails
Fix #811: Display a human message when graby fails to fetch articles
2016-02-24 08:43:17 +01:00
Thomas Citharel
0a7e695975 remove unused functions & clean composer.json 2016-02-23 23:29:25 +01:00
Thomas Citharel
db847ca0b7 add composer extensions check & function_exists checks 2016-02-23 19:06:37 +01:00
Nicolas Lœuillet
fc6020b2c8 Enhance requirements in InstallCommand 2016-02-23 16:41:38 +01:00
Nicolas Lœuillet
ecb266d0ec replace contributors with a link to github 2016-02-23 16:18:13 +01:00
Nicolas Lœuillet
4a2c089c68 Add contributors and 3rd party libraries 2016-02-23 16:04:01 +01:00
Jeremy Benoist
90280df080 Change wording for create a new user 2016-02-23 14:38:42 +01:00
Nicolas Lœuillet
bb17ddea61 changed error message 2016-02-22 22:14:56 +01:00
Jeremy Benoist
b6c00b0b80 Add tests 2016-02-22 13:33:22 +01:00
Nicolas Lœuillet
fe5597c433 Display a human message when graby fails to fetch articles 2016-02-22 13:30:17 +01:00
Jeremy Benoist
e5b5270962 Add translation 2016-02-22 11:44:39 +01:00
Jeremy Benoist
a4f42c59f0 Use internal config instead for demo 2016-02-22 11:44:39 +01:00
Nicolas Lœuillet
d8d56448c9 add a username for demonstration mode 2016-02-22 11:43:29 +01:00
Nicolas Lœuillet
36f20a6570 typo 2016-02-22 11:43:28 +01:00
Nicolas Lœuillet
6c9f50a662 Demonstration mode to prevent password changes 2016-02-22 11:43:28 +01:00
Jeremy Benoist
12b5a8cea1 Merge pull request #1702 from wallabag/v2-piwik
Added Piwik implementation
2016-02-22 11:24:41 +01:00
Jeremy Benoist
077ddbe1ae Use a different way to use piwik 2016-02-22 11:11:08 +01:00
Nicolas Lœuillet
0cde91cc6f Merge pull request #1699 from wallabag/v2-assign-tag
Move assignTagsToEntry in ContentProxy helper
2016-02-19 21:21:47 +01:00
Maxime LECLERCQ
671a2b887f Fix #1551 - Redirect to the last page when current page is out of range 2016-02-19 16:02:31 +01:00
Nicolas Lœuillet
07643dde08 Fix #1137: implemented Piwik 2016-02-19 15:27:57 +01:00
Jeremy Benoist
c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
Jeremy Benoist
befa6f2fe9 Merge pull request #1696 from wallabag/v2-french-translations-missing
Add some missing french translations
2016-02-18 14:44:26 +01:00
Nicolas Lœuillet
04c0737817 Add some missing french translations 2016-02-18 13:59:02 +01:00
Nicolas Lœuillet
fdec3acab1 Merge pull request #1688 from mruminski/patch-1
Create messages.pl.yml
2016-02-18 13:16:49 +01:00
mruminski
660d66cabd Update messages.pl.yml
change ' to ""
2016-02-18 11:47:35 +01:00
mruminski
1f8f9eaac8 Update messages.pl.yml
fix some mistakes in translation
2016-02-18 11:27:11 +01:00
Thomas Citharel
f37c9c3348 translate estimated time minutes 2016-02-18 01:36:02 +01:00
Jeremy Benoist
93d0aa40bb Merge pull request #1689 from mruminski/patch-2
Create validators.pl.yml
2016-02-18 00:02:53 +01:00
Jeremy Benoist
db0e34e2ce Merge pull request #1687 from 0wnrepo/v2
Translated another two files into romanian.
2016-02-18 00:00:46 +01:00
mruminski
e87638227f Create validators.pl.yml
Polish translation
2016-02-17 22:23:51 +01:00
mruminski
75ff0e6e32 Create messages.pl.yml
Polish translation
2016-02-17 22:18:30 +01:00
steve
6a88b61cf1 Translated another two files into romanian. 2016-02-17 22:40:26 +02:00
Masoud Abkenar
ebac4090b5 Added Persian (fa) (فارسی) translation 2016-02-17 15:37:29 +01:00
0wnrepo
ab25e399f0 Fix \&amp; 2016-02-17 13:39:23 +02:00
steve
d8f5b27012 Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". 2016-02-17 01:56:51 +02:00
Masoud Abkenar
b7c47a2a86 Create messages.fa.yml
Translation file for the 'Persian' language. Also recognized by fa_IR. Also known (in the Persian language) as Farsi. Also written like فارسی in Persian. All said, please call the language just 'Persian'.
2016-02-16 16:38:08 +01:00
Nicolas Lœuillet
f6249b67f6 Merge pull request #1668 from wallabag/v2-stuff
Few updates
2016-02-16 12:27:43 +01:00
Jeremy Benoist
9e33bc9dfd Typos 2016-02-16 11:39:24 +01:00
Nicolas Lœuillet
559cd55bc8 Merge pull request #1672 from wallabag/v2-improve-baggy-theme
improve baggy theme (add new tag panel)
2016-02-15 19:22:13 +01:00
Thomas Citharel
a8d5f8971e fix typos 2016-02-15 17:04:48 +01:00
Thomas Citharel
56349e470a improve baggy theme (add new tag panel) 2016-02-14 20:12:03 +01:00
Thomas Citharel
e8d8026242 display pictures properly 2016-02-14 19:10:33 +01:00
Jeremy Benoist
daa2b7e7c3 More translations 2016-02-12 16:59:15 +01:00
Jeremy Benoist
9856805540 CS 2016-02-12 12:24:30 +01:00
Jeremy Benoist
0c6845a98f Add env=prod for server:run on install 2016-02-12 12:01:02 +01:00
Jeremy Benoist
55da765e11 Add missing translations 2016-02-12 12:00:49 +01:00
Jeremy Benoist
c7a4f74f9f Redirect to the right tab on /config 2016-02-12 12:00:26 +01:00
Jeremy Benoist
7a97c7d06f Merge pull request #1656 from wallabag/v2-fix-new-user-password-prompts
fix labels on new user prompt
2016-02-11 18:19:35 +01:00
Thomas Citharel
6fa4be38eb fix labels on new user prompt
fix tests

nl

add translation validation length
2016-02-11 17:52:00 +01:00
Jeremy Benoist
06c190887f Merge pull request #1654 from wallabag/fix-add-button-mobile-view
fix #1636
2016-02-11 17:15:28 +01:00
Alexandr Danilov
a7c7de4e9b Better design of the close button 2016-02-11 16:51:12 +01:00
Jeremy Benoist
9b5edf33a0 Merge pull request #1663 from wallabag/v2-remove-tags-from-entry
remove tag from entry #1377
2016-02-11 16:49:03 +01:00
Thomas Citharel
3a19060ca0 better translation 2016-02-11 12:39:35 +01:00
Thomas Citharel
4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Thomas Citharel
e686a76d34 improve test and change method name. Also, display number of entries for each tag 2016-02-10 18:40:15 +01:00
Thomas Citharel
567421af50 remove tag from entry #1377 2016-02-10 17:41:28 +01:00
Thomas Citharel
dcb6bd7a9d fix #1636 2016-02-08 21:30:11 +01:00
Jeremy Benoist
565c8efb4f Merge pull request #1650 from wallabag/v2-fix-duplicate-exports
Exported entries were added twice in export file
2016-02-05 14:22:55 +01:00
Nicolas Lœuillet
8f06a8c416 User created via wallabag:install is now a SUPER_ADMIN 👑 2016-02-05 13:55:50 +01:00
Nicolas Lœuillet
f898102c85 Exported entries were added twice in export file 2016-02-05 13:35:59 +01:00
Jeremy Benoist
eb15061d0b Adjust export order
To be the same as on the entry page.
Also, export name doesn't need to be translated.
2016-02-04 20:41:30 +01:00
Jeremy Benoist
d3f31ec485 CS 2016-02-04 20:31:26 +01:00
Thomas Citharel
f161122412 put the equals bar outside the loop 2016-02-04 20:31:26 +01:00
Thomas Citharel
3b07d01937 remove old dependancy 2016-02-04 20:31:26 +01:00
Thomas Citharel
3a2ada0be0 fix tests 2016-02-04 20:31:26 +01:00
Thomas Citharel
365a38984e better display for txt 2016-02-04 20:31:26 +01:00
Thomas Citharel
6c08fb68b8 add txt export 2016-02-04 20:30:51 +01:00
Jeremy Benoist
27c837dcd1 Merge pull request #1642 from wallabag/v2-escape-preview
Unescape content for Material card
2016-02-04 17:46: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
Nicolas Lœuillet
e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page
Settings page
2016-02-04 15:59:57 +01:00
Jeremy Benoist
0796532460 Unescape content for Material card
Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&amp;`.
Using |raw, the content isn't escape twice and is well displayed.
2016-02-03 20:45:15 +01:00
Jeremy Benoist
e43d27f845 Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
[#1604] First draft to fix SensioLabsInsight report
2016-02-01 13:51:35 +01:00
Jeremy Benoist
a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
Jeremy Benoist
07c9b1c98a Fix permission to settings page 2016-01-31 14:48:26 +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
67c99849ae Use alias to get container parameters 2016-01-31 14:48:26 +01:00
Jeremy Benoist
d6ba77e888 Create internal setting on install & fixtures 2016-01-31 14:48:26 +01:00
Jeremy Benoist
63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +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
bc78968764 Move default configuration out of parameters
These default configuration value shouldn't be in parameters.yml.
2016-01-31 14:37:19 +01:00
Nicolas Lœuillet
143869525f Merge pull request #1629 from wallabag/fixexportformats
fix #1620 and introduce new parameters to export
2016-01-24 18:48:28 +01:00
Thomas Citharel
b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +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
Nicolas Lœuillet
5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet
b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01: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
a3cac44c78 Add for deleting rule from an other user 2016-01-22 08:01:17 +01:00
Jeremy Benoist
a0d6ccc5ca Fix bad type after using findByUrlAndUserId
It returns an object since few commits this part of (untested) code still use an array.
Also add test for that part of code.
2016-01-21 16:37:25 +01:00
Jeremy Benoist
e56983af1f Fix bad redirection when adding a new user 2016-01-21 16:36:30 +01:00
Jeremy Benoist
27ea492cf7 Add tests on TagAllCommand
Some simple tests
2016-01-21 16:36:17 +01:00