Commit graph

742 commits

Author SHA1 Message Date
Jérémy Benoist 3af5d41759 Merge pull request #3139 from Kdecherf/2502-tag-case
Ignore tag's case
2017-09-03 20:25:15 +02:00
Tobias Strobel 973392cc48 Translate missing strings, add quotation marks 2017-09-01 23:15:18 +02:00
Quent-in a09136d2d2 Update CraueConfigBundle.oc.yml 2017-08-30 20:09:16 +02:00
Kevin Decherf 7b4f66881d php-cs-fixer on DoctrineMigrations/Version20170719231144
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:59:02 +02:00
Kevin Decherf bd164a75c4 Add migration to change case of tags
This migration does not support SQLite as long as this engine does not
support Unicode in LOWER().

This migration starts by retrieving the list of lowercase tags which
need to be migrated. Then it retrieves the list of tags for each tags
from the previous step in order to migrate entries. It handles deletion
of empty tags. At the end the migration makes a full scan to update the
label of all remaining tags.

WARNING: THIS MIGRATION IS IRREVERSIBLE.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
François D a991c46eed Set a starred_at field when an entry is starred.
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.
2017-08-25 21:19:47 +02:00
Quent-in a4fcb2e5c6 Update registration using API 2017-08-05 14:46:33 +02:00
Jeremy Benoist 2e6239bb9f
Disallow html for templating formats
Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.
2017-07-09 10:07:14 +02:00
Jeremy Benoist f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Thomas Citharel 77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist 6b1b148d65 Add share.scss file
Still needs to include it in the twig template
2017-06-22 12:13:22 +02:00
Jeremy Benoist 789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
Jeremy Benoist 18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jérémy Benoist 80784b782b Merge pull request #2683 from wallabag/credentials-in-db
Store credentials in DB
2017-06-20 16:40:48 +02:00
Thomas Citharel bead8b42da
Fix reviews
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-20 16:03:39 +02:00
Jeremy Benoist 906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist fd7fde9515
Force sequence creation for postgresql 2017-06-20 16:03:20 +02:00
Jeremy Benoist 5a9bc00726
Retrieve username/password from database
Inject the current user & the repo to retrieve username/password from the database
2017-06-20 16:03:13 +02:00
Jeremy Benoist f92fcb53ca
Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
Thomas Citharel f99ebec0f2 Fix mobile view and update asset deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-15 07:58:12 +02:00
Nicolas Lœuillet dfd821dcfb
Removed padding on entry view 2017-06-13 16:52:14 +02:00
Nicolas Lœuillet b662c65e57
Fixed internal settings form 2017-06-12 10:44:08 +02:00
Jérémy Benoist 679aaf0836 Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
2017-06-10 11:36:03 +02:00
Jeremy Benoist 1a94252831
Promote https 2017-06-09 10:07:27 +02:00
Jeremy Benoist 80f4d85ac9
Review 2017-06-08 19:15:33 +02:00
Nicolas Lœuillet 7bb3aa3177 Merge pull request #3093 from aaa2000/annotation-error-on-save
Displays an error with an annotation with a too long quote
2017-06-07 16:30:27 +02:00
adev c406cef5b6 Fix postgresql migration 2017-06-07 00:12:20 +02:00
Thomas Citharel e48b238a3e fix tests 2017-06-06 16:18:25 +02:00
Thomas Citharel d6c4c484c4 add migration 2017-06-06 16:04:51 +02:00
Thomas Citharel be9d693e74 remove craueconfig domain name setting and add a proper one in parameters 2017-06-06 15:36:21 +02:00
adev 2c3e148b00 Displays an error with an annotation with a too long quote
Fix #2762
2017-06-04 11:38:29 +02:00
Mateusz Rumiński d0f7b0cc60 Update PL transation
add missing translation
2017-06-02 19:35:25 +02:00
Jérémy Benoist 044079967b Add 🇮🇹 translation 2017-06-02 11:45:45 +02:00
Jeremy Benoist bf7f0cb5a3
Use a dedicated file for wallabag config 2017-06-02 11:33:11 +02:00
Jeremy Benoist 1b9cd91782
Add translation 2017-06-02 11:32:38 +02:00
Jeremy Benoist 426bb453d2
API user creation behing a toggle
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
2017-06-02 11:32:38 +02:00
Jérémy Benoist a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate
Import disableContentUpdate
2017-06-02 11:26:37 +02:00
Nicolas Lœuillet 5901516805 Merge pull request #3171 from wallabag/drop-fucking-sqlite
Defined MySQL as the default rdbms for wallabag
2017-06-01 14:46:01 +02:00
Jerome Charaoui 1c5da417e4
Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
Nicolas Lœuillet ec42e697ea
Changed default database name 2017-06-01 09:17:05 +02:00
Jérémy Benoist 2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests
Isolated tests
2017-06-01 07:58:17 +02:00
Nicolas Lœuillet 46825cfffb
Fixed @tcitworld 's review 2017-05-31 22:50:18 +02:00
Nicolas Lœuillet 7d5e84fec1
Defined MySQL as the default rdbms for wallabag 2017-05-31 22:36:21 +02:00
Nicolas Lœuillet 757ec837be Merge pull request #3077 from wallabag/add-tags-list-view
Added tags on list view
2017-05-31 21:18:14 +02:00
Nicolas Lœuillet 84b041e87f
Reduced border-radius for tags 2017-05-31 20:31:35 +02:00
adev 7ab5eb9508 Isolated tests
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
2017-05-31 16:03:54 +02:00
Thomas Citharel 91775f36fe Add some flex magic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-31 14:34:46 +02:00
Nicolas Lœuillet 812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
Jeremy Benoist d181bd7285
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-30 09:59:06 +02:00
Damien Cassou ac1509a66b
Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
Jeremy Benoist 4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Nicolas Lœuillet c0e8e6037b Prepare wallabag 2.2.3 2017-05-17 17:21:14 +02:00
Jérémy Benoist d168fff7a9 Merge pull request #3120 from aaa2000/fix-delete-annotation-user
Fix delete annotation when username is defined
2017-05-15 11:42:05 +02:00
adev 60c522899b Fix delete annotation when username is defined
When an user set his name in "Config" > "User Information", he
can't delete or update an annotation

Fix #2382
2017-05-14 11:38:02 +02:00
Nicolas Lœuillet 3b792787d7 Upgraded CraueConfigBundle to 2.0 2017-05-12 16:39:47 +02:00
Nicolas Lœuillet dda6a6addc
Added headers field in Entry 2017-05-11 14:18:21 +02:00
Nicolas Lœuillet 8c3158eba8
Added migration to change length for user fields 2017-05-10 10:46:32 +02:00
Thomas Citharel b28c5430ef Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
2017-05-09 11:43:48 +02:00
Thomas Citharel efac66cb56 icon mail a bit better
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-09 11:04:02 +02:00
Thomas Citharel ff5cdbdc95 fix 3-dots menu position
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-08 12:32:20 +02:00
Thomas Citharel 4c6ee89c9c Fix review again
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-07 17:13:08 +02:00
Aline 34806fab1b Fix reviews
Signed-off-by: Aline <chetta.aline@gmail.com>
2017-05-07 15:07:50 +02:00
Nicolas Lœuillet 6980304968 Merge pull request #3053 from wallabag/api-bulk-add
Added API endpoint to handle a list of URL
2017-05-05 13:56:34 +02:00
Thomas Citharel 14f58edd80 fixed margin on sidebar menu 2017-05-05 09:19:56 +02:00
Thomas Citharel 2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
Thomas Citharel 18e1da6277 rebase
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:56:52 +02:00
Thomas Citharel e35f8439a7 add comment to config.yml to explain live reload feature 2017-05-04 14:49:44 +02:00
Thomas Citharel 8655913ebf disable default dev server 2017-05-04 14:49:44 +02:00
Thomas Citharel 64f81bc316 Adds Webpack support and removes the use for Grunt
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
2017-05-04 14:49:44 +02:00
Nicolas Lœuillet a40029f9d6
Disabled shortcuts on login/register page 2017-05-02 16:21:06 +02:00
Nicolas Lœuillet efd351c98f Added limit 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet 21d955f703
Cleaned craue_config_setting by removing useless download_pictures setting 2017-04-20 15:45:43 +02:00
Nicolas Lœuillet 64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
Nicolas Lœuillet 01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
Maxime 15e4aea678 Remove isPublic from Entry entity fix #2598 2017-04-13 13:12:19 +02:00
Nicolas Lœuillet 3aa655e44a
Fixed migrations 2017-04-10 09:26:08 +02:00
Nicolas Lœuillet 7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet 5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Nicolas Lœuillet 1680c95c27
Changed default value for list mode (grid instead of list) 2017-03-29 14:43:47 +02:00
Nicolas Lœuillet b5a5377af1
Added migration for Scuttle sharing 2017-03-28 14:20:14 +02:00
FrenchHope fb9f100e8f
Scuttle sharing 2017-03-28 14:20:14 +02:00
Nicolas Lœuillet 8ef1df8157
Changed wallabag version 2017-03-02 14:42:16 +01:00
Mateusz Rumiński 78bce602cb Update Polish translation
add missing translation
2017-02-24 18:31:35 +01:00
ngosang 82749439ac Update Spanish translation 2017-02-15 15:41:06 +01:00
Kévin Gomez 177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
Kevin Decherf 3cc0cc0ae7 Fix nav-panel-search height
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:48:59 +01:00
Quent-in 20fa5ca02a Update of CraueConfigBundle in Occitan 2017-02-02 16:29:28 +01:00
Nicolas Lœuillet 4021c928be
Prepare wallabag 2.2.1 🚀 2017-01-31 11:06:35 +01:00
Nicolas Lœuillet a5cd696b22
Added check in migration about uuid field 2017-01-30 21:21:49 +01:00
Nicolas Lœuillet 7a340375c3
Fixed duplicate entry for share_public in craue_setting_table 2017-01-30 16:22:03 +01:00
Nicolas Lœuillet c833d576a9
Prepare wallabag 2.2.0 🚀 2017-01-27 17:28:58 +01:00
Nicolas Lœuillet 01e760691b
Fixed check on index 2017-01-27 14:11:21 +01:00
Nicolas Lœuillet b564d350b0
Added indexes on is_archived and is_starred 2017-01-27 11:44:04 +01:00
Jeremy Benoist 78295b99dd
Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
Nicolas Lœuillet 463cb376e3 Merge pull request #2646 from wallabag/explain-migrations-in-doc
Added explanations about migrations
2017-01-26 13:15:06 +01:00
Nicolas Lœuillet 6dfd1a6c78
Added migration for SQLite 2017-01-25 12:59:04 +01:00
Nicolas Lœuillet 4acbeb9371
Added hardcoded SQL for migration to 2.2 2017-01-23 14:16:00 +01:00
Nicolas Lœuillet b87f171233 Added information about latest migrations 2017-01-23 12:42:58 +01:00
Nicolas Lœuillet 1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
Nicolas Lœuillet 5ed503ab28
Added migration to rename uuid to uid 2017-01-14 13:46:20 +01:00
Jeremy Benoist a4180d0b8e Merge pull request #2733 from wallabag/fix-no-matching-response
Fixed API error No matching accepted Response format could be determined
2017-01-08 10:22:31 +01:00
Nicolas Lœuillet 144f2039e4 Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Fix double overlay on expanded right sidenav
2016-12-30 15:01:39 +01:00
Simounet ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
Simounet bb2934d476 Fix action's icons position 2016-12-30 13:54:13 +01:00
Simounet 8e2419a5cf Fix right side-nav scrolling on low height window 2016-12-30 13:50:59 +01:00
Nicolas Lœuillet 0bacc9e175
Fixed API error 'No matching accepted Response format could be determined' 2016-12-30 13:23:02 +01:00
Simounet 22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
Nicolas Lœuillet 7239082a5e
Renamed uuid to uid 2016-12-29 10:09:44 +01:00
Nicolas Lœuillet 89cd670abf Changed uuid type in database 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet 74b7c0985d Added index on entry.uuid
Useful for entry sharing
2016-12-23 10:26:33 +01:00
Nicolas Lœuillet 7719346328 Merge pull request #2696 from wallabag/run-migration
Run migration on each test
2016-12-23 09:31:41 +01:00
Jeremy Benoist a72f3dc308
Fix bad migration for PostreSQL
Queries weren’t executed for PostgreSQL, bad syntax.
2016-12-23 09:00:13 +01:00
Simounet 78d6c3090a Fix the box shadow on the card entry 2016-12-20 13:04:51 +01:00
Jeremy Benoist 3ef75cc4e3
Be consistent between migration & schema definition 2016-12-19 14:24:19 +01:00
Jeremy Benoist 6514f0ed37
fixup! Run migration in test, ready for MySQL 2016-12-19 10:35:25 +01:00
Jeremy Benoist d44016b072
Use actual database name
We can't retrieve the environment within the migration.
And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`.
Retrieve the database name from the connection is more accurate
2016-12-19 10:35:25 +01:00
Jeremy Benoist 3ad4061dba
pocket_consumer_key can be null 2016-12-19 10:35:24 +01:00
Jeremy Benoist a48b5d5a5a
Run migration in test, ready for MySQL 2016-12-19 10:35:24 +01:00
Jeremy Benoist 77e342f75d Merge pull request #2682 from wallabag/migration-config
Ensure craue_config_setting migration are ok
2016-12-18 20:32:35 +01:00
Nicolas Lœuillet bea8d75417
Replaced quotes for Postgres 2016-12-18 13:47:25 +01:00
Jeremy Benoist 31fec5f363
Ensure craue_config_setting migration are ok
We now can run the migration every time, new line from `craue_config_setting` are properly checked.
2016-12-15 22:25:10 +01:00
Nicolas Lœuillet 881b0578e7
Moved RabbitMQ QoS to parameters 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet 99712e5d85
Added QoS for RabbitMQ 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet 24becc9717 Merge pull request #2667 from wallabag/upgrade-symfony-32
Upgrade to Symfony 3.2
2016-12-15 22:18:45 +01:00
Jeremy Benoist 21e7ccef3d
Fix tests & deprecation notice 2016-12-15 21:38:16 +01:00
Jeremy Benoist 24879db1f7
Add default value for list_mode 2016-12-12 17:41:03 +01:00
Jeremy Benoist 9abac9651f Merge pull request #2650 from wallabag/add-hascolumn
Added hasColumn() in migration to check column existence
2016-11-30 14:17:40 +01:00
Nicolas Lœuillet 067ae472cc
Named index 2016-11-30 12:29:55 +01:00
Nicolas Lœuillet 65a8c6e135
Code review 2016-11-30 11:27:07 +01:00
Nicolas Lœuillet 9aa991281d
Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet d79b3adbed Fixed typo 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 597755b8c7 Cleaned old migrations 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 84c6a48df4 Added dropColumn for SQLite and some enhancements 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet a4d55a9161 Replaced abortIf with skipIf 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 18d7bc3a35 Added checks on migrations 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 986cb53645 Removed my hasColumn and used the existing one in Doctrine 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 73f7eabb6e Added hasColumn() in migration to check column existence 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet 56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 07326af5e2
Added migration to remove useless fields 2016-11-28 13:25:18 +01:00
Kevin Decherf 56026217c5 Material: update size of text in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:49:45 +01:00
Kevin Decherf 819c8f5bd4 Material: render blockquote in italic and strong in bold in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf fdaa044314 Material: update style of pre in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf 59cfd63c23 Material: update style of ul in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf 858430c0d0 Material: update style of article links
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf 5ea90fa8b9 Material: increase max width of article on large screens
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:49 +01:00
Kevin Decherf 7470a2f36a Material: prevent bold in title, update title font size
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
Kevin Decherf 5b69e03eb4 Material: change color of background, article content and titles
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
Nicolas Lœuillet 66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
2016-11-23 09:53:18 +01:00
Nicolas Lœuillet 0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Jeremy Benoist be2725db40
Add migration for new FOSUser version 2016-11-22 21:25:05 +01:00
Jeremy Benoist 5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist 9624b3adfa
These files aren’t used anymore
Translation were moved to the global one
2016-11-22 21:23:58 +01:00
Jeremy Benoist 176e0ea3ca Merge pull request #2317 from wallabag/restricted-access
Added authentication for restricted access articles
2016-11-22 19:12:53 +01:00
Nicolas Lœuillet d51093a7d9
Added documentation and missing translations 2016-11-22 17:32:24 +01:00
Nicolas Lœuillet d64bf7953b
Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
Bertrand Dunogier 7aab0ecf2f Added authentication for restricted access articles
Fix #438. Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
Nicolas Lœuillet c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Thomas Citharel 944b8d6175 Merge pull request #2613 from wallabag/fix-overlap
Fix card action overlap
2016-11-22 10:27:14 +01:00
Jeremy Benoist eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
Jeremy Benoist 625bb56181 Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
Nicolas Lœuillet 98253436e9
Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Yuriy Evdokimov 05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov 5e7fdfc8dd Fix #2056 update config.yml
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
Jeremy Benoist c1683778ab
Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Jeremy Benoist 77e2898ad4
Fix card action overlap
On smaller resolution
2016-11-20 10:14:19 +01:00
Jeremy Benoist 3c969d3990
Add missing translations 2016-11-20 09:39:25 +01:00
Nicolas Lœuillet 995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet 32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet ee122a7528 Added a simple search engine
Fix #18
2016-11-19 19:17:30 +01:00
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 8fdadee3a5
Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet e10e6ab34e
Replace http status with a string
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
2016-11-18 15:55:16 +01:00
Nicolas Lœuillet 10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Nicolas Lœuillet 5d2971cadd
Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Jeremy Benoist 9e2440fe15
Fix migration 2016-11-17 08:05:15 +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 94f2057ffe
Added CSS class on links 2016-11-16 09:17:12 +01:00
Thomas Citharel 10a1ffae53
Fix keyboard navigation on quickstart view
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 22:23:50 +01:00
Thomas Citharel c930992348 fix next/prev page 2016-11-15 21:55:16 +01:00
Thomas Citharel 5637a26e9a Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page !
Also better indentation for js files (changed editorconfig for them).

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:55:10 +01:00
Nicolas Lœuillet 16ef7607f4 Reorganized JS folders for shortcuts 2016-11-15 21:54:50 +01:00
Thomas Citharel af61cb80eb es6 imports
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:54:41 +01:00
Nicolas Lœuillet f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet 49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet 3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet 80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet 1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Nicolas Lœuillet 8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
Jeremy Benoist 8d7b4f0eff
Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
Jeremy Benoist 7005b425e0
Remove the left margin of tag
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
2016-11-08 22:15:37 +01:00
Jeremy Benoist 41c2178685 Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
Nicolas Lœuillet db3838545c
Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist 9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Nicolas Lœuillet a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Nicolas Lœuillet 2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Jeremy Benoist 1e7b04d4ea
Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist da41365579 Merge pull request #2180 from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
Thomas Citharel 32508ef07a
avoid eslint warning by disabling line
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 14:23:09 +01:00
Thomas Citharel d56d416d9b
Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel 3221b2e413
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Jeremy Benoist 3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +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 aedd6ca0fd
Add translations & migration 2016-10-31 13:29:33 +01:00
Jean-Baptiste a0eddc598e Translation update - French 2016-10-30 12:09:08 +01:00
Jeremy Benoist 535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Nicolas Lœuillet c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
Nicolas Lœuillet f08ec5f88a Remove backquote in query 2016-10-28 11:14:14 +02:00
Nicolas Lœuillet f24ea59ea4
Fixed migration and added tests 2016-10-28 10:55:39 +02:00
Jeremy Benoist c68720d40e Merge pull request #2473 from pmichelazzo/master
Portuguese (Brazilian) translation
2016-10-25 11:41:24 +02:00
Nicolas Lœuillet 23406ca3f1
Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
Nicolas Lœuillet d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist f623516e10
SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Baptiste Mille-Mathias d1b075509d Add relevant links to fetch content error pages.
We link to the troubleshooting guide and give the mail link.
2016-10-23 15:34:52 +02:00
Jeremy Benoist 5ce1528953
Fix migrations 2016-10-23 12:35:57 +02:00
Jeremy Benoist 5751b41491
Add migration for MySQL utf8mb4 2016-10-22 14:01:58 +02:00
Jeremy Benoist fc79f1ffa8
Add verification check for MySQL version
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
Jeremy Benoist b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist 2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist 98efffc2a6
Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
2016-10-22 13:13:07 +02:00
Jeremy Benoist 206bade58a
Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Jeremy Benoist 817724a7b8
Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
2016-10-22 13:09:16 +02:00
Thomas Citharel ab61dbc073
remove padding on small widths
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:12 +02:00
Thomas Citharel 34aa06a9b9
WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:04 +02:00
Nicolas Lœuillet f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes
Some fixes
2016-10-21 15:15:41 +02:00
Jeremy Benoist 2cbf0d05d4
Update translation for piwik_host 2016-10-21 10:45:39 +02:00
Jeremy Benoist 2297d60f10
If reload content failed, don’t update it
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
2016-10-20 22:49:46 +02:00
Paulino Michelazzo 5d6cffedb1 Update Portuguese (Brazilian) translation
Adding the config.yml on the package.
2016-10-19 19:25:48 +02:00
Paulino Michelazzo 99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
Paulino Michelazzo 3a3c6b866b Portuguese (Brazilian) translation
This the Portuguese (Brazilian) for the Wallaby v2.
2016-10-18 20:51:31 +02:00
Nicolas Lœuillet f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Nicolas Lœuillet 5e469b91d9
Fixed hardcoded title for internal settings
Fix #2458
2016-10-17 09:14:05 +02:00
Jeremy Benoist 692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
Jeremy Benoist 3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
Sven Fischer 5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +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
Thomas Citharel d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist f1c3f68e90
ApiDoc & Route annotation were conflicted
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
2016-10-15 16:46:42 +02:00
Thomas Citharel 8ecfdd7f8a Merge pull request #2450 from wallabag/new-improvement-view
View improvements
2016-10-15 15:38:49 +02:00
Thomas Citharel 08f5a5b6bd fix stylelint 2016-10-15 15:25:46 +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
Thomas Citharel 76f2123def Merge pull request #2412 from wallabag/fix-postgres-migration
Fix PostgreSQL migrations
2016-10-15 14:42:46 +02:00
Jeremy Benoist b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
Jeremy Benoist fb8835cc8f Define a dev version for the master
This is to be sure that user testing wallabag from the master will have the version defined as dev.
2016-10-10 11:31:57 +02:00
Jeremy Benoist 4c79c51f99
Fix PostgreSQL migrations 2016-10-09 21:35:04 +02:00