gaelle morin
37a8e28793
update: header - responsive ok
2020-06-03 14:16:29 +02:00
gaelle morin
e266e5936e
update: left-menu - hover: comments + colors added
2020-06-03 10:31:45 +02:00
gaelle morin
db592c0dfd
update: left-menu - hover (need refactoring)
2020-06-02 19:03:31 +02:00
Jean-Baptiste Pasquier
bee847d888
fix: typo
2020-06-02 10:53:26 +00:00
Jean-Baptiste Pasquier
4a33ead577
update: add text to about
2020-06-02 10:43:00 +00:00
gaelle morin
9079b6c1c9
update: left-menu - hover (wip)
2020-06-02 09:29:42 +02:00
Jean-Baptiste Pasquier
701c06a556
fix: clean project and make it works
2020-06-01 17:29:30 +02:00
gaelle morin
1432011f34
update: responsive - general layout. Flex to grid
2020-06-01 17:11:24 +02:00
Jean-Baptiste Pasquier
3d860913a6
fix: profile url
2020-06-01 16:28:04 +02:00
maxime_senza
e7b4ba16a5
Merge branch 'feature/projects' of https://git.startinblox.com/applications/hubl into feature/projects
2020-06-01 16:24:27 +02:00
maxime_senza
a247792ed4
feature project : remove client and business profider fields in edition form
2020-06-01 16:24:05 +02:00
maxime_senza
65be45c777
feature: about sib - reduce padding size & add div in blocs
2020-06-01 16:14:00 +02:00
maxime_senza
cf166b71d7
feature: about sib | align center blocs & fix contact button
2020-06-01 16:05:23 +02:00
Jure Ursic
f8d875a590
update: removing conversationn dependency and adding rdf-type attribute
2020-06-01 15:48:26 +02:00
Jean-Baptiste Pasquier
4f351f37fb
remove useless style
2020-06-01 13:02:46 +02:00
Jean-Baptiste Pasquier
5c361bdef9
small fixes, remove tabs
2020-06-01 12:42:35 +02:00
maxime_senza
623c715892
feature : merge updates on master branch & add new class to about page
2020-05-30 10:43:13 +02:00
maxime_senza
fe6b8c903d
Merge remote-tracking branch 'origin' into feature/projects
2020-05-30 10:35:08 +02:00
maxime_senza
62b781ed28
feature: removing unwanted content && personnalizing content for FNK needs
2020-05-30 10:08:18 +02:00
gaelle morin
20e27997d6
fix: fix bugs due to merge
2020-05-29 18:12:29 +02:00
Jure Ursic
49791e1d37
fix: merge conflicts
2020-05-29 17:34:48 +02:00
Jure Ursic
a703671853
feature: job-board listing,, createand edit
2020-05-29 17:33:02 +02:00
gaelle morin
8087e679c8
bugfix : flex added in admin-users
2020-05-29 14:15:05 +02:00
gaelle morin
a87cdf59e1
bugfix : index - style corrected
2020-05-29 14:15:05 +02:00
gaelle morin
c53e65e4a6
bugfix : project-edit - style corrected
2020-05-29 14:15:05 +02:00
gaelle morin
ca845b6f6e
bugfix : circle-edit - style added
2020-05-29 14:15:05 +02:00
gaelle morin
c950cee5c9
bugfix : admin-project - style added
2020-05-29 14:15:05 +02:00
gaelle morin
f0b8d2b31e
bugfix : admin-project-create - .member-select removed
2020-05-29 14:15:05 +02:00
gaelle morin
b32cf018d5
bugfix : admin-circle-create - conflict resolved + accurate styles added + update of form.scss
2020-05-29 14:15:05 +02:00
gaelle morin
2cf65ddab7
bugfix : additional block deleted in circle-profile + hubl-groups removed (no need)
2020-05-29 14:15:05 +02:00
gaelle morin
e72b5693b4
upate: Style for sib-form-autocompletion > select added
2020-05-29 14:15:05 +02:00
gaelle morin
ff12a9d68c
upate: margin of fieldset resolved
2020-05-29 14:15:05 +02:00
gaelle morin
581d89709d
upate: .no-sidebar separated into .no-sidebar + .with-padding
2020-05-29 14:15:03 +02:00
gaelle morin
e26b5f45f5
bugfix: icon of join buttons are aligned
2020-05-29 14:09:42 +02:00
gaelle morin
99bafed78c
update: useless for filters and how-to buttons files deleted
2020-05-29 14:09:42 +02:00
gaelle morin
85f7dfcb62
update: Main header responsive: start
2020-05-29 14:09:42 +02:00
gaelle morin
5e33021818
update: .customer-logo moved to main.scss
2020-05-29 14:09:42 +02:00
gaelle morin
5d69d1a4ee
update: .position-end and box-button are in the same class
2020-05-29 14:09:42 +02:00
gaelle morin
c950d27d47
update: css for form elements are outside the .with-form context
2020-05-29 14:09:42 +02:00
gaelle morin
56f9151345
update: flex class added in other files + %padding removed
2020-05-29 14:09:29 +02:00
gaelle morin
af1d40cbd4
update: classes for avatar, logo and flex added + css for elements from main header are outside the styles for that header
2020-05-29 14:07:44 +02:00
gaelle morin
21d078bda9
update: label for form reviewed + class added for input
2020-05-29 14:07:44 +02:00
gaelle morin
80d3a22cf6
update: clean-up form css
2020-05-29 14:07:44 +02:00
gaelle morin
e79ddc3f37
update: clean-up form css
2020-05-29 14:07:44 +02:00
gaelle morin
f9300d2120
bugfix: buttons in circle-admin
2020-05-29 14:07:44 +02:00
gaelle morin
f01f00732c
update: main css clean up
2020-05-29 14:07:44 +02:00
gaelle morin
3b6121ace9
update: useless styles removed from project-profile
2020-05-29 14:07:44 +02:00
gaelle morin
23412b691f
admin-header css file removed
2020-05-29 14:07:44 +02:00
gaelle morin
c6e4325b34
update: h3 used instead of a class
2020-05-29 14:07:44 +02:00
gaelle morin
6fed12bc01
update: comments added to user-thumb
2020-05-29 14:07:44 +02:00
gaelle morin
6fefd17c9b
update: frameworkisation of user-thumb
2020-05-29 14:07:44 +02:00
gaelle morin
cf30a0e363
update: groups removed
2020-05-29 14:07:44 +02:00
gaelle morin
ef8ad357f7
update: header ok
2020-05-29 14:07:44 +02:00
gaelle morin
4862d25515
update: useless classes removed
2020-05-29 14:07:44 +02:00
gaelle morin
ffd384aa87
update: frameworkisation of forms
2020-05-29 14:07:44 +02:00
maxime_senza
b0be741980
add space betwween text and cta's
2020-05-29 10:16:53 +02:00
maxime_senza
bf2bddeb32
feature : css for about page : colors & make clean on mobile
2020-05-29 00:28:53 +02:00
maxime_senza
7725350ca1
feature: about sib : place import in clean spot of index
2020-05-28 23:49:46 +02:00
maxime_senza
3ca338e4c6
css for about page
2020-05-28 23:49:21 +02:00
maxime_senza
424b8338ef
feature: remove unwanted content & fix css for table
2020-05-28 23:17:16 +02:00
maxime_senza
5ce5f5523b
add css files for about page
2020-05-28 23:16:23 +02:00
maxime_senza
6ea07c6bc0
feature: classes for about page
2020-05-28 23:05:34 +02:00
maxime_senza
4148b8c6f0
feature: about page | change spot in header
2020-05-27 15:07:30 +02:00
Jean-Baptiste Pasquier
0987ba2fbb
fix: typo canal/cercle
2020-05-27 10:55:15 +00:00
maxime_senza
101617fed8
feature : project - remove unwanted fields from the creation form
2020-05-27 12:42:08 +02:00
maxime_senza
148992eaef
feature: about sib | HTML of page + header link + include + sib router
2020-05-27 11:17:44 +02:00
Jean-Baptiste Pasquier
4e2fccdb60
feature: my profile
2020-05-27 06:44:54 +00:00
Jure Ursic
2b4da0d09e
Merge branch 'master' of git.startinblox.com:applications/hubl
2020-05-21 15:26:43 +02:00
Jean-Baptiste Pasquier
f9653163ed
fix: MR155
2020-05-20 16:42:11 +02:00
Jean-Baptiste Pasquier
7c00d2391a
feature: status icon on left menu
2020-05-19 19:42:32 +02:00
Jean-Baptiste Pasquier
120af5b322
feature: add search bar
2020-05-19 19:09:59 +02:00
Jean-Baptiste Pasquier
9f32a4dc9b
feature: private circles
2020-05-19 18:22:00 +02:00
Jure Ursic
647a62bba7
update: removed not needed attribute on sib-directory
2020-05-14 15:03:08 +02:00
Jean-Baptiste Pasquier
beed19cb42
feature: css variables
2020-05-11 18:20:13 +00:00
Jean-Baptiste Pasquier
40792273fe
Fixes & Hubl branding
2020-05-08 13:27:44 +00:00
gaelle morin
851fb4104d
update: business provider template translated
2020-04-24 14:35:37 +00:00
gaelle morin
5fd9f9d39a
update: admninistrator tag tranlated
2020-04-24 14:35:37 +00:00
gaelle morin
baed5b7e27
feature: circle profile translated
2020-04-24 14:35:37 +00:00
gaelle morin
ae76214372
update: missing translation added
2020-04-24 14:35:37 +00:00
gaelle morin
08e03513ce
feature: project profile translated
2020-04-24 14:35:37 +00:00
Gaëlle Morin
49f95489bb
Update page-admin-users.pug
2020-04-24 14:35:37 +00:00
Gaëlle Morin
f91a1d6427
Update page-admin-users-edit.pug
2020-04-24 14:35:37 +00:00
Gaëlle Morin
f984113dd5
Update page-admin-users-edit.pug
2020-04-24 14:35:37 +00:00
Gaëlle Morin
3697e5be8b
Update page-admin-users-create.pug
2020-04-24 14:35:37 +00:00
gaelle morin
a603535a65
feature: left menu translated
2020-04-24 14:35:37 +00:00
gaelle morin
a8f1601777
feature: user menu translated
2020-04-24 14:35:37 +00:00
gaelle morin
35522b4cee
update: use inclusive writing
2020-04-24 14:35:37 +00:00
gaelle morin
5adf9c30ce
update: use inclusive writing
2020-04-24 14:35:37 +00:00
gaelle morin
2630441ee7
feature: edit a user translated
2020-04-24 14:35:37 +00:00
gaelle morin
3d2802ba05
feature: add a user translated
2020-04-24 14:35:37 +00:00
gaelle morin
ea082c16ba
feature: listing of users translated
2020-04-24 14:35:37 +00:00
gaelle morin
fac8d25c79
update: mispelling corrected
2020-04-24 14:35:37 +00:00
gaelle morin
574087cd10
feature: edit a circle translated
2020-04-24 14:35:37 +00:00
gaelle morin
86a4eb6b0b
feature: add a circle translated
2020-04-24 14:35:37 +00:00
gaelle morin
63c03b8105
feature: listing of circles translated
2020-04-24 14:35:37 +00:00
gaelle morin
cd8f4c18d9
update: inclusive writing removed
2020-04-24 14:35:37 +00:00
gaelle morin
e060e68323
feature: edit a project translated
2020-04-24 14:35:37 +00:00
gaelle morin
c3cce9a6ac
feature: add a project translated
2020-04-24 14:35:37 +00:00
gaelle morin
7ef4c1e484
feature: listing of projects translated
2020-04-24 14:35:37 +00:00
gaelle morin
cfa1efbdfa
feature: right menu of admin translated
2020-04-24 14:35:37 +00:00
gaelle morin
2d5055780c
feature: right menu of circles and projects translated
2020-04-24 14:35:37 +00:00
gaelle morin
905e00272e
feature: dashboard translated
2020-04-24 14:35:37 +00:00
Jean-Baptiste Pasquier
65f08ae339
Merge branch 'master' of git.startinblox.com:applications/sib-app into release/dashboard
2020-04-20 17:34:03 +02:00
Jean-Baptiste Pasquier
4f051b345d
fix: redirection and cache
2020-04-20 13:56:46 +02:00
gaelle morin
af63c6632f
fix: name for dashboard icon corrected
2020-04-17 16:23:53 +02:00
Jean-Baptiste Pasquier
4d47402c86
Merge branch 'feature/dashboard' of git.startinblox.com:applications/sib-app into feature/dashboard
2020-04-16 16:48:16 +02:00
Jean-Baptiste Pasquier
9b577fb894
Merge remote-tracking branch 'origin/bugfix/missing_content_login' into release/profile-directory
2020-04-16 14:39:54 +02:00
Jean-Baptiste Pasquier
7375322bfe
minor: setup sib app for dashboard component
2020-04-16 14:32:39 +02:00
Gaëlle Morin
92c8ace547
update: fix user admin icon
2020-04-16 14:30:31 +02:00
Jean-Baptiste Pasquier
019e8b99a6
feature: user administration
2020-04-16 14:30:31 +02:00
Gaëlle Morin
6c8224c0f2
update: clear unused and fixes CSS
2020-04-16 14:30:28 +02:00
gaelle morin
896bd2dc6c
update: some CSS added
2020-04-15 16:19:39 +02:00
gaelle morin
546ce765f5
update: new endpoint added
2020-04-15 16:13:11 +02:00
gaelle morin
55c8b2019c
update: wip on the 'Leave button'
2020-04-15 16:11:39 +02:00
gaelle morin
43d17d7b1c
update: test in dependencies
2020-04-15 16:11:35 +02:00
gaelle morin
9b9012f9a3
update: test to display the size and the content in the same element
2020-04-15 16:10:46 +02:00
Matthieu Fesselier
8c6daf097b
bugfix: wait for notification menu to add listener
2020-04-07 15:09:54 +02:00
Jean-Baptiste Pasquier
7026c0da49
minor: setup sib app for dashboard component
2020-04-07 13:35:54 +02:00
Jean-Baptiste Pasquier
e62d32e6ae
update: add Matomo and Google analytics + Rewrite readme for a complete configuration
2020-04-01 12:12:55 +02:00
Matthieu Fesselier
74a453d169
bugfix: remove extra-context
2020-03-20 14:48:56 +01:00
Matthieu Fesselier
dd6b2b9652
fix badges workaround
2020-03-12 09:11:47 +01:00
Matthieu Fesselier
6983039f9e
update: test badge removal
2020-03-12 08:53:39 +01:00
Jean-Baptiste Pasquier
1a0f0346ae
fix: hd-counter
2020-02-26 22:56:42 +01:00
Jean-Baptiste Pasquier
5f66a59c68
fix: badge url
2020-02-26 22:51:30 +01:00
Jean-Baptiste Pasquier
e1b64c152a
minor: upgrade to sib-chat@0.5 (converse in fullscreen)
2020-02-26 00:30:03 +01:00
gaelle morin
68961182ff
CSS fixup
2020-02-24 15:10:02 +01:00
Jean-Baptiste Pasquier
3e14cb91a4
update: redirect to login and hide page on logged out
2020-02-19 17:03:47 +01:00
Jean-Baptiste Pasquier
8042b179c6
fix: recursiveAdaptWidgets
2020-02-19 16:27:22 +01:00
Jean-Baptiste Pasquier
e1bce61124
perf: improve circle admin
2020-02-10 17:58:03 +01:00
Jean-Baptiste Pasquier
31bd34df98
sorted src, activate condition for public directory and job offers, dev parameter for local lib folder
2020-02-10 13:59:23 +01:00
Jean-Baptiste Pasquier
b512cf3e9a
Merge branch 'update-event' into 'staging'
...
Update event
See merge request startinblox/applications/sib-app!113
2020-02-10 12:22:53 +00:00
Calum Mackervoy
7f227bfc57
Refreshing sib-displays in absence of reactive store
2020-02-05 12:39:29 +00:00
Marjolaine Le Bon
815e5a69b5
ui : update fonts + colors
2020-02-04 15:27:13 +01:00
Marjolaine Le Bon
78637dea70
ui : update Fonts + colors
2020-02-04 13:38:28 +01:00
Marjolaine Le Bon
75d87bd632
init css file + font
2020-02-04 12:25:58 +01:00
Benoit Alessandroni
998fa6099e
Fixing upload dir
2020-02-03 18:01:04 +01:00
Benoit Alessandroni
d69fc976fc
Fixing arguments
2020-02-03 17:48:37 +01:00
Benoit Alessandroni
08e7d5f908
Fixing the event component declaration
2020-02-03 17:22:23 +01:00
Jean-Baptiste Pasquier
d5e19c469c
update: add events component
2020-02-03 15:43:16 +01:00
Jean-Baptiste Pasquier
0f43e021f2
fix: no endpoint for clientCSS
2020-02-03 14:47:58 +01:00
Jean-Baptiste Pasquier
7eff652d5d
Adapted Sib App for ETUC & more flexible way to handle optional components
2020-02-03 14:39:14 +01:00
Jean-Baptiste Pasquier
9562289e53
fix: css for left menu
2020-01-27 13:29:54 +01:00
Jean-Baptiste Pasquier
fb703e7246
fix: move next to parent
2020-01-27 13:18:28 +01:00
Jean-Baptiste Pasquier
7277983e08
fix: left menu circle on widget
2020-01-24 19:30:36 +01:00
Jean-Baptiste Pasquier
e4d9fae0f3
Merge branch 'staging' into circle-perf-fix
2020-01-24 17:58:43 +01:00
gaelle morin
3042c8efe2
project: admin tag displayed when it is needed + some CSS
2020-01-22 16:33:07 +01:00
Jean-Baptiste Pasquier
ae3d6cb282
try to set menu to user container
2020-01-20 14:35:09 +01:00
Jean-Baptiste Pasquier
83e6957934
fix a lot of problems and add js for menus
2020-01-20 13:57:03 +01:00
gaelle morin
36a045cacb
sidebar is responsive for the circles
2020-01-19 14:25:08 +01:00
gaelle morin
5a20cfe3a8
header is responsive
2020-01-19 13:57:34 +01:00
gaelle morin
3e281edc5c
Sidebar is responsive
2020-01-19 13:19:25 +01:00
gaelle morin
56953601e1
Left menu is responsive
2020-01-19 10:48:22 +01:00
gaelle morin
90a92cc832
scrollbars are customised
2020-01-18 21:43:41 +01:00
gaelle morin
cd9e478264
scrollbars on left menu and content added
2020-01-18 15:51:43 +01:00
gaelle morin
bf5a379b13
Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2
2020-01-18 12:17:57 +01:00
Jean-Baptiste Pasquier
29ce7cdfd0
fix: quickfix for client logo height
2020-01-16 20:56:54 +01:00
Jean-Baptiste Pasquier
cfac96b12a
fix: title from config.sjon
2020-01-16 20:51:54 +01:00
Jean-Baptiste Pasquier
9185793c04
fix: logo auto size
2020-01-16 20:50:20 +01:00
Jean-Baptiste Pasquier
a0cd6bb468
Merge branch 'staging' into 'parameters-on-sample-for-clients'
...
# Conflicts:
# src/menu-left.pug
2020-01-16 19:32:55 +00:00
Jean-Baptiste Pasquier
4cf9cce6ad
fix: add parameters on sample and var for logo
2020-01-16 20:31:28 +01:00
gaelle morin
b0e7584a07
css for project-edit added + refactoring
2020-01-16 18:48:21 +01:00
Calum Mackervoy
2209492836
fixed merge conflicts
2020-01-14 11:57:22 +01:00
Calum Mackervoy
6a0821a59b
customer dropdown for project create
2020-01-13 11:50:45 +01:00
Calum Mackervoy
e50845455b
customer dropdown in project-edit
2020-01-13 10:33:36 +01:00
Jean-Baptiste Pasquier
78532f230c
temporary removed project from menu
2020-01-10 16:43:05 +01:00
Calum Mackervoy
bb40beb449
customer dropdown in edit-project
2020-01-09 15:21:17 +01:00
Jean-Baptiste Pasquier
07abdce85c
Merge branch 'staging' into project-admin
2020-01-09 11:34:17 +01:00
Calum Mackervoy
c17912b03f
project team displaying is_admin and avatar correctly
2020-01-09 09:03:48 +00:00
Calum Mackervoy
1ae56e77cf
Don't display null customer details
2020-01-09 09:00:21 +00:00
gaelle morin
74fe061e9a
CSS: styles of table refactored
2020-01-08 17:29:23 +01:00
gaelle morin
5affa10a7c
admin-project: hashtag added to project's name
2020-01-08 11:10:42 +01:00
gaelle morin
52dc49fcd2
'fieldset' added to admin-project-create
2020-01-08 10:58:59 +01:00
gaelle morin
1ca894298e
admin-project: table ok + icon added in sidebar
2020-01-08 00:59:44 +01:00
gaelle morin
235d3f7f97
Merge branch 'project-admin' of git.happy-dev.fr:startinblox/applications/sib-app into project-admin
2020-01-06 17:54:41 +01:00
gaelle morin
ebfd1fe44b
admin-project-create: form stylized (part 1)
2020-01-06 17:40:58 +01:00
Jean-Baptiste Pasquier
d590632130
fix: left menu arrows
2020-01-06 15:00:40 +01:00
gaelle morin
4fb569b9ef
Left menu: css improved for the projects tab
2020-01-06 12:19:08 +01:00
Jean-Baptiste Pasquier
ef20af91dd
fix: remove members on project creation
2020-01-03 14:15:31 +01:00
Jean-Baptiste Pasquier
c493764d4d
fix: cancel src to user container for project and circles
2020-01-03 14:08:06 +01:00
Jean-Baptiste Pasquier
d0d5cd6403
fix: drive source file
2020-01-03 14:02:19 +01:00
Jean-Baptiste Pasquier
6f1dd7d66c
Merge branch 'staging' into 'project-admin'
...
# Conflicts:
# src/menu-left.pug
# src/page-circle-profile.pug
2019-12-21 18:06:20 +00:00
Calum Mackervoy
f3890f49e0
avatar displayed correctly
2019-12-20 23:22:59 +00:00
Gaëlle Morin
2e7d8f5ec9
Gm fixbug
2019-12-20 15:29:05 +00:00
gaelle morin
7fae8e6387
feature: members' name of a project now displayed
2019-12-20 16:21:42 +01:00
Calum Mackervoy
65c6b77fbc
feature: admin of a circle displayed
...
- CSS added
- architecture reworked
- new field 'is-admin' used
- members field used instead of team field.
2019-12-20 16:18:58 +01:00
Jean-Baptiste Pasquier
87705111bc
Merge branch 'staging' into 'project-admin'
...
# Conflicts:
# src/menu-left.pug
# src/page-project-profile.pug
# src/page-project.pug
2019-12-19 13:14:34 +00:00
Gaëlle Morin
68335ab8d8
Gm fixbug
2019-12-19 13:10:09 +00:00
Jean-Baptiste Pasquier
e9a56086cb
fix: Image path fix
2019-12-18 20:46:01 +01:00
Gaëlle Morin
40e103fc00
feature: project-profile page
...
- css added or reviewed
- templates added or reviewed (customer, business provider, team)
- modal added and stylised
- routes reviewed
- navbar reviewed (adapted according to the content of the main section
- admin status added
- new staging added.
2019-12-18 18:50:47 +00:00
Calum Mackervoy
9903df3018
added foaf:depiction to frontend context
2019-12-18 16:37:01 +00:00
Gaëlle Morin
40143009aa
admin-circles: buttons are centered with the right color
2019-12-16 10:48:05 +01:00
Gaëlle Morin
fa50142438
fix: overflow on menu and content
2019-12-12 17:57:05 +01:00
Jean-Baptiste Pasquier
752acbecae
fix: target user container on menu bar
2019-12-12 14:34:09 +01:00
Gaëlle Morin
9762f8b0f9
Left navbar: modifications according to the wireframe update
2019-12-12 12:51:04 +01:00
Jean-Baptiste Pasquier
13b24a2ee2
Merge branch 'staging' into project-admin
2019-12-10 16:04:55 +01:00
Jean-Baptiste Pasquier
db2985857e
bugfix: cancel 2ba08635 css changes
2019-12-10 15:56:06 +01:00
Jean-Baptiste Pasquier
d7b6b478cf
fix: remove team relation
2019-12-10 15:36:52 +01:00
Jean-Baptiste Pasquier
caad1f69bf
fix: target sib-ac-checker to members
2019-12-10 15:33:33 +01:00
Jean-Baptiste Pasquier
bc45d421f8
Merge branch 'feat/manager_deploy' into 'staging'
...
Deploy sibapp with managers
See merge request startinblox/applications/sib-app!74
2019-12-10 13:57:41 +00:00
Jean-Baptiste Pasquier
b20da1d5dd
Merge branch 'staging' into 'project-admin'
...
# Conflicts:
# src/menu-left.pug
2019-12-10 12:42:24 +00:00
