Skip to content

Commit 49182f9

Browse files
authored
Merge branch 'next' into feature/crudcontext
2 parents 642574c + c6f48f7 commit 49182f9

File tree

157 files changed

+8028
-5220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+8028
-5220
lines changed

.eslintrc.json

+3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
{
125125
"files": [
126126
"frontend/express/public/javascripts/countly/*.js",
127+
"frontend/express/public/javascripts/countly/vue/*.js",
128+
"frontend/express/public/javascripts/countly/vue/components/*.js",
129+
"frontend/express/public/javascripts/countly/vue/data/*.js",
127130
"plugins/*/frontend/public/javascripts/countly.*.js"
128131
],
129132
"env": {

.github/dependabot.yml

+347
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,347 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
target-branch: next
9+
reviewers:
10+
- ar2rsawseen
11+
assignees:
12+
- ar2rsawseen
13+
labels:
14+
- dependencies
15+
versioning-strategy: increase-if-necessary
16+
ignore:
17+
- dependency-name: puppeteer
18+
versions:
19+
- 6.0.0
20+
- 7.0.0
21+
- 7.0.1
22+
- 7.0.3
23+
- 7.0.4
24+
- 7.1.0
25+
- 8.0.0
26+
- dependency-name: uglify-js
27+
versions:
28+
- 3.12.5
29+
- 3.12.6
30+
- 3.12.7
31+
- 3.12.8
32+
- 3.13.0
33+
- 3.13.1
34+
- 3.13.2
35+
- 3.13.3
36+
- dependency-name: grunt-cli
37+
versions:
38+
- 1.4.0
39+
- dependency-name: mcc-mnc-list
40+
versions:
41+
- 1.1.6
42+
- package-ecosystem: npm
43+
directory: "/plugins/EChartMap"
44+
schedule:
45+
interval: daily
46+
open-pull-requests-limit: 10
47+
target-branch: next
48+
labels:
49+
- dependencies
50+
versioning-strategy: increase-if-necessary
51+
- package-ecosystem: npm
52+
directory: "/plugins/alerts"
53+
schedule:
54+
interval: daily
55+
open-pull-requests-limit: 10
56+
target-branch: next
57+
labels:
58+
- dependencies
59+
versioning-strategy: increase-if-necessary
60+
- package-ecosystem: npm
61+
directory: "/plugins/assistant"
62+
schedule:
63+
interval: daily
64+
open-pull-requests-limit: 10
65+
target-branch: next
66+
labels:
67+
- dependencies
68+
versioning-strategy: increase-if-necessary
69+
- package-ecosystem: npm
70+
directory: "/plugins/browser"
71+
schedule:
72+
interval: daily
73+
open-pull-requests-limit: 10
74+
target-branch: next
75+
labels:
76+
- dependencies
77+
versioning-strategy: increase-if-necessary
78+
- package-ecosystem: npm
79+
directory: "/plugins/compare"
80+
schedule:
81+
interval: daily
82+
open-pull-requests-limit: 10
83+
target-branch: next
84+
labels:
85+
- dependencies
86+
versioning-strategy: increase-if-necessary
87+
- package-ecosystem: npm
88+
directory: "/plugins/compliance-hub"
89+
schedule:
90+
interval: daily
91+
open-pull-requests-limit: 10
92+
target-branch: next
93+
labels:
94+
- dependencies
95+
versioning-strategy: increase-if-necessary
96+
- package-ecosystem: npm
97+
directory: "/plugins/crashes"
98+
schedule:
99+
interval: daily
100+
open-pull-requests-limit: 10
101+
target-branch: next
102+
versioning-strategy: increase-if-necessary
103+
- package-ecosystem: npm
104+
directory: "/plugins/data_migration"
105+
schedule:
106+
interval: daily
107+
open-pull-requests-limit: 10
108+
target-branch: next
109+
labels:
110+
- dependencies
111+
versioning-strategy: increase-if-necessary
112+
- package-ecosystem: npm
113+
directory: "/plugins/dbviewer"
114+
schedule:
115+
interval: daily
116+
open-pull-requests-limit: 10
117+
target-branch: next
118+
labels:
119+
- dependencies
120+
versioning-strategy: increase-if-necessary
121+
- package-ecosystem: npm
122+
directory: "/plugins/density"
123+
schedule:
124+
interval: daily
125+
open-pull-requests-limit: 10
126+
target-branch: next
127+
labels:
128+
- dependencies
129+
versioning-strategy: increase-if-necessary
130+
- package-ecosystem: npm
131+
directory: "/plugins/desktop"
132+
schedule:
133+
interval: daily
134+
open-pull-requests-limit: 10
135+
target-branch: next
136+
labels:
137+
- dependencies
138+
versioning-strategy: increase-if-necessary
139+
- package-ecosystem: npm
140+
directory: "/plugins/enterpriseinfo"
141+
schedule:
142+
interval: daily
143+
open-pull-requests-limit: 10
144+
target-branch: next
145+
labels:
146+
- dependencies
147+
versioning-strategy: increase-if-necessary
148+
- package-ecosystem: npm
149+
directory: "/plugins/errorlogs"
150+
schedule:
151+
interval: daily
152+
open-pull-requests-limit: 10
153+
target-branch: next
154+
labels:
155+
- dependencies
156+
versioning-strategy: increase-if-necessary
157+
- package-ecosystem: npm
158+
directory: "/plugins/locale"
159+
schedule:
160+
interval: daily
161+
open-pull-requests-limit: 10
162+
target-branch: next
163+
labels:
164+
- dependencies
165+
versioning-strategy: increase-if-necessary
166+
- package-ecosystem: npm
167+
directory: "/plugins/logger"
168+
schedule:
169+
interval: daily
170+
open-pull-requests-limit: 10
171+
target-branch: next
172+
labels:
173+
- dependencies
174+
versioning-strategy: increase-if-necessary
175+
- package-ecosystem: npm
176+
directory: "/plugins/mobile"
177+
schedule:
178+
interval: daily
179+
open-pull-requests-limit: 10
180+
target-branch: next
181+
labels:
182+
- dependencies
183+
versioning-strategy: increase-if-necessary
184+
- package-ecosystem: npm
185+
directory: "/plugins/onboarding"
186+
schedule:
187+
interval: daily
188+
open-pull-requests-limit: 10
189+
target-branch: next
190+
labels:
191+
- dependencies
192+
versioning-strategy: increase-if-necessary
193+
- package-ecosystem: npm
194+
directory: "/plugins/plugin-upload"
195+
schedule:
196+
interval: daily
197+
open-pull-requests-limit: 10
198+
target-branch: next
199+
reviewers:
200+
- Cookiezaurs
201+
assignees:
202+
- Cookiezaurs
203+
labels:
204+
- dependencies
205+
versioning-strategy: increase-if-necessary
206+
- package-ecosystem: npm
207+
directory: "/plugins/plugins"
208+
schedule:
209+
interval: daily
210+
open-pull-requests-limit: 10
211+
target-branch: next
212+
labels:
213+
- dependencies
214+
versioning-strategy: increase-if-necessary
215+
- package-ecosystem: npm
216+
directory: "/plugins/populator"
217+
schedule:
218+
interval: daily
219+
open-pull-requests-limit: 10
220+
target-branch: next
221+
labels:
222+
- dependencies
223+
versioning-strategy: increase-if-necessary
224+
- package-ecosystem: npm
225+
directory: "/plugins/push"
226+
schedule:
227+
interval: daily
228+
open-pull-requests-limit: 10
229+
target-branch: next
230+
reviewers:
231+
- iartem
232+
assignees:
233+
- iartem
234+
labels:
235+
- dependencies
236+
versioning-strategy: increase-if-necessary
237+
- package-ecosystem: npm
238+
directory: "/plugins/reports"
239+
schedule:
240+
interval: daily
241+
open-pull-requests-limit: 10
242+
target-branch: next
243+
labels:
244+
- dependencies
245+
versioning-strategy: increase-if-necessary
246+
- package-ecosystem: npm
247+
directory: "/plugins/server-stats"
248+
schedule:
249+
interval: daily
250+
open-pull-requests-limit: 10
251+
target-branch: next
252+
labels:
253+
- dependencies
254+
versioning-strategy: increase-if-necessary
255+
- package-ecosystem: npm
256+
directory: "/plugins/slipping-away-users"
257+
schedule:
258+
interval: daily
259+
open-pull-requests-limit: 10
260+
target-branch: next
261+
labels:
262+
- dependencies
263+
versioning-strategy: increase-if-necessary
264+
- package-ecosystem: npm
265+
directory: "/plugins/sources"
266+
schedule:
267+
interval: daily
268+
open-pull-requests-limit: 10
269+
target-branch: next
270+
labels:
271+
- dependencies
272+
versioning-strategy: increase-if-necessary
273+
- package-ecosystem: npm
274+
directory: "/plugins/star-rating"
275+
schedule:
276+
interval: daily
277+
open-pull-requests-limit: 10
278+
target-branch: next
279+
labels:
280+
- dependencies
281+
versioning-strategy: increase-if-necessary
282+
- package-ecosystem: npm
283+
directory: "/plugins/system-utility"
284+
schedule:
285+
interval: daily
286+
open-pull-requests-limit: 10
287+
target-branch: next
288+
labels:
289+
- dependencies
290+
versioning-strategy: increase-if-necessary
291+
- package-ecosystem: npm
292+
directory: "/plugins/systemlogs"
293+
schedule:
294+
interval: daily
295+
open-pull-requests-limit: 10
296+
target-branch: next
297+
labels:
298+
- dependencies
299+
versioning-strategy: increase-if-necessary
300+
- package-ecosystem: npm
301+
directory: "/plugins/times-of-day"
302+
schedule:
303+
interval: daily
304+
open-pull-requests-limit: 10
305+
target-branch: next
306+
labels:
307+
- dependencies
308+
versioning-strategy: increase-if-necessary
309+
- package-ecosystem: npm
310+
directory: "/plugins/two-factor-auth"
311+
schedule:
312+
interval: daily
313+
open-pull-requests-limit: 10
314+
target-branch: next
315+
reviewers:
316+
- LVMBDV
317+
assignees:
318+
- LVMBDV
319+
labels:
320+
- dependencies
321+
versioning-strategy: increase-if-necessary
322+
- package-ecosystem: npm
323+
directory: "/plugins/views"
324+
schedule:
325+
interval: daily
326+
open-pull-requests-limit: 10
327+
target-branch: next
328+
reviewers:
329+
- Cookiezaurs
330+
assignees:
331+
- Cookiezaurs
332+
labels:
333+
- dependencies
334+
versioning-strategy: increase-if-necessary
335+
- package-ecosystem: npm
336+
directory: "/plugins/web"
337+
schedule:
338+
interval: daily
339+
open-pull-requests-limit: 10
340+
target-branch: next
341+
labels:
342+
- dependencies
343+
versioning-strategy: increase-if-necessary
344+
ignore:
345+
- dependency-name: ua-parser-js
346+
versions:
347+
- 0.7.25

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
api/node_modules/
22
.idea
3+
.vscode
34
*_en.properties
45
frontend/express/node_modules/
56
api/config.js

0 commit comments

Comments
 (0)