Commit Graph

12 Commits

Author SHA1 Message Date
Alex Corn
86e87e88ed
Merge branch 'master' into v4
# Conflicts:
#	components/confirmations.js
#	components/inventoryhistory.js
#	components/twofactor.js
#	components/users.js
#	components/webapi.js
#	index.js
#	package.json
2023-06-27 01:19:00 -04:00
Alex Corn
36e8c79d87
Some minor updates 2023-06-24 02:40:48 -04:00
Alex Corn
7ebbd5806f
Merge branch 'master' into v4
# Conflicts:
#	.idea/codeStyles/Project.xml
#	.idea/codeStyles/codeStyleConfig.xml
#	package.json
2022-02-02 03:43:42 -05:00
Alex Corn
640c47b933
Updated comment 2022-02-02 03:35:44 -05:00
Alex Corn
600a41143b
Refactor all files 2021-07-29 02:55:56 -04:00
Alex Corn
2adc23f0ac
Added eslint config 2021-07-29 02:30:41 -04:00
Alex Corn
d9b6b55efc
3.41.7 2020-09-23 18:11:33 -04:00
Alex Corn
fbfff1398b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/encodings.xml
2019-02-14 00:29:44 -05:00
Alex Corn
1180eb9d3f Deprecated webchat methods 2019-02-13 17:35:39 -05:00
Alex Corn
6cd06c3adf Updated module type 2019-02-06 19:54:04 -05:00
Alex Corn
d35e3c107c Make sure CConfirmation.{id, creator} are always strings 2019-02-06 19:36:01 -05:00
Alex Corn
ebac6c97ad Added IDE config to repo 2018-10-31 03:47:55 -04:00