Commit Graph

248 Commits

Author SHA1 Message Date
Gaelle Morin
be2c72732b conflict files removed 2018-12-12 16:31:19 +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
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
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
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
Gaelle Morin
291822bbeb wip 2018-11-30 22:28:00 +01:00
Gaelle
71dcdb0cee comma added 2018-11-27 15:33:57 +01:00
simon louvet
0f9cc9982c Merge branch 'master' of git.happy-dev.fr:startinblox/sib-app 2018-11-25 17:30:15 +01:00
simon louvet
1a3c36ef4d ui : members with user.groups 2018-11-25 17:30:11 +01:00
Clément
416b8a2f77 fixbug: unreachable code after return statement 2018-11-25 15:26:05 +01:00
simon louvet
1d0e1ea90b ui : select instead input for skills & rol on members & job-offer serach 2018-11-21 18:02:07 +01:00
simon louvet
465b3a5432 ui : select instead input for skills & rol on members & job-offer serach 2018-11-21 17:57:43 +01:00
simon louvet
60d21f734c ui : grid layers for jon offers & members 2018-11-21 15:49:26 +01:00
simon louvet
345dbfd241 ui : grid layers for jon offers & members 2018-11-21 15:47:18 +01:00
simon louvet
2b305418f0 ui : member card 2018-11-21 14:16:59 +01:00
simon louvet
ddad1d7d0f ui : member card 2018-11-21 14:05:56 +01:00
simon louvet
3e91d94a08 ui : project view & general designe scroll 2018-11-21 03:06:38 +01:00
simon louvet
b7da28c3a8 ui : temp commit to test template 2018-11-20 16:28:00 +01:00
simon louvet
5d4f9fd214 ui : members & job-offers form search 2018-11-19 19:45:42 +01:00
simon louvet
723419b6b3 ui : job-offers & members page update 2018-11-17 18:01:19 +01:00
simon louvet
70ae1b033a ui : templating and config update 2018-11-17 12:08:47 +01:00
simon louvet
5e7a5ac42a ui migration to Sophie Design 2018-11-16 13:44:00 +01:00
simon louvet
d6ec6a9cf9 ui migration to Sophie Design 2018-11-16 12:31:15 +01:00
simon louvet
2ae3f84adf ui migration to Sophie Design 2018-11-16 12:17:39 +01:00
simon louvet
3e0145334a ui migration to Sophie Design 2018-11-16 11:33:39 +01:00
Clément
68c6cd6c88 bugfix: chat z-index 2018-11-13 11:06:04 +01:00
Clément
07ebb1bc60 feature: add notifications 2018-11-12 18:52:43 +01:00
Clément
e3fa784a54 ui: style member, job, group 2018-11-01 17:11:15 +01:00
Clément
1c35e83a58 fix babel 2018-10-22 17:03:00 +02:00
Clément
32f8e8a1ea extract widgets 2018-10-19 23:47:15 +02:00
Clément
805fa2bbe4 style forms 2018-10-19 22:07:01 +02:00
Clément
ac9fba3c31 fix chat 2018-10-18 20:06:43 +02:00
Clément
ca4735d3bc add dot syntax 2018-10-18 15:03:32 +02:00
Clément
78551c4579 add sib-oidc 2018-10-12 20:07:49 +02:00
Clément
d6cd1a54ed style 2018-10-08 10:49:31 +02:00
Clément
4f60cdb875 --amend 2018-10-05 13:32:35 +02:00
Clément
8d0688b503 --amend 2018-10-05 13:13:25 +02:00
Clément
c1456a5b63 use sample files 2018-10-05 13:07:14 +02:00
Clément
3fa8602e2c update 2018-10-05 11:55:29 +02:00
Clément
51ccde0c0e update 2018-10-05 11:37:48 +02:00
Clément
72a47b9cb6 style members & jobs 2018-09-29 02:22:00 +02:00
Clément
b74f4f9871 fix WebComponentsReady 2018-09-29 00:48:46 +02:00
Clément
1c7e7f3e37 move pages 2018-09-29 00:09:27 +02:00
Clément
324a5aa347 refactoring 2018-09-28 21:20:15 +02:00
Clément
874a8c636f reset 2018-09-28 21:17:08 +02:00
Clément
a0c1cab2ba fix chat 2018-09-22 14:11:37 +02:00
Clément
689e8009ed add projects 2018-09-21 13:29:45 +02:00
Clément
eadec476cc style: use grid 2018-09-12 11:10:01 +02:00
Clément
5561d9a604 style members 2018-09-12 01:34:13 +02:00
Clément
6996faa2e1 style nav 2018-09-09 13:51:56 +02:00
Clément
facbd376bc update: convert to pug 2018-09-06 11:25:52 +02:00
Alexandre Bourlier
bbb8e0a24c feature - chat component on the right view 2018-07-31 23:42:43 +02:00
Alexandre Bourlier
687afddf50 feature - network pages cleaned up 2018-07-12 15:18:39 +02:00
Alexandre Bourlier
4aa04f762d feature - project pages cleaned 2018-07-11 23:37:22 +02:00
Alexandre Bourlier
ae0ab04570 update - chat inserted in member-chat view and nowhere else 2018-07-11 20:43:18 +02:00
Alexandre Bourlier
f29e3c829d feature - edit profile to its maximum and beyond ! 2018-07-09 23:06:56 +02:00
Alexandre Bourlier
d03ea92adf update - setup a set to search on members first and last names 2018-07-09 22:33:10 +02:00
Alexandre Bourlier
84679636ed server - updated python files 2018-07-08 20:17:34 +02:00
Alexandre Bourlier
49e1418e93 feature - members pages done for alpha-1 2018-07-08 17:19:26 +02:00
Alexandre Bourlier
3259183299 feature - avatar upload almost complete 2018-07-07 19:40:16 +02:00
Alexandre Bourlier
67f9a2f02f feature - project creation started 2018-07-07 17:52:41 +02:00
Alexandre Bourlier
b9108c7448 feature - member page done 2018-07-07 15:29:09 +02:00
Alexandre Bourlier
2cdc6b6623 feature - members page done. search not working and transition to member page not working 2018-07-07 14:54:22 +02:00
Alexandre Bourlier
4f7c8b23c6 feature : members name displayed in list 2018-07-03 16:54:41 +02:00
Alexandre Bourlier
c1b8980db8 synthax : members page : updating names from ldp to sib 2018-06-21 14:33:57 +02:00
Alexandre Bourlier
63084c571d server : updated models 2018-06-21 10:57:25 +02:00
Alexandre Bourlier
a800de7315 dependencies : updated dependencies from ldp to sib 2018-06-21 10:53:25 +02:00
Alexandre Bourlier
8d8bcb8097 Preprod setup 2018-05-16 08:08:38 +02:00
Alexandre Bourlier
e329798014 Server update 2018-05-16 05:09:59 +02:00
Alexandre Bourlier
97fa85188b Edit profile - Connected correctly now (via hack) 2018-05-15 08:08:31 +02:00
Alexandre Bourlier
2029ca865d Profile picture cropping coded 2018-05-15 03:54:34 +02:00
Alexandre Bourlier
61eb9bae4a Edit profile on its way 2018-05-14 21:16:04 +02:00
Alexandre Bourlier
643db32ed0 Search feature done 2018-05-14 19:47:13 +02:00
Alexandre Bourlier
83fab20a05 Search view setup 2018-05-14 19:20:00 +02:00
Alexandre Bourlier
06885a9692 Search view opening and closing complete 2018-05-14 18:41:38 +02:00
Alexandre Bourlier
10a2dd8358 Bootstrap modal steals focus and so can't be used as the search view. Had to implement my own. 2018-05-13 18:31:52 +02:00
Alexandre Bourlier
1837282ca8 Search menu icone and view set up 2018-05-13 05:06:10 +02:00
Alexandre Bourlier
e6e7f29ee3 Update deploy process to cope with new server 2018-05-06 08:17:07 +02:00
Alexandre Bourlier
1f148c416b Hack to display the chat 2018-05-03 21:02:37 +02:00
Alexandre Bourlier
b1f25e2d65 Chat is now fullscreen when displayed 2018-05-03 19:50:59 +02:00
Alexandre Bourlier
f0ea5e3de3 SDN made dynamic. FontAwesome downgraded to 4.7 2018-05-01 10:11:58 +02:00
Alexandre Bourlier
0057e9245b Deploy process cleaned up 2018-05-01 06:18:20 +02:00
Alexandre Bourlier
95d6c6abf8 Commented out chat windows to avoid crash. Issue #24 on XMPP Chat Window repo. 2018-04-26 19:29:26 +02:00
Alexandre Bourlier
f6744ec9e0 Channels list and detail pages done 2018-04-26 18:49:10 +02:00
Alexandre Bourlier
c2399db08a Project detail page done 2018-04-26 08:20:33 +02:00
Alexandre Bourlier
96e227c0f3 Project list responsive 2018-04-26 02:36:18 +02:00
Alexandre Bourlier
912a134036 Menu, Member list and Member detail pages made responsive 2018-04-26 02:20:32 +02:00
Alexandre Bourlier
5304880083 Member detail page complete 2018-04-26 01:35:44 +02:00
Alexandre Bourlier
44fe4b91f9 Created project view 2018-04-23 16:35:00 +02:00
Alexandre Bourlier
4fd629a21b Commented out the ldp-display for the skills because it is not working 2018-04-23 15:46:25 +02:00
Alexandre Bourlier
f69bc86ee6 Failed implementation of custom cell widget 2018-04-23 15:34:12 +02:00
Alexandre Bourlier
e7d65b024b Projects page setup 2018-04-23 15:07:58 +02:00
Alexandre Bourlier
717542a812 Integrated the useful boostrap classes within our CSS 2018-04-22 18:01:07 +02:00
Alexandre Bourlier
ed189a8129 Added the dashboard page 2018-04-22 08:47:18 +02:00
Alexandre Bourlier
e0ff0d1792 Moved forward on member page 2018-04-20 08:58:30 +02:00
Alexandre Bourlier
b0b24baa20 Chat component integrated on the member profile 2018-04-19 19:51:20 +02:00
Alexandre Bourlier
4e6ec05fcc Styling navbar 2018-04-19 18:24:42 +02:00
Alexandre Bourlier
965e06f3aa Removed Member.country from model 2018-04-10 16:20:28 +02:00
Alexandre Bourlier
a5c159681b Styling search form. What a pain... 2018-04-10 15:40:49 +02:00
Alexandre Bourlier
bdfa78a945 Architecture and models setup for members and projects. Chat and css missing 2018-04-05 14:09:42 +02:00
Alexandre Bourlier
420c68bd6e displaying members 2018-03-18 20:42:34 +01:00
Alexandre Bourlier
4359bdfb35 ready to display members 2018-03-18 16:29:31 +01:00
Alexandre Bourlier
943e54032f web component loader as submodule 2018-03-18 16:04:36 +01:00
Alexandre Bourlier
53e26268b3 Based menu on Twitter Bootstrap Navbar 2018-03-18 15:18:29 +01:00
Alexandre Bourlier
7fc0f489f7 Templated index.php 2018-03-17 18:34:32 +01:00
Alexandre Bourlier
c2a2d19713 CSS to SCSS translation 2018-03-12 14:49:47 +01:00
Alexandre Bourlier
6aaf5da47a Included dependencies to avoid requiring the network 2018-03-12 14:25:28 +01:00
Alexandre Bourlier
386938389f Luke's work 2018-03-12 00:42:46 +01:00