Prepare wallabag 2.1.2 :rocket:

2 files changed, 51 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed12954..f3e29981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,77 @@
 # Change Log
 
-## [Unreleased](https://github.com/wallabag/wallabag/tree/HEAD)
+## [2.1.2](https://github.com/wallabag/wallabag/tree/2.1.1) (2016-10-17)
 
 **Fixed bugs:**
 
+- Can't login after upgrade to 2.1.1 [\#2437](https://github.com/wallabag/wallabag/issues/2437)
+- composer has issues with master [\#2425](https://github.com/wallabag/wallabag/issues/2425)
+- List of tags page has issues [\#2390](https://github.com/wallabag/wallabag/issues/2390)
 - defaut langage [\#2379](https://github.com/wallabag/wallabag/issues/2379)
+- DB migrations from 2.0.8 to 2.1.1 fail with PostgreSQL [\#2364](https://github.com/wallabag/wallabag/issues/2364)
 - Deleting a developer client throws \(My\)SQL error [\#2350](https://github.com/wallabag/wallabag/issues/2350)
 - Cannot create an OAuth token when using HTTP-basic [\#2278](https://github.com/wallabag/wallabag/issues/2278)
-- Orphaned tags. [\#2270](https://github.com/wallabag/wallabag/issues/2270)
 - Tags are empty and not exported in json export [\#2256](https://github.com/wallabag/wallabag/issues/2256)
+- Bookmarklet import does not work - page closes too fast [\#1960](https://github.com/wallabag/wallabag/issues/1960)
+- Fixed Twitter Cards by adding a description tag [\#2419](https://github.com/wallabag/wallabag/pull/2419) ([nicosomb](https://github.com/nicosomb))
+- Remove automatic closing of the window from bookmarklet [\#2414](https://github.com/wallabag/wallabag/pull/2414) ([szafranek](https://github.com/szafranek))
+- Show number of annotations instead of nbAnnotations placeholder [\#2406](https://github.com/wallabag/wallabag/pull/2406) ([szafranek](https://github.com/szafranek))
 - Fix exists API call [\#2377](https://github.com/wallabag/wallabag/pull/2377) ([tcitworld](https://github.com/tcitworld))
 
 **Closed issues:**
 
+- Mention example instance in api documentation [\#2443](https://github.com/wallabag/wallabag/issues/2443)
+- upgrade to 2.1.1 with PostgreSQL broken [\#2442](https://github.com/wallabag/wallabag/issues/2442)
+- Wallabag is fetching 'Cookie Approval Text' instead of article content [\#2428](https://github.com/wallabag/wallabag/issues/2428)
+- German documentation: Wallabag updaten - wrong links [\#2423](https://github.com/wallabag/wallabag/issues/2423)
+- Upgrade from 2.0.8 --\> 2.1.1 Fails at RabbitMqBundle [\#2421](https://github.com/wallabag/wallabag/issues/2421)
+- Developer documentation: add information on how to run tests [\#2415](https://github.com/wallabag/wallabag/issues/2415)
+- Import from Pocket fails [\#2408](https://github.com/wallabag/wallabag/issues/2408)
 - ClassNotFoundException when executing bin/console [\#2398](https://github.com/wallabag/wallabag/issues/2398)
+- Document parameters.yml and parameters setup during initial install or upgrade [\#2392](https://github.com/wallabag/wallabag/issues/2392)
 - Redis using unix socket [\#2391](https://github.com/wallabag/wallabag/issues/2391)
 - Don't display two factor checkbox in user admin panel when two factor is disabled [\#2380](https://github.com/wallabag/wallabag/issues/2380)
+- Cleanup for the installation documentation [\#2370](https://github.com/wallabag/wallabag/issues/2370)
 - Bug: Error when I delete API's client [\#2369](https://github.com/wallabag/wallabag/issues/2369)
 - Error with simplexml\_load\_file\(\) [\#2368](https://github.com/wallabag/wallabag/issues/2368)
+- Cannot fetch LowTechMagazine articles [\#2358](https://github.com/wallabag/wallabag/issues/2358)
+- Export in epub or pdf format in API - improvment [\#2311](https://github.com/wallabag/wallabag/issues/2311)
 - Add information in public articles [\#2289](https://github.com/wallabag/wallabag/issues/2289)
+- Firefox bookmarklet not working  [\#2210](https://github.com/wallabag/wallabag/issues/2210)
 - Allow socket connection to MySQL [\#2143](https://github.com/wallabag/wallabag/issues/2143)
+- On Chrome, the bookmarlet doesn't work [\#2130](https://github.com/wallabag/wallabag/issues/2130)
 - Write permission on data/db [\#2064](https://github.com/wallabag/wallabag/issues/2064)
+- Tagging rule "language" variable not exist [\#2060](https://github.com/wallabag/wallabag/issues/2060)
 - New third-party resource [\#2039](https://github.com/wallabag/wallabag/issues/2039)
 - add speed reading option [\#2000](https://github.com/wallabag/wallabag/issues/2000)
+- Delete account [\#1640](https://github.com/wallabag/wallabag/issues/1640)
 
 **Merged pull requests:**
 
+- Bring make dev [\#2451](https://github.com/wallabag/wallabag/pull/2451) ([tcitworld](https://github.com/tcitworld))
+- View improvements [\#2450](https://github.com/wallabag/wallabag/pull/2450) ([nicosomb](https://github.com/nicosomb))
+- Fixed french and german doc homepages [\#2447](https://github.com/wallabag/wallabag/pull/2447) ([nicosomb](https://github.com/nicosomb))
+- Added information about tagging rules in documentation [\#2446](https://github.com/wallabag/wallabag/pull/2446) ([nicosomb](https://github.com/nicosomb))
+- Mention example instance in docs [\#2444](https://github.com/wallabag/wallabag/pull/2444) ([Kaligule](https://github.com/Kaligule))
+- Minor fixes in the english documentation [\#2439](https://github.com/wallabag/wallabag/pull/2439) ([zertrin](https://github.com/zertrin))
+- Update messages.pl.yml [\#2438](https://github.com/wallabag/wallabag/pull/2438) ([mruminski](https://github.com/mruminski))
+- Added french documentation for upgrade [\#2435](https://github.com/wallabag/wallabag/pull/2435) ([nicosomb](https://github.com/nicosomb))
+- Added french documentation for parameters.yml [\#2434](https://github.com/wallabag/wallabag/pull/2434) ([nicosomb](https://github.com/nicosomb))
+- Update ISSUE\_TEMPLATE.md [\#2432](https://github.com/wallabag/wallabag/pull/2432) ([j0k3r](https://github.com/j0k3r))
+- Lock deps for FOSUser [\#2429](https://github.com/wallabag/wallabag/pull/2429) ([j0k3r](https://github.com/j0k3r))
+- Fix links on english documentation homepage [\#2426](https://github.com/wallabag/wallabag/pull/2426) ([nicosomb](https://github.com/nicosomb))
+- Fixed display for note in installation page [\#2422](https://github.com/wallabag/wallabag/pull/2422) ([nicosomb](https://github.com/nicosomb))
+- Avoid error when Redis isn't here in tests [\#2420](https://github.com/wallabag/wallabag/pull/2420) ([j0k3r](https://github.com/j0k3r))
+- Added support of Twitter Cards for public articles [\#2418](https://github.com/wallabag/wallabag/pull/2418) ([nicosomb](https://github.com/nicosomb))
+- Define a dev version for the master [\#2417](https://github.com/wallabag/wallabag/pull/2417) ([j0k3r](https://github.com/j0k3r))
+- When a sub command fail, display error message [\#2413](https://github.com/wallabag/wallabag/pull/2413) ([j0k3r](https://github.com/j0k3r))
+- Fix PostgreSQL migrations [\#2412](https://github.com/wallabag/wallabag/pull/2412) ([j0k3r](https://github.com/j0k3r))
+- Fix entities definition [\#2411](https://github.com/wallabag/wallabag/pull/2411) ([j0k3r](https://github.com/j0k3r))
+- Optimize tag list display [\#2410](https://github.com/wallabag/wallabag/pull/2410) ([j0k3r](https://github.com/j0k3r))
+- Occitan version update [\#2409](https://github.com/wallabag/wallabag/pull/2409) ([Quent-in](https://github.com/Quent-in))
+- Fix few invalid HTML tags [\#2405](https://github.com/wallabag/wallabag/pull/2405) ([szafranek](https://github.com/szafranek))
+- Cleaned up documentation for installation process [\#2403](https://github.com/wallabag/wallabag/pull/2403) ([nicosomb](https://github.com/nicosomb))
+- Removed 1.x stuff in CHANGELOG [\#2402](https://github.com/wallabag/wallabag/pull/2402) ([nicosomb](https://github.com/nicosomb))
 - Set env to prod in documentation [\#2400](https://github.com/wallabag/wallabag/pull/2400) ([j0k3r](https://github.com/j0k3r))
 - Use default locale for user config [\#2399](https://github.com/wallabag/wallabag/pull/2399) ([j0k3r](https://github.com/j0k3r))
 - Ensure orphan tag are remove in API [\#2397](https://github.com/wallabag/wallabag/pull/2397) ([j0k3r](https://github.com/j0k3r))
@@ -39,9 +85,11 @@
 - Added OpenGraph support for public articles [\#2383](https://github.com/wallabag/wallabag/pull/2383) ([nicosomb](https://github.com/nicosomb))
 - try to reduce assets build npm connection failing by updating nodejs [\#2375](https://github.com/wallabag/wallabag/pull/2375) ([tcitworld](https://github.com/tcitworld))
 - Clickable tags [\#2374](https://github.com/wallabag/wallabag/pull/2374) ([tcitworld](https://github.com/tcitworld))
+- API: ability to export entry in all available format \(epub, pdf, etc...\) [\#2372](https://github.com/wallabag/wallabag/pull/2372) ([pmartin](https://github.com/pmartin))
 - Remove mouf/nodejs-installer from composer [\#2363](https://github.com/wallabag/wallabag/pull/2363) ([j0k3r](https://github.com/j0k3r))
 - Changed relation between API client and refresh token [\#2351](https://github.com/wallabag/wallabag/pull/2351) ([nicosomb](https://github.com/nicosomb))
 - Fix relations export for Entry [\#2332](https://github.com/wallabag/wallabag/pull/2332) ([j0k3r](https://github.com/j0k3r))
+- Delete user [\#2177](https://github.com/wallabag/wallabag/pull/2177) ([tcitworld](https://github.com/tcitworld))
 
 ## [2.1.1](https://github.com/wallabag/wallabag/tree/2.1.1) (2016-10-04)
 **Fixed bugs:**
diff --git a/app/config/config.yml b/app/config/config.yml
index bcc4c8eb..ed2e7416 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.1.2-dev
+    version: 2.1.2
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'