Commit Graph

581 Commits

Author SHA1 Message Date
Jean-Baptiste Pasquier
6ce9be28ba
Merge branch 'staging' into feat/manager_deploy 2019-12-02 15:25:46 +01:00
Jean-Baptiste Pasquier
dbf918f351 Merge branch 'circle-edit-redirect' into 'staging'
Circle edit redirect

See merge request startinblox/applications/sib-app!80
2019-11-29 15:16:53 +00:00
Calum Mackervoy
d03e58932b Circle edit redirect 2019-11-29 15:16:53 +00:00
Jean-Baptiste Pasquier
19bd61ae38 Merge branch 'esc-close-rightmenu' into 'staging'
Esc key close rightmenu

See merge request startinblox/applications/sib-app!82
2019-11-25 18:54:54 +00:00
Calum Mackervoy
d63ee9b6fb Esc key close rightmenu 2019-11-25 18:54:54 +00:00
plup
64353833bc cicd: added staging banch for autodeploy 2019-11-20 23:02:44 +01:00
plup
18f6153b6c cicd: fixed dist folder name 2019-11-20 22:41:55 +01:00
plup
567a2076e2 cicd: removed windows linebreak 2019-11-20 22:37:41 +01:00
plup
fa0121e9eb cicd: removed windows linebreak 2019-11-20 22:36:13 +01:00
plup
89a082892c cicd: removed windows linebreak 2019-11-20 22:31:16 +01:00
plup
7c976d602b cicd: removed windows linebreak 2019-11-20 22:20:37 +01:00
plup
691bfbe563 cicd: removed windows linebreak 2019-11-20 22:14:04 +01:00
plup
065541a648 cicd: tried to print the keyw 2019-11-20 22:09:40 +01:00
plup
7faeafd21d cicd: restricted permission on key 2019-11-20 22:05:53 +01:00
plup
334b3a7cda cicd: removed hostkey check 2019-11-20 22:03:08 +01:00
plup
c8d25da34f cicd: fixed filename 2019-11-20 21:10:50 +01:00
plup
64c5ad65c3 cicd: fixed private key variable 2019-11-20 21:09:14 +01:00
plup
81776a45c4 cicd: added tag 2019-11-20 21:06:30 +01:00
plup
6459e73e8b cicd: added gitlab-ci 2019-11-20 21:05:23 +01:00
Jean-Baptiste Pasquier
c5eb67b4d4 Merge branch 'circle-css' into 'staging'
Circle

See merge request startinblox/applications/sib-app!77
2019-11-19 15:07:51 +00:00
Jean-Baptiste Pasquier
ba942945f2
fix: admin panel is not coming soon! 2019-11-18 14:14:46 +01:00
plup
d0ebb84d24 feature: copied statics to dist 2019-11-16 18:10:05 +01:00
plup
4f5d352e4d doc: changed account login sentence 2019-11-16 16:09:55 +01:00
plup
bd87d4847b doc: pointed the config.json file description to wiki 2019-11-16 16:04:49 +01:00
Jean-Baptiste Pasquier
34247826b2
fix: context for jabberID 2019-11-15 17:13:17 +01:00
Jean-Baptiste Pasquier
27098f59c5
fix: context for jabberID 2019-11-15 16:51:22 +01:00
Jean-Baptiste Pasquier
150464dfc1
fix: context for jabberID 2019-11-15 16:50:20 +01:00
Jean-Baptiste Pasquier
6d70a9c11e fix: conflicts with master 2019-11-15 13:22:09 +00:00
Jean-Baptiste Pasquier
bae6838ca4 Merge branch 'collapse-user-control' into 'circle-css'
added listener to collapse user control

See merge request startinblox/applications/sib-app!79
2019-11-15 13:02:08 +00:00
Calum Mackervoy
bbc4a9356c added listener to close user control 2019-11-15 13:02:08 +00:00
Jean-Baptiste Pasquier
f3381ba8da Merge branch 'circles-admin-page' into 'circle-css'
Link to circles admin page

See merge request startinblox/applications/sib-app!78
2019-11-15 12:29:41 +00:00
Calum Mackervoy
89f62025b4 circles not collapsable
in line with mockup
2019-11-15 12:29:41 +00:00
plup
3a859bcdc3 doc: updated with reference to doc in wiki 2019-11-14 19:29:14 +01:00
plup
983eab6ef3 feat: cleaned old building methods 2019-11-14 17:59:57 +01:00
plup
643420d6ce feat: rolled back on webpack 2019-11-14 17:34:37 +01:00
Jean-Baptiste Pasquier
0c3b74bcaf
update: making join leave works 2019-11-14 13:27:04 +01:00
Gaëlle Morin
a342e5d431 hidden class added on sib-router 2019-11-13 15:23:54 +01:00
Gaëlle Morin
772e1e456b Tables ok 2019-11-13 12:00:38 +01:00
Gaëlle Morin
03df657caf full css rework on tables. Need refactor 2019-11-12 23:16:56 +01:00
Jean-Baptiste Pasquier
30de8eed82
fix: @gaelle target wrong class 2019-11-12 13:25:39 +01:00
Jean-Baptiste Pasquier
809978ecc8
fix: last one @gaelle 2019-11-12 13:22:23 +01:00
Jean-Baptiste Pasquier
8784ae7641
fix: selector for admin css 2019-11-12 13:13:52 +01:00
Jean-Baptiste Pasquier
aa46aeed78
fix: clear cache 2019-11-12 12:49:12 +01:00
Jean-Baptiste Pasquier
0566f34ec4
fix: @gaelle 2019-11-12 12:34:33 +01:00
Jean-Baptiste Pasquier
e60c6d6d1f
fix: @gaelle 2019-11-12 12:31:06 +01:00
Jean-Baptiste Pasquier
9795498944
fix: selector @gaelle 2019-11-12 12:26:34 +01:00
Gaëlle Morin
1eb83f2a80 match the mock-ups ok 2019-11-11 11:50:10 +01:00
Gaëlle Morin
5da381ce93 circle-create form ok 2019-11-11 11:22:37 +01:00
Gaëlle Morin
493a1a8525 rework on table with 2 columns: flex to grid + wip on the column for buttons in the 3-col table 2019-11-09 14:33:02 +01:00
Gaëlle Morin
62bb5a7fff Clean-up circle-profile.scss 2019-11-08 13:26:00 +01:00