Commit Graph

1285 Commits

Author SHA1 Message Date
Gaelle Morin
1acefba26e Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app into gm-job-offers 2018-12-12 16:32:09 +01:00
Gaelle Morin
be2c72732b conflict files removed 2018-12-12 16:31:19 +01:00
Gaelle Morin
9f3b802819 wip 2018-12-12 15:56:29 +01:00
Gaelle Morin
885aedcabf merge gm-job-offers into master: conflict resolved 2018-12-12 12:21:38 +01:00
Gaelle Morin
b8256ff077 Merge branch 'gm-job-offers' 2018-12-12 12:20:32 +01:00
Gaelle Morin
0225968885 update: submodules 2018-12-12 12:10:36 +01:00
Gaelle Morin
a6975bb0f2 Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app 2018-12-12 11:13:54 +01:00
Gaelle Morin
54310fe627 wip 2018-12-12 11:13:03 +01:00
Gaelle Morin
7f81f4b7ac wip 2018-12-11 21:44:03 +01:00
Gaelle Morin
c8564fb76c platform specific styling to inputs and select are removed 2018-12-11 15:42:51 +01:00
Gaelle Morin
5a6b3f8398 filters left align ok 2018-12-11 15:40:37 +01:00
Gaelle Morin
024857640b first offer card top aligned 2018-12-11 14:29:59 +01:00
Gaelle Morin
535f5d07f7 filters section almost ok 2018-12-11 13:42:53 +01:00
Gaelle Morin
6dfd234ee9 select and search fields seem ok 2018-12-10 17:39:22 +01:00
Gaelle Morin
0069c27fe2 select: wip 2018-12-10 16:12:21 +01:00
Gaelle Morin
08c3b0bff8 search fields: wip 2018-12-10 15:31:25 +01:00
jblemee
6e67a598c0 bugfix: #39 use rights data-fields 2018-12-10 14:18:12 +01:00
jblemee
35c94dc44b feature: #39 Display user info in upper right corner 2018-12-10 13:41:34 +01:00
Gaelle Morin
4c25b87020 chevrons ok 2018-12-10 12:07:14 +01:00
Gaelle Morin
a192db463c right panel ok 2018-12-09 19:56:56 +01:00
Gaelle Morin
496036ee52 new size for h2 2018-12-09 15:42:12 +01:00
simon louvet
af36edefe4 ui : initilisation of sen a message from member-profil (not ready) 2018-12-09 14:41:48 +01:00
simon louvet
ec6d7f8843 Merge branch 'master' of git.happy-dev.fr:startinblox/sib-app 2018-12-08 23:43:12 +01:00
simon louvet
260cfb20ba ui : chat page plug to menu 2018-12-08 23:42:59 +01:00
Gaelle Morin
eb14539580 side menu fixed 2018-12-08 00:07:13 +01:00
Gaelle Morin
237df22d66 wip 2018-12-07 17:25:05 +01:00
Gaelle Morin
7ef17b5fa8 delete old code 2018-12-07 13:03:44 +01:00
Gaelle Morin
d2b2bb53df delete old code 2018-12-07 13:02:46 +01:00
Gaelle Morin
fefb7685d8 notification block doesn't appear 2018-12-07 12:19:04 +01:00
Gaelle Morin
0a9401fd09 Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app into gm-header 2018-12-07 10:13:26 +01:00
Gaelle Morin
437bc6322e shadow box ok 2018-12-07 10:05:33 +01:00
jblemee
06a019ac20 update: README: link to the client_id generation documentation 2018-12-07 01:16:42 +01:00
Gaelle Morin
17f3420a23 fix 2018-12-06 22:20:08 +01:00
Gaelle Morin
db53c2c3b2 conflict resolved 2018-12-06 22:16:58 +01:00
Gaelle Morin
1f6c83339c pseudo displayed in side menu 2018-12-06 21:33:14 +01:00
Gaelle Morin
21ff7fe6b2 fix 2018-12-06 19:50:33 +01:00
Gaelle Morin
d01e288c31 notification on bell added 2018-12-06 19:47:32 +01:00
Gaelle Morin
aacada4ae7 header.scss file added + styles changed 2018-12-06 17:51:04 +01:00
Gaelle Morin
f5584f5a47 fix 2018-12-06 12:39:59 +01:00
Gaelle Morin
ba0f65238e search field ok 2018-12-06 12:31:33 +01:00
Gaelle Morin
5caca218a8 Merge branch 'gm-side-menu' 2018-12-06 11:08:12 +01:00
Gaelle Morin
627b84b6e2 wip 2018-12-06 10:38:33 +01:00
Gaelle Morin
ea00a3712f pointer added 2018-12-06 10:00:58 +01:00
Gaelle Morin
82b131405e new chat section added 2018-12-05 23:05:50 +01:00
Gaelle Morin
c8228f51c1 font size added in navbar 2018-12-05 21:14:13 +01:00
Gaelle Morin
878c5d4310 font sizes changed 2018-12-04 16:29:36 +01:00
Gaelle Morin
6f7a6482d2 chevron is animated 2018-12-03 20:16:57 +01:00
Gaelle Morin
6f2f194fde wip 2018-12-03 20:02:58 +01:00
Gaelle Morin
d50da0ccb3 wip 2018-12-03 19:53:05 +01:00
Gaelle Morin
0837257b1d sub-menus can be closed and opened + divider added 2018-12-03 19:49:32 +01:00