Gaëlle Morin
|
3b2f43d1c3
|
Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app into staging
|
2019-05-17 18:25:34 +02:00 |
|
Jean-Baptiste Pasquier
|
74096b2870
|
Merge branch 'gm-job-offer-create' into 'master'
feature: Form of job-offer-create now works
Closes #57
See merge request startinblox/applications/sib-app!31
|
2019-05-17 13:13:31 +00:00 |
|
Gaëlle Morin
|
6dd9b6031e
|
feature: Form of job-offer-create works
Close issue #57
|
2019-05-17 08:57:08 +02:00 |
|
Jean-Baptiste Pasquier
|
67081b30e9
|
Merge branch 'gm-default-avatar' into 'master'
ui: default avatar added
See merge request startinblox/applications/sib-app!30
|
2019-05-16 20:09:26 +00:00 |
|
Gaëlle Morin
|
9ab61cc481
|
ui: default avatar added
New template created
|
2019-05-16 21:20:43 +02:00 |
|
Gaëlle Morin
|
9c67700dd2
|
update: package-lock.json
|
2019-05-14 19:10:43 +02:00 |
|
Gaëlle Morin
|
697f93047e
|
Merge branch 'alpha' into 'master'
Alpha
See merge request startinblox/applications/sib-app!29
|
2019-05-14 17:08:49 +00:00 |
|
Jean-Baptiste Pasquier
|
5765c098b8
|
Merge branch 'jbpasquier/css' into 'staging'
Jbpasquier/css
See merge request startinblox/applications/sib-app!28
|
2019-05-14 16:25:56 +00:00 |
|
Jean-Baptiste Pasquier
|
20f02ff95e
|
Merge branch 'jbpasquier/css' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/css
|
2019-05-14 18:25:07 +02:00 |
|
Jean-Baptiste Pasquier
|
0acd1748f7
|
Merge branch 'jbpasquier/css' into jbpasquier/doc
|
2019-05-14 18:24:45 +02:00 |
|
Jean-Baptiste Pasquier
|
ec1be319fd
|
ui: update for jbpasquier/css
|
2019-05-14 18:24:23 +02:00 |
|
Jean-Baptiste Pasquier
|
c5a3cb1f72
|
Merge branch 'staging' into 'jbpasquier/css'
# Conflicts:
# src/dependencies.pug
|
2019-05-14 16:21:37 +00:00 |
|
Jean-Baptiste Pasquier
|
9d26dd5954
|
css: refactoring & fixing - finalized
|
2019-05-14 18:19:30 +02:00 |
|
Jean-Baptiste Pasquier
|
2c649c447e
|
css: refactoring & fixing - day 2
|
2019-05-14 17:32:42 +02:00 |
|
Jean-Baptiste Pasquier
|
68a187a06b
|
ui: remove browserify
|
2019-05-14 14:03:11 +02:00 |
|
Gaëlle Morin
|
b80aef0468
|
update: sib-directory and sib-core version
|
2019-05-14 13:25:43 +02:00 |
|
Jean-Baptiste Pasquier
|
6c1a28f604
|
css: refactoring & fixing - day 1
|
2019-05-13 18:50:34 +02:00 |
|
Gaëlle Morin
|
5eff8ffcec
|
Merge branch 'jbpasquier/rdf' into 'staging'
feature: rdf_type & fix: router user panel
See merge request startinblox/applications/sib-app!26
|
2019-05-10 14:35:11 +00:00 |
|
Jean-Baptiste Pasquier
|
54ad5a612f
|
update: notification to 0.1.12
|
2019-05-10 16:25:58 +02:00 |
|
Jean-Baptiste Pasquier
|
140ae300bc
|
Merge branch 'jbpasquier/removesubmodules' into 'staging'
git: remove submodules
See merge request startinblox/applications/sib-app!27
|
2019-05-10 13:59:39 +00:00 |
|
Jean-Baptiste Pasquier
|
e5ae27dc9c
|
git: remove submodules
|
2019-05-10 15:58:20 +02:00 |
|
Jean-Baptiste Pasquier
|
4c60658860
|
feature: rdf_type & fix: router user panel
|
2019-05-10 15:43:11 +02:00 |
|
Jean-Baptiste Pasquier
|
57adab6d2d
|
Merge branch 'gm-fixup' into 'master'
ui(general): correct the general display after switching to Core 0.7 + freezed dependancies
See merge request startinblox/applications/sib-app!25
|
2019-05-10 13:12:05 +00:00 |
|
Gaëlle Morin
|
0bf840271e
|
ui(general): correct the general display after switching to Core 0.7 + freezed dependancies
|
2019-05-10 15:06:23 +02:00 |
|
Jean-Baptiste Pasquier
|
31d1e68876
|
ui: update doc for sib-manager
|
2019-05-09 15:05:33 +02:00 |
|
Gaëlle Morin
|
a7a59033d3
|
feature: sib-router updated to 0.7
|
2019-05-09 12:09:43 +02:00 |
|
Gaëlle Morin
|
0874b10445
|
feature: sib-router updated to 0.7
|
2019-05-09 10:38:34 +02:00 |
|
Patrick L
|
095fbc968a
|
Merge branch 'gitlab_issue_templates' into 'master'
Gitlab issue templates
See merge request startinblox/applications/sib-app!24
|
2019-05-03 10:08:52 +00:00 |
|
patrick lambret
|
26dd989802
|
Merge branch 'master' into gitlab_issue_templates
updating local branch with latest change from master
|
2019-05-03 11:30:56 +02:00 |
|
patrick lambret
|
b2e871e553
|
Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app
|
2019-05-03 11:30:02 +02:00 |
|
patrick lambret
|
fbd3a2929d
|
issue and merge request templates
|
2019-05-03 11:27:32 +02:00 |
|
Jean-Baptiste Pasquier
|
0f5b0ed8e5
|
update: README.md - waiting review
|
2019-04-29 14:46:13 +02:00 |
|
Jean-Baptiste Pasquier
|
8bee7b8aa5
|
Merge branch 'gm-update-to-sib-core-07' into 'master'
ui: update to sib core 07
See merge request startinblox/applications/sib-app!22
|
2019-04-26 19:50:29 +00:00 |
|
Gaëlle Morin
|
a1aa92074b
|
ui: update to 0.7
- dependancies updated
- new favicon
- html updated
- clean up
- css updated
|
2019-04-26 21:34:30 +02:00 |
|
Gaëlle Morin
|
d8b74d7dc5
|
wip
|
2019-04-26 21:26:59 +02:00 |
|
patrick lambret
|
9c95429884
|
templates
|
2019-04-24 17:15:25 +02:00 |
|
patrick lambret
|
4eaf425393
|
Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app
|
2019-04-24 15:04:47 +02:00 |
|
Jean-Baptiste Pasquier
|
8baa606eee
|
Update config.sample.json for Staging
|
2019-04-23 10:02:36 +00:00 |
|
Jean-Baptiste Pasquier
|
a6f2c0d4a2
|
fix: staging & prod makefile
|
2019-04-23 10:42:53 +02:00 |
|
Jean-Baptiste
|
184940b15e
|
update: add alpha server to makefile
|
2019-04-18 10:01:39 +02:00 |
|
Jean-Baptiste Pasquier
|
2b709b2033
|
Merge branch 'gm-ui-alpha' into 'master'
Gm ui alpha
See merge request startinblox/applications/sib-app!20
|
2019-04-17 16:34:35 +00:00 |
|
Gaëlle Morin
|
5bee6f4fd7
|
ui(general): MR!20 - Multiple changes for alpha
|
2019-04-17 18:30:47 +02:00 |
|
Gaëlle Morin
|
f6cd936b66
|
Merge branch 'jbpasquier/fix-demo' into 'master'
Fix for demo
See merge request startinblox/applications/sib-app!19
|
2019-04-17 15:16:35 +00:00 |
|
Jean-Baptiste Pasquier
|
c29275f5e5
|
fix project & circle sizing & add animation for right menu
|
2019-04-17 17:08:47 +02:00 |
|
Jean-Baptiste Pasquier
|
f60b720d37
|
less javascript for user img
|
2019-04-16 14:56:25 +02:00 |
|
Jean-Baptiste Pasquier
|
02d30beff8
|
Merge branch 'gm-hotfix-sib-directory' into 'master'
Hotfix(notification bell + normalize)
See merge request startinblox/applications/sib-app!18
|
2019-04-12 18:02:44 +00:00 |
|
Gaëlle Morin
|
2f043ad93f
|
Hotfix(notification bell + normalize)
|
2019-04-12 20:01:31 +02:00 |
|
Jean-Baptiste Pasquier
|
ee8f596251
|
Merge branch 'gm-sib-directory' into 'master'
Resolve "HTML - Use sib-directory"
Closes #87
See merge request startinblox/applications/sib-app!6
|
2019-04-12 17:15:17 +00:00 |
|
Gaëlle Morin
|
95c3284e5f
|
feature(members): MR!6 - Sib-directory added
- CSS finalised
- Default user picture added
- See https://git.happy-dev.fr/startinblox/components/sib-directory/merge_requests/6
|
2019-04-12 18:51:36 +02:00 |
|
patrick lambret
|
4a32c1ceb2
|
added templates
|
2019-04-09 18:20:00 +02:00 |
|