github.com/wger-project/wger commits | Ecosyste.ms: OpenCollective

#241 suggested changes [2]

cf74980dec6d92931a2d0df119c2562efe347f96 authored about 9 years ago

#241 suggested changes

5f03647d4925fa30666d96e6cb8a169a88651876 authored about 9 years ago

Possible fix for issue #241

bcc471d0b8a6ca62509267cade843a4594fd72f7 authored about 9 years ago

Restrict user registration

For certain deployments, users should not be able to register on their own,
but should be added ...

1fa288876ccfc9cfa666729768e2952445786508 authored about 9 years ago

Download tinymce with bower

This dependency was forgotten when moving to bower

ffa5ac1a107d0691ed2480b942ad34990e5fc62f authored about 9 years ago

Make the persona login less prominent

The future of the service is not clear, so this should steer people clear of
it.

ee4fb863268070b74d75d4a5025f492eb49c21c9 authored about 9 years ago

Correctly iterate over the nutritrion dictionary

Fixes #242

2c52c3d5daba69a1c8d987a3cc9ecc11d36f3aa5 authored about 9 years ago

Update changelog

ffe8f35fbad1cfcd24c7caa86e910d82a32e0d5a authored about 9 years ago

Merge pull request #233 from purplebird/no_users_in_gym_fix

Fixed datatables warning with empty gym member table

ed57bc6e33680f6bc6e9fbc622e4bf8afb9ab209 authored about 9 years ago

Cleaner template.

53b80d0ed06c0904fb77d42f758613f380fb82e5 authored about 9 years ago

Removed the {% empty %} message for the user list, updated admin/trainer list text.

b429340b1e1f18b8f71b80f2e79164e5aa0bc67b authored about 9 years ago

Merge branch 'no_users_in_gym_fix' of github.com:purplebird/wger into no_users_in_gym_fix

99abad473b1a47b38d97ca027f6c9c2d4c5d874f authored about 9 years ago

Magically fixed? OK.

dad92d364360143c28208b674485034fc1cac3fd authored about 9 years ago

Changed partial_user_list template to prevent error message when a gym has no users.

6a526012df11119b54e1831791beff8f43ede38d authored about 9 years ago

partial user list change

56a5466c582c840e438f7ea8488039e88d155a30 authored about 9 years ago

partial member fix

5a49676cc58df9452edc6b729a03cd920b61b190 authored about 9 years ago

PEP8

8cbc1c5f65be6c5adf02a47fc99013e647d9430a authored about 9 years ago

Better function flexibility in get_nutrition_data()

cc79c75a910d386ed00c08ae698563192b3311ac authored about 9 years ago

Travis-friendly... fudged test cases.

7ff10b579eb60e1080711806cdbc585f20b7003a authored about 9 years ago

travis hates me

77682dd7e4e8cef34a8902e4cd539eee967bfbe6 authored about 9 years ago

PEP8

f51e6053c56d0871ee6720e8284136c6c3437100 authored about 9 years ago

Now uses first() instead of [0]. Updated template to better reflect values.

ae8c3314e77d5310b2e6b6bda63db8f0ce35cfda authored about 9 years ago

Start writing documentation for gym management

d0038bf2992d0ef762e945debeee97e30841e9c5 authored about 9 years ago

Update changelog

cc02bdc1df12bf33c1859251e47588225e439b98 authored about 9 years ago

Merge pull request #240 from purplebird/deprecated_warning_fix

Deprecation warning on login fix.

5d7ee83eb9020d05d24f603b7e27d490d35eb2aa authored about 9 years ago

Update changelog

4103df056508c978975928ab4263496ee6f5fb02 authored about 9 years ago

Merge pull request #239 from purplebird/csv_attack

CSV attack fix

f3c393aafecb7699bb4686bf7b4bec63af67f3a2 authored about 9 years ago

Deprecation warning on login fix.

795f7a74ff32ccaa4f54625e1b9382f2320c3dc2 authored about 9 years ago

Updated template to reflect changes.

0e68a3cb949f43f593f2c72d0ff251479b223a41 authored about 9 years ago

Limited csv rows to 1000

7cb9b82bdc556200e58ed79efe0d2478691ad5f0 authored about 9 years ago

partial user list change

55763da6b701537cd36b9ee5d085e681d27a4ae8 authored about 9 years ago

Add checks in template for admin config

These tests check that the user viewing the gym's member page has a
GymAdminConfig entry and bel...

2f8d1342fd8a97f90a714562985b2651df0453ca authored about 9 years ago

Remove mobile calendar template

With the past changes to the "desktop" template, it can be used without
changes for the mobile v...

184d6386409586fcf478aaf10ff408892b10ba3f authored about 9 years ago

Render year log with an accordion

This is specially useful for many entries

32878218ec32421e04e0eac7ae307fd87bed382b authored about 9 years ago

Small refactor of monthly log view

This uses now dropdowns for edit operations. Also the individual weight
entries are now rendered...

e152206fd418059e3ca123b606ef0985e02480c3 authored about 9 years ago

Use button dropdowns for edit operations

8e7b7b380cf042b443725739b7b12e4a11a9d0ad authored about 9 years ago

Use the 'cog' icon for options

This is just for consistency with other pages

d3bf062e3b48b9136589ae2f6c3662e6ad13ce47 authored about 9 years ago

Redirect to gym member page

This is more consistent behaviour and is what is expected anyway. The
administrator will probabl...

d8b16be6439591762da526a74f2c5fa55ee9e419 authored about 9 years ago

Added myself to authors.

1c4137a4ec0a6b50ddec1fafb0999598f74ba274 authored about 9 years ago

Merge branch 'master' into metrics-graphics

8659210c85cb539b4db05f889d97ba4897b5e70e authored about 9 years ago

Update changelog

1c9b21220aba93a3e872c33f016ab8360079d407 authored about 9 years ago

Merge pull request #235 from purplebird/unique_csv_entry

Fixed error when importing duplicate CSV entries

fa6b3601e367c33266b0f5db56266a136e75f112 authored about 9 years ago

Fixed error when importing duplicate CSV entries

6295b602fd4acff309fdcebf1f052a85882dd11b authored about 9 years ago

Changed partial_user_list template to prevent error message when a gym has no users.

4c7f357495d43adfe8a5c9fd1dba827bd2002c8a authored about 9 years ago

Fixed #210 (without iterating this time)

e6391389c791185b171022fa4ba96397ebd30ac5 authored about 9 years ago

Add nuclear option to delete all available caches

c019c337c8642006a7a851c40bbedbb2c32fc5b5 authored about 9 years ago

Merge branch 'master' of github.com:rolandgeider/wger

ce208048d71c2d0f7c3b146b3f9020e191037f57 authored about 9 years ago

Correctly quote the user's password

19e4406bcfad49c8866273e31b8f4c66e8df0600 authored about 9 years ago

Merge https://github.com/purplebird/wger into nutriplan

02c2e96052f30dea5caf7a247deb628fb327e03e authored about 9 years ago

Fixed issue #210

2c8e892122b81d8a92cda091286e3b61dba77a23 authored about 9 years ago

Merge branch 'gym-refactor'

Conflicts:
wger/software/templates/changelog.html

9e63ce0feef62e94035438d79e380bf496f4e2c4 authored about 9 years ago

Correctly hide header if user has not enough rights

204800a4ff7d5a061b764b239ad276626c778475 authored about 9 years ago

Correctly set the categories

This change was needed for django 1.8.6 and is the correct way to do it
anyway.

f3a6057e9728cf63bbbe5b14561c8c27c4efb86f authored about 9 years ago

Bower must be installed in wger source folder

314b4de7d4d3051d9ae0820b67e474d2c0891031 authored about 9 years ago

Correctly calculate date difference (signs are hard)

908f7ea103c5315ae74013b55e4827c72ec65616 authored about 9 years ago

Don't add deactivated members to inactivity report

977ed494f3a5279ebbbd4a11e176ea35757b471d authored about 9 years ago

Small changes to permission checks

Only
- managers of their own gym
- all gneral managers
can edit users.

726972f8ab5501cf58b7de31ec243a3e180b9ff4 authored about 9 years ago

Move test user fixtures to 'core' application

This is the place where they logically belong. They were in the 'manager'
app for historical rea...

7a00d19d9d38e94dad10da9f08511511aed5f451 authored about 9 years ago

Some changes to gym permissions

This allows general managers to access the user's detail pages for all
members in the system.

133cb7a7de0d9d199be5293892cb316d27a95fe8 authored about 9 years ago

Maintain order of exercises when adding to supersets

Fixes #229

f1929f0e5a025b679799a7034ace772d6a63e48c authored about 9 years ago

Fix typo

1e6462290a96e47fb110d13177298a22d6285224 authored about 9 years ago

Add jpeg packages to README installation instructions

1b89addd0ab5c14d6459153eeff53fb494634ac8 authored about 9 years ago

Use correct number of return values

Fixes #195

462d5a6a70de78fb0aadad52c91ec4cfa079d5c0 authored about 9 years ago

Add helper command to re-calculate user cache table

0f0c167edacfdbeab952cb5eafd239c824e10440 authored about 9 years ago

Merge branch 'master' into gym-refactor

Conflicts:
wger/software/templates/changelog.html

aa7a3e143f5d58347c0f519199aa960ab6369e6f authored about 9 years ago

Remove screenshot, not needed anymore

c4137f5660fcab100b4c6fe8148352fc4bba35cb authored about 9 years ago

Download metrics-graphics with bower

ee16b24d09cb33f2465f19413ee4fde03441eea9 authored about 9 years ago

Merge branch 'master' into metrics-graphics

Conflicts:
wger/weight/templates/overview.html
wger/weight/views.py

0488dbd6d594eb71cf370ebf7a7a940d1ddb6d59 authored about 9 years ago

Allow general managers to edit users

a91e4ef2f0631db36a68d5c67996b0f5d68200cb authored about 9 years ago

Merge pull request #225 from romansp/page-speed

Improve page loading by optimizing front-end resources

01bd5f8087295616bdef8e0092761f5a83ca06d9 authored about 9 years ago

reduced .png images size without actual visual difference

105a1dceeda54185a264b63cbcae972e24fa614a authored about 9 years ago

enable css minification

reduced .png images size without actual visual difference

237d12d1efbc0bf85dac2db5ff63c385c6422446 authored about 9 years ago

Merge branch 'gym-refactor' of github.com:rolandgeider/wger into gym-refactor

Conflicts:
wger/core/tests/test_user.py

1f6e0b51cd8341173daa8d0d6ba0a548e932efaa authored about 9 years ago

Add missing access test for user detail page

51dc10d0a3522d9853ae203ae023bc5974ae8796 authored about 9 years ago

Allow general managers to access user page

cc60821ea44e1c1315556bd6d96187a26576415f authored about 9 years ago

Show gym in general user list

3d119f08d50bdc55f792ba8e219b19385eeb3fbc authored about 9 years ago

Merge pull request #213 from romansp/fix-205

Fixes to minor visual issues from #205

342bf1c7ab6947333f34e9e604c450b6b103680f authored about 9 years ago

added   before [active] label for workouts and schedule

b6d72f3fb9a5524ed48795e93a822890cdadd5fa authored about 9 years ago

Add test for general user overview

6462697018559a8a41d4e67818203fe9522bdc4a authored about 9 years ago

Add general user list

See #212

ce53f229bf22d62a1e58f615e70ac3f8afd664eb authored about 9 years ago

Move list of users to partial template

This can be included elsewhere, e.g. in the general user list of #212.

2620e7118e59dd97316696568f344e8e224706fa authored about 9 years ago

Update changelog

b7454a53fad855f578c93326c7523ea3e7aa9ded authored about 9 years ago

Merge pull request #223 from romansp/fix-206

Activate localization for share buttons

0994c32141160fe41ca3930ecf6a82325612330d authored about 9 years ago

Activate localization for share buttons. Closes #206

09610f685929d360605cd703839e1446c8808581 authored about 9 years ago

Create a usercache entry for default user

c4eff443041e4fdd69b58f7497a76b21bf6e8114 authored about 9 years ago

Visually group contract types and options

3b62ce01de1ca81eaa3c9d9aa86111767775dbca authored about 9 years ago

Add missing string representation for cache

e403f24f40434106009d169da3278a69ca2e1194 authored about 9 years ago

Add caching table

This table can store expensive queries, etc. such as the last activity. With
this, the gym user ...

ae9fb74b23aecf44ff05b9e8ceabcef155b0ce22 authored about 9 years ago

Optimize last activity helper

While this further reduces the number of queries in the user overview
by around a third, it is n...

0c6a6f933a37bbb7e32f5929c2f3e2b18302289e authored over 9 years ago

Randomize workout creation date

a8717f50afd8be9af6fa7fef8430c3f1d3d1c1aa authored over 9 years ago

Optimize imports

0f674f5800cc9a94233aa4eb16dfd5589952fd68 authored over 9 years ago

Apply filters in correct order

7402565240f2331a8442155166970527b130a686 authored over 9 years ago

set correct line-height for calendar buttons, so text will be in the middle

13ca9cce4c3eb5fb17acad6b59c715415f89e854 authored over 9 years ago

cancel margin-top for the first h2 in 'shoutout' block on feature page, so it will be in line with other columns

6f548ab1e1b6bb8cd821b6890028310dfc21b0b0 authored over 9 years ago

force text white color on :hover (:focus) of 'Get in touch' link in header

c6e12dfb46bdf9299f12943bf8428d970e265be8 authored over 9 years ago

fixed disappearing of navbar action when screen is shrinked

9d44b90d78b8e8ee0bf0a9fe99f94ff66f1b9fa6 authored over 9 years ago

Make more obvious that a gym ID can be used

d1bc2093327d1898591dc1ef477e44a89edd573c authored over 9 years ago

Also add a random time to the dummy sessions

ee26ccfe22be5ea1d3a2ca89ddeb6ae95ad4c423 authored over 9 years ago

Only bulk-create dummy entries per user

Don't try to collect all entries and bulk save them at once, with some hundred
entries, this mak...

25c3d735225f05d7c8a6ed7367c77c9f568b3333 authored over 9 years ago

Correctly check for existence of options

d60d896de57e8bfb9f06eb1b2d84cba6756c6dd0 authored over 9 years ago