Commit Graph

1256 Commits

Author SHA1 Message Date
Bernd Bestel
0df2590de2 Excape HTML (where needed, for bootbox) (references #996) 2020-09-08 18:10:30 +02:00
Bernd Bestel
22434c85f0 Applied formatting rules for by #995 changed files 2020-09-08 17:52:35 +02:00
Bernd Bestel
61cfddb1e7 Added changelog for #995 2020-09-08 17:50:49 +02:00
Maximilian Bosch
34ffdb2b4b Adds a few small frontend fixes (#995)
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c7.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +02:00
Bernd Bestel
38bb205a55 Fixed error when starting fresh / without existing database file (references #976) 2020-09-07 08:32:04 +02:00
Bernd Bestel
5b05254816 Fixed iCal sharing API route was always unauthenticated (fixes #993, references #921) 2020-09-07 08:30:08 +02:00
Bernd Bestel
3f1135713a Fixed string concat (fixes #994, references #985) 2020-09-07 08:16:05 +02:00
Bernd Bestel
6adac0588a Applied formatting rules for by #989 changed files 2020-09-06 13:31:54 +02:00
Bernd Bestel
f68e96a235 Added changelog for #989 2020-09-06 13:26:36 +02:00
fipwmaqzufheoxq92ebc
0454c128f0 Stock-Journal: API, Summary, Done By (#989)
* Stockjournal: Add "Done by"

* Add API for Stock-Journal

* Add "Journal-Summary"

* Use ALTER TABLE

* Moved the "Jounral summary" button to the stock journal page

* Changed icon & context menu position for new stock journal summary page

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 13:18:51 +02:00
Bernd Bestel
7498d8f13d Applied formatting rules for by #986 changed files 2020-09-06 10:10:30 +02:00
Bernd Bestel
d0a7756a67 Added changelog for #986 2020-09-06 10:08:08 +02:00
fipwmaqzufheoxq92ebc
85a95f1973 Apikeys (#986)
* Add QR-Code for API-Url/Key

* Show only API-Keys for current user

* Allow only admin users to create custom API-Keys

* Use a managed package of qrcode-generator instead of a copy of the JS file

* Reuse existing localization string (API key)

* Center QR-Code in popups

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 10:00:49 +02:00
dependabot[bot]
40f379b761 Bump bl from 4.0.2 to 4.0.3 (#987)
Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-03 15:57:12 +02:00
Bernd Bestel
836bcc82e5 Applied PHP-CS-Fixer rules 2020-09-01 21:29:47 +02:00
Bernd Bestel
3da8904cba Switch to use PHP-CS-Fixer to format PHP files 2020-09-01 21:22:50 +02:00
Bernd Bestel
0ed1813bee Added changelog for #985 2020-09-01 20:17:23 +02:00
fipwmaqzufheoxq92ebc
32a4f81f62 Filtering of API-Results (#985)
* Add FilteredApiResponse

* Use FilteredApiResponse for Generic-Entity-Search

* Use FilteredApiResponse for Recipe-Fullfillment

* Use FilteredApiResponse for GetUsers

* Use FilteredApiResponse for current Tasks

* Use FilteredApiResponse for ProductStockEntries & ProductStockLocations

* Use FilteredApiResponse for current chores

* Use FilteredApiResponse for batteries-current

* Fix missing highlighting of "< X days"

* Keep to use existing views

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-01 19:59:40 +02:00
Bernd Bestel
60f3d900e8 Display "Track date only"-chores as all-day also in iCal API endpoint (references #941) 2020-09-01 19:32:28 +02:00
Bernd Bestel
2bc3b53c63 Remove phpfmt again, doesn't really work well... 2020-09-01 19:27:37 +02:00
Bernd Bestel
ae590fa910 Also return Userfields for Userobjects (endpoint /objects/{entity}) (fixes #979) 2020-08-31 22:32:56 +02:00
Bernd Bestel
ad4f8a19af Removed the barcodes column from the products list as we don't have that field there anymore 2020-08-31 22:13:02 +02:00
Bernd Bestel
d4c5da2173 Applied PHP formatting rules 2020-08-31 20:40:31 +02:00
Bernd Bestel
33325d5560 Applied .blade.php formatting rules 2020-08-31 20:32:50 +02:00
Bernd Bestel
ea9ba0b2be Typo 2020-08-31 20:21:46 +02:00
Bernd Bestel
7e2574eb73 Added changelog for #977 2020-08-31 20:12:28 +02:00
fipwmaqzufheoxq92ebc
07beee93a9 Add user-field-type "file" (#977)
* Add user-field-type "file"

* Add userfield-type "picture"

* Also limit image height on userfieldsform

* Prevent empty userfields (cause warnings in tables after deleting a file)

* Show files in dialogs

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 20:07:46 +02:00
Bernd Bestel
318db53818 Typo 2020-08-31 19:22:08 +02:00
Bernd Bestel
a995ce0538 Added changelog for #976 2020-08-31 19:19:05 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e Locales: use http-accept-language or cookie (#976)
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 19:11:51 +02:00
Bernd Bestel
4a030b7ffc Added editor.insertSpaces setting 2020-08-31 08:50:55 +02:00
Bernd Bestel
5c101e6750 Use phpfmt to format .php files 2020-08-30 22:52:35 +02:00
Bernd Bestel
2f00d673a7 Also format .blade.php files by default VSCode formatting rules 2020-08-30 22:08:17 +02:00
Bernd Bestel
9cea0c77cd Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
e0e3212f13 Added VSCode JS formatting settings 2020-08-30 12:16:23 +02:00
Bernd Bestel
747660d909 Return API exceptions with proper content type 2020-08-29 19:29:24 +02:00
Bernd Bestel
e93f58916e Forgot some entries in permission_hierarchy... 2020-08-29 19:24:19 +02:00
fipwmaqzufheoxq92ebc
17094f56eb Run database-Migrations in right order (#973) 2020-08-29 19:15:02 +02:00
Bernd Bestel
0f499c69d9 Fixed .pot file syntax error 2020-08-29 18:34:05 +02:00
Bernd Bestel
86300b7025 Refined permissions by existing feature structure (closes #971, references #960) 2020-08-29 18:31:28 +02:00
Bernd Bestel
a8395cb748 Fixed undefined constants warning on the 404 error page 2020-08-29 17:12:31 +02:00
Bernd Bestel
22384aaa2e Error page style improvements 2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0 Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
Bernd Bestel
2c966c77fd Added an EditorConfig file 2020-08-29 16:10:05 +02:00
kriddles
22ca427ca9 Include location and shopping_location_id when opening products (#965) 2020-08-29 12:26:36 +02:00
Bernd Bestel
32cd928460 Added changelog for #960 2020-08-29 12:22:53 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d [WIP] Implemented basic permissions (#960)
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-29 12:05:32 +02:00
Bernd Bestel
f28697e5b4 Added a "Clear filter" button on the stock overview page (closes #879) 2020-08-25 20:20:51 +02:00
Bernd Bestel
0417b73cb5 Show if a consume booking was spoiled on the stock journal page (closes #953) 2020-08-25 19:51:54 +02:00
Bernd Bestel
71a6cbef2d First try on stock overview page: Make filter row more compact 2020-08-25 19:45:54 +02:00