Commit Graph

826 Commits

Author SHA1 Message Date
Gaëlle Morin
63807e9a6d Merge branch 'jbpasquier/project-drive' into 'staging'
feature: add drive on project

See merge request startinblox/applications/sib-app!40
2019-06-05 11:48:41 +00:00
Gaëlle Morin
58da59fae3 Merge branch 'jbpasquier/form-submission-refresh-display' into 'staging'
feature: update sib-display on form save

See merge request startinblox/applications/sib-app!42
2019-06-05 11:47:23 +00:00
Jean-Baptiste Pasquier
54c8dda717 Sometimes git smoke something illicit. Fixed. 2019-06-05 11:46:32 +00:00
Gaëlle Morin
0702e890e4 Merge branch 'jbpasquier/handle-login-button' into 'staging'
ui: hide or show login button

See merge request startinblox/applications/sib-app!41
2019-06-05 11:43:43 +00:00
Jean-Baptiste Pasquier
522237b4d2
ui: hide or show login button 2019-06-05 13:26:58 +02:00
Jean-Baptiste Pasquier
de6217dd2d
feature: update sib-display on form save 2019-06-05 13:26:10 +02:00
Jean-Baptiste Pasquier
6c2e57383b
feature: add drive on project 2019-06-05 11:45:41 +02:00
Jean-Baptiste Pasquier
f8c62adfe9
feature: sib-badge for users messages 2019-06-05 10:50:33 +02:00
Jean-Baptiste Pasquier
89db25fa85
update: Use federation sources 2019-06-03 16:04:15 +02:00
Jean-Baptiste Pasquier
bf809740f7
update: dependencies 2019-05-31 16:15:59 +02:00
Jean-Baptiste Pasquier
176b9c5871 Delete index.paris.html 2019-05-22 12:58:03 +00:00
Jean-Baptiste Pasquier
06a835918a Delete index.nantes.html 2019-05-22 12:57:55 +00:00
Jean-Baptiste Pasquier
0323f185b0
fix: gitignore 2019-05-22 14:55:02 +02:00
Jean-Baptiste Pasquier
d9e4cd845e Merge branch 'gm-update' into 'staging'
Gm update

See merge request startinblox/applications/sib-app!36
2019-05-22 12:52:19 +00:00
Jean-Baptiste Pasquier
83fdef3d05 Merge branch 'alpha' into 'staging'
ui: Makefile for test-paris & test-nantes

See merge request startinblox/applications/sib-app!37
2019-05-21 17:57:13 +00:00
Jean-Baptiste Pasquier
42c41bbba3
ui: Makefile for test-paris & test-nantes 2019-05-21 19:53:44 +02:00
Gaëlle Morin
06529f9070 update: according to new versions of sib-chat and sib-directory 2019-05-21 19:03:18 +02:00
Gaëlle Morin
0422bc5dee Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging 2019-05-21 17:34:27 +02:00
Jean-Baptiste Pasquier
c343d5df59
fix: route 2019-05-20 15:27:47 +02:00
Gaëlle Morin
ce75068360 Merge branch 'jbpasquier/cleanup' into 'staging'
ui: fix non working things

See merge request startinblox/applications/sib-app!35
2019-05-20 13:16:14 +00:00
Jean-Baptiste Pasquier
30f0e39dce
ui: fix non working things 2019-05-20 15:06:07 +02:00
Gaëlle Morin
e0f947f561 Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging 2019-05-20 14:44:23 +02:00
Gaëlle Morin
30ca2223c2 fix(job-offers): correct url added to contact the author. 2019-05-20 12:39:59 +00:00
Jean-Baptiste Pasquier
dec17638d6
fix: MR on wrong branch 2019-05-20 14:17:04 +02:00
Jean-Baptiste Pasquier
dbeb9ac213 Merge branch 'gm-home-link-on-logo' into 'master'
feature(header): home link added to the logo

See merge request startinblox/applications/sib-app!33
2019-05-20 11:34:01 +00:00
Gaëlle Morin
7f683aa3e3 feature(header): home link added to the logo 2019-05-20 12:25:11 +02:00
Jean-Baptiste Pasquier
4222e681b4 Merge branch 'gm-job-offer-author' into 'master'
feature(job-offers): the link to contact the author is now functional

Closes #79

See merge request startinblox/applications/sib-app!32
2019-05-17 17:15:10 +00:00
Gaëlle Morin
fa3634102b feature: Form of job-offer-create works
Close issue #57
2019-05-17 18:41:45 +02:00
Gaëlle Morin
3d79828e9a ui: default avatar added
New template created
2019-05-17 18:41:45 +02:00
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
Gaëlle Morin
c91c8cb098 feature(job-offers): the link to contact the author is now functional
Closes #79
2019-05-17 18:18:12 +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