Commit Graph

1624 Commits

Author SHA1 Message Date
Katharina Bogad
a7dc588ad0 Fix more forms 2021-06-25 17:58:04 +02:00
Katharina Bogad
05bbb2656b Defer SaveUserSettings API calls until after Page 'load' event 2021-06-25 17:57:27 +02:00
Katharina Bogad
4cde333d35 Fix datatable modals 2021-06-25 17:16:26 +02:00
Katharina Bogad
5be9faed43 Bootstrap Dropdown with detached dropdown definition 2021-06-25 16:35:20 +02:00
Katharina Bogad
a8153a2cf2 Merge remote-tracking branch 'upstream/master' into modernjs 2021-06-24 23:22:59 +02:00
Katharina Bogad
f5da53a761
Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Katharina Bogad
2a7fbbecf8 Fix bugs 2021-06-24 22:18:19 +02:00
Katharina Bogad
7a7e944c09 Nuke popup iFrames 2021-06-24 18:56:36 +02:00
Katharina Bogad
29f1119c16 Set root layout based on accept header 2021-06-24 16:05:32 +02:00
Katharina Bogad
f051f05341 Bump bootbox to 5.5.2, preload view javascript 2021-06-24 15:55:42 +02:00
Katharina Bogad
77e365985f Make CSS preloadable, move some CSS out of header 2021-06-24 11:54:25 +02:00
Katharina Bogad
9dab8a502f Moved view-specific GrocyConfig variables into own section
Additionally, GrocyConfig is now complete for every page
with the first line of the body tag.
2021-06-24 11:38:53 +02:00
Katharina Bogad
b3366366b5 Merge remote-tracking branch 'upstream/master' into modernjs 2021-06-24 10:08:11 +02:00
Bernd Bestel
f8fa5db3e7
Fixed multiple datetimepicker contextual timeago (references #1520) 2021-06-24 07:46:32 +02:00
Katharina Bogad
2981816d07 components: fix jQuery find proxy 2021-06-24 00:24:31 +02:00
Katharina Bogad
e916eab13b Merge remote-tracking branch 'upstream/master' into modernjs 2021-06-24 00:13:11 +02:00
Katharina Bogad
9afed0c007 scoping: Fix viewjs jQuery proxy 2021-06-24 00:11:44 +02:00
Katharina Bogad
438a559897 Fix scoped jQuery proxy in components 2021-06-24 00:09:17 +02:00
Katharina Bogad
6b5440cf7a Fix some implementation errors 2021-06-23 23:38:59 +02:00
Katharina Bogad
bda2a742ae View Loading via singleton 2021-06-23 22:41:58 +02:00
Katharina Bogad
4267b42a0a Fix eslint complaints 2021-06-23 22:33:49 +02:00
Bernd Bestel
5e189c8a4a
Fixed multi instace date/time Userfields (fixes #1520) 2021-06-23 22:13:54 +02:00
Katharina Bogad
f2f89830fd viewjs: remove global component usage 2021-06-23 20:36:53 +02:00
Katharina Bogad
e744aa8dc7 scoping: refactor components, GrocyProxy. 2021-06-23 20:31:13 +02:00
Katharina Bogad
843b3f28af scoping: Add proxy class, move UriParam functions 2021-06-23 15:41:18 +02:00
Katharina Bogad
2fbcefa8fd viewjs: scoped jquery
Most instances of $ have been replaced by $scope.
2021-06-23 15:00:53 +02:00
Katharina Bogad
fd61d1ef62 viewjs: Wrap in fuctions
This commit's contents were auto-generated. They wrap all viewjs
in functions and define a common prologue.

New file contents:

```js
function VIEWNAMEView(Grocy, scope = null)
{
    var $scope = $;
    if(scope != null)
    {
        $scope = $(scope).find;
    }

    // original contents indented with \t

}
```
2021-06-22 22:56:57 +02:00
Katharina Bogad
151722ea38 fix grocy locale generation if no data/config.php is present 2021-06-22 13:41:25 +02:00
Katharina Bogad
a41584258a fix buildsystem for fresh clones 2021-06-22 13:06:55 +02:00
Katharina Bogad
e030fda01a Only load datetimepicker when neccesary 2021-06-21 19:11:08 +02:00
Katharina Bogad
1515f45e31 Merge remote-tracking branch 'upstream/master' into modernjs 2021-06-21 18:19:42 +02:00
Katharina Bogad
598860017b Move components to main grocy bundle
Less stalled requests. Still not optimal though.
2021-06-21 13:14:37 +02:00
Katharina Bogad
b7a1c870f0 js: some speed improvements on page load 2021-06-21 00:16:05 +02:00
Katharina Bogad
7f598058bf i18n: static pot to json compilation
Translations aren't embedded on every page load anymore;
this saves roughly 55kB on every single request, because
these can now be cached.
2021-06-20 23:12:17 +02:00
Bernd Bestel
9e3c68982b
Added changelog for #1380 2021-06-20 13:27:16 +02:00
tank0226
b3ed80d186
Improved support for other LDAP servers (#1380)
Co-authored-by: kuanhong <>
2021-06-20 13:22:18 +02:00
Bernd Bestel
a4f7aac963
Mention newly required PHP extensions in changelog (references #1273) 2021-06-20 13:19:09 +02:00
Katharina Bogad
64b8195f62 viewjs: Code deduplication, Grocy. -> GrocyConfig. 2021-06-20 13:06:15 +02:00
Katharina Bogad
87ee45f0b1 viewjs: Move delete confirmation box to frontendhelper
More code deduplication.
2021-06-20 11:10:38 +02:00
Katharina Bogad
3b342f90db viewjs: extract functions for DataTable Initialisation
Also revert back to use rollup-plugin-css-porter,
because rollup-postcss has issues and also doesn't work.
2021-06-20 09:17:11 +02:00
Katharina Bogad
eb38ec7f26 gulp: release bundling 2021-06-19 01:16:14 +02:00
Katharina Bogad
8a53054750 gulp: Move viewjs rollup to postcss 2021-06-19 00:10:26 +02:00
Katharina Bogad
e1b487e503 gulp: fix build task 2021-06-18 21:15:51 +02:00
Katharina Bogad
93b2c00600 Merge remote-tracking branch 'upstream/master' into modernjs 2021-06-18 21:15:43 +02:00
Bernd Bestel
c45034e6b1
Fixed composer.lock merge conflict (references #1273) 2021-06-18 20:58:51 +02:00
Bernd Bestel
5ad4d9f421
Added changelog for #1273 2021-06-18 20:57:08 +02:00
Katharina Bogad
3d7f0652ce eslint: viewjs
Fixed all reported errors, deduped some code in the picker components.
However, these edits were small enough that I'm positive they work.
2021-06-18 20:55:09 +02:00
Marc Ole Bulling
eb135aee39
Add support for printing shoppinglist with thermal printer (#1273)
* Added escpos-php library

* Added button to shoppinglist print menu

* Added to translation

* Added basic printing logic and API call

* Working implementation for printing with the API

* Added openapi json

* Correctly parsing boolean parameter

* Working button in UI

* Change to grocy formatting

* Add Date

* Only show thermal print button when Feature Flag is set

* Fixed API call and added error message parsing

* Undo translation

* Add flag to print quantities as well

* Added printing notes

* Added quantity conversion

* Increse feed

* Fixed that checkbox was undefined, as dialog was already closed

* Added padding

* Formatting

* Added note about user permission

* Fixed error when using notes instead of products

* Review

- Default FEATURE_FLAG_THERMAL_PRINTER to disabled
- Added missing localization strings (and slightly adjusted one)

* Fixed merge conflicts

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-18 20:45:42 +02:00
Katharina Bogad
71ccd22d3c eslint: js/viewjs/mealplan.js
Also, I simplified the rendering code for the events a bit.
Day recepie rendering is now deduped.
2021-06-18 19:49:46 +02:00
Katharina Bogad
d6eb70496f eslint: grocy.js 2021-06-18 19:32:57 +02:00