`Merge branch 'master' of https://github.com/wger-project/wger

Conflicts: docs/changelog.rst
mreidy88 · Oct 12, 2017 · fb076c3 · fb076c3
2 parents c9bb395 + f10e90e
commit fb076c3
Show file tree

Hide file tree

Showing 7 changed files with 909 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -23,6 +23,7 @@ Improvements:
 * Exercise image downloader checks only accepted exercises (thanks `@gmmoraes`_) `#363`_
 * Use a native data type for the exercises' UUID (thanks `@gmmoraes`_) `#364`_
 * Increase speed of testsuite by performing the tests in parallel (thanks `@Mbarak-Mbigo`_) `wger_vulcan/#6`_
+* Update screen when adding an exercise to the workout while using set slider (thanks `@gmmoraes`_) `#374`_
 
 Other improvements and bugfixes: `#336`_, `#359`_,`#386`_
 
@@ -37,6 +38,9 @@ Other improvements and bugfixes: `#336`_, `#359`_,`#386`_
 .. _#336: https://github.com/wger-project/wger/issues/336
 .. _#336: https://github.com/wger-project/wger/issues/336
 .. _#359: https://github.com/wger-project/wger/issues/359
+.. _#363: https://github.com/wger-project/wger/issues/363
+.. _#364: https://github.com/wger-project/wger/issues/364
+.. _#374: https://github.com/wger-project/wger/issues/374
 .. _#381: https://github.com/wger-project/wger/issues/381
 .. _#386: https://github.com/wger-project/wger/issues/386
 

diff --git a/extras/dummy_generator/csv/first_names_usa.README b/extras/dummy_generator/csv/first_names_usa.README
@@ -0,0 +1 @@
+https://www.ssa.gov/oact/babynames/decades/names2010s.html
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		https://www.ssa.gov/oact/babynames/decades/names2010s.html