Commit graph

1523 commits

Author SHA1 Message Date
110a523268 Merge branch 'master' into 005_item_editing 2020-12-28 19:55:47 +01:00
bdae6b2f2f Merge branch '009-templateTypes' into 'master'
Create types for items.

Closes #9

See merge request dungeonslayers/ds4!3
2020-12-28 19:35:27 +01:00
5a002b4cb4 Re-add todo. 2020-12-28 19:30:38 +01:00
e7df21426b removed code duplication in item templates
Item templates now all use a common body.
2020-12-28 18:58:01 +01:00
9cf248754c added "Effects" and "Details" tab to all items
Additions:
- partials for effects and details tab with navigation
- loading of partials in main ds4.ts
- add localization

Changes:
- empty "Details" tabs replaced by inclusion of partial
- "Details" tab now displays default message
- Previous "Details" tab of Trinket replaced by "Effects" tab
2020-12-28 18:49:55 +01:00
1ef66a2023 Create types for items. 2020-12-28 18:24:13 +01:00
7986e91ab7 added storageLocation property to items
Additions:
- added storageLocation property to classes
- added storageLocation field to template
- added localization

Changes:
- changed default values for item string properties to "-"

Fixes:
- fixed CSS side-property flex properties
  such that new text field is properly shown
- fixed for="..." setting for item's data.price label
2020-12-28 17:54:33 +01:00
b95514bcdb Merge branch '009-templateTypes' into 'master'
Resolve "Prepare template types"

Closes #9

See merge request dungeonslayers/ds4!1
2020-12-28 17:50:58 +01:00
a84df2d80b Fix class name on jquery. 2020-12-28 17:44:30 +01:00
4d00d8a481 Fix typo in event handler. 2020-12-28 17:38:52 +01:00
9385917edd Update to new data bindings, everythings an interface now. 2020-12-28 17:34:40 +01:00
78be1c2370 Merge remote-tracking branch 'origin/master' into 009-templateTypes 2020-12-28 16:57:22 +01:00
76bbad1b58 Merge branch 'use-types-fork' into 'master'
use fork of foundry-pc-types

See merge request dungeonslayers/ds4!2
2020-12-28 16:54:50 +01:00
525f3c670e use fork of foundry-pc-types 2020-12-28 16:50:32 +01:00
d9440b27a6 Type-ify Actor. 2020-12-28 15:51:00 +01:00
7a4cb7110b Make DS Ascii Art raw. 2020-12-28 12:46:39 +01:00
f9270a3997 gitlab-ci: remove testing stuff 2020-12-28 00:15:53 +01:00
5bf23c875c gitlab-ci: test 2020-12-28 00:10:12 +01:00
b3914bace1 gitlab-ci: test 2020-12-27 21:21:56 +01:00
f20ae5a869 gitlab-ci: test 2020-12-27 21:20:06 +01:00
267eba77df gitlab-ci: test 2020-12-27 21:14:49 +01:00
52a724ca89 gitlab-ci: fix 2020-12-27 20:56:24 +01:00
04dc11d303 gitlab-ci: use passwordfile for deployment 2020-12-27 20:45:14 +01:00
21073f31b8 gitlab-ci: use working rsync docker image 2020-12-27 20:33:02 +01:00
4d13024bb9 gitlab-ci: rsync deployment test 2020-12-27 19:57:58 +01:00
2cbb0ff1dd gitlab-ci: use docker image with rsync 2020-12-27 19:48:24 +01:00
60157e2f09 gitlab-ci: correctly sync folder in deployment 2020-12-27 19:34:06 +01:00
8ae067bcec gitlab-ci: Add deployment 2020-12-27 19:31:33 +01:00
5d35eef623 gitlab-ci don't cache all untracked files 2020-12-27 18:26:30 +01:00
393d3f8b34 gitlab-ci: simplify 2020-12-27 18:25:06 +01:00
7e70f79f58 gitlab-ci: test 2020-12-27 17:11:18 +01:00
60001b3aba gitlab-ci: always run install dependencies job 2020-12-27 16:51:15 +01:00
dc335b783b gitlab-ci: fix syntax 2020-12-27 16:43:20 +01:00
12ef9d595a gitlab-ci: adjust deploy job 2020-12-27 16:38:16 +01:00
040ead5f57 gitlab-ci: test 2020-12-27 15:25:05 +01:00
14e3b2195b gitlab-ci: test 2020-12-27 15:19:20 +01:00
1148005c00 gitlab-ci: test 2020-12-27 15:15:57 +01:00
29de0c7526 gitlab-ci: test 2020-12-27 15:12:57 +01:00
396a11cdde gitlab-ci: test 2020-12-27 15:09:16 +01:00
a62f301df8 gitlab-ci testing 2020-12-27 15:07:23 +01:00
67e2ab7d4a gitlab-ci: testing 2020-12-27 15:03:36 +01:00
0233589cfa gitlab-ci: remove dependencies for testing 2020-12-27 14:59:41 +01:00
d81a7743ca gitlab-ci: only install dependencies on package-lock.json change 2020-12-27 14:37:32 +01:00
24790d5b8c gitlab-ci: temporarily remove env 2020-12-27 14:35:47 +01:00
b48a03db8b improve node_modules caching in gitlab-ci 2020-12-27 14:03:14 +01:00
174c37f3b4 add fake deployment job to gitlab ci 2020-12-27 13:33:53 +01:00
7884a126b2 adjust README 2020-12-27 13:22:14 +01:00
19caaa5171 separate building and linking 2020-12-23 20:33:19 +01:00
3405407745 cleanup gitlab-ci 2020-12-23 20:25:52 +01:00
7489fe8e5d simplify caching in gitlab-ci 2020-12-23 20:24:06 +01:00