Commit Graph
461 Commits
Author SHA1 Message Date
Marjolaine Le Bon 3a682d87b4 update: cleaning integration 2020-09-11 14:06:01 +02:00
Marjolaine Le Bon 1a8caf8fa6 update; polls page integration 2020-09-10 18:06:25 +02:00
Marjolaine Le Bon 7a72c12b94 update: integration polls step2 2020-09-10 14:51:44 +02:00
Marjolaine Le Bon f53fed4755 update: integration pollspage - step 1 2020-09-10 00:20:49 +02:00
Marjolaine Le Bon ae97bec8bf update : integration add polls form 2020-09-09 00:17:26 +02:00
Marjolaine Le Bon ebc0455855 Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-09-08 11:43:30 +02:00
Marjolaine Le Bon 2f49e3a5a2 Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-09-08 11:42:50 +02:00
Marjolaine Le Bon 6475a09323 bugfix: event detail img 2020-09-08 11:42:42 +02:00
Benoit Alessandroni e38e8d17c1 Merge branch 'master' into feature/resource-component 2020-09-03 14:21:24 +02:00
Jean-Baptiste Pasquier b61bcc54be update: fix project and circles 2020-09-03 12:15:47 +02:00
Jean-Baptiste Pasquier cc44afd83d Merge branch 'master' into feature/projects 2020-09-03 11:11:28 +02:00
senza 1aac23cf4e Merge remote-tracking branch 'origin' into feature/projects 2020-09-01 12:24:09 +02:00
gaelle morin ed76354912 loader moved to components 2020-08-31 15:55:31 +02:00
gaelle morin 0d9f149054 loaders for admin pages moved 2020-08-31 10:24:12 +02:00
Marjolaine Le Bon 523fba94be bugfix: bug css due to merge 2020-08-31 10:22:54 +02:00
Marjolaine Le Bon f7fc5b1dab Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-08-31 10:04:58 +02:00
Marjolaine Le Bon fc758cd01c Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-08-31 10:04:43 +02:00
gaelle morin 4379359bff loader for circle admin list added 2020-08-28 11:31:11 +02:00
gaelle morin 70418f75b3 loader for left-menu members added 2020-08-28 09:39:59 +02:00
Benoit Alessandroni 55623c2dd1 feature: adding proper dynamic prefix on resources and events module 2020-08-27 18:13:50 +02:00
gaelle morin ad88494af8 feature: add loader to left-menu > members 2020-08-26 17:41:14 +02:00
Jean-Baptiste Pasquier c44c2d6f53 update: color of the left menu font 2020-08-24 13:45:01 +02:00
Marjolaine Le Bon 778950a38a update: integration polls - step 1 2020-08-20 01:59:24 +02:00
Marjolaine Le Bon eb07bebdd1 update: uniformisation events/resources 2020-08-19 18:23:18 +02:00
Marjolaine Le Bon 1ae859e896 Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-08-11 19:55:19 +02:00
Marjolaine Le Bon 5785f4b640 update: menu left with polls 2020-08-11 19:55:14 +02:00
Benoit Alessandroni 907f516732 Switch from sib-resource to solid-resource 2020-08-11 19:11:42 +02:00
Benoit Alessandroni 3bec1062ff Switch from sib-event to solid-event 2020-08-11 19:09:14 +02:00
Benoit Alessandroni 04821836b7 Merge branch 'feature/sib-poll' into feature/resource-component 2020-08-11 17:10:55 +02:00
Benoit Alessandroni 268169ddc9 Merge branch 'master' into feature/resource-component 2020-08-11 16:38:37 +02:00
Marjolaine Le Bon 250192ef51 update: integrations events and resources on circles 2020-08-11 13:01:13 +02:00
senza 7309aa310c tag css of poll page 2020-08-08 14:46:31 +02:00
senza 5a323381cc feature : implementing solid-poll + css customisations 2020-08-08 14:11:18 +02:00
Jean-Baptiste Pasquier 59f2b4414f fix: remove solid-fix-badge 2020-08-05 13:47:05 +00:00
Marjolaine Le Bon 415f06c36e update: right menu circles 2020-08-04 12:34:17 +02:00
gaelle morin 8ff7994089 feature: notification - default avatar + styles added (ter) 2020-07-16 13:51:52 +02:00
gaelle morin 4b52f0a49e feature: notification - default avatar + styles added 2020-07-10 16:38:55 +02:00
gaelle morin da4c1cf69c feature: notification - dynamic icons added 2020-07-10 11:43:21 +02:00
Marjolaine Le Bon 8da51ec9fa update: etuc design + component design 2020-07-09 17:51:54 +02:00
gaelle morin 218e74955b feature: notification - templates for circle and private notification added 2020-07-09 16:01:42 +02:00
gaelle morin f83b458240 feature: notification - ok on mobile 2020-07-09 14:31:14 +02:00
gaelle morin 897dc336c2 feature: notification - top triangle ok on desktop 2020-07-09 12:30:23 +02:00
gaelle morin efae21e6c2 feature: project: modify image - refactoring 2020-07-08 18:26:23 +02:00
gaelle morin 7ee2f8e14b feature: project: modify image - positioning new try 2020-07-07 19:42:52 +02:00
gaelle morin 2b314116a4 feature: project: modify image - positioning 2020-07-03 16:47:54 +02:00
Marjolaine Le Bon bfbd9f3605 Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-07-02 18:04:11 +02:00
Marjolaine Le Bon 6b390c975a update: global layout 2020-07-02 18:03:56 +02:00
gaelle morin 7cfea37b1e feature: notification - typo 2020-07-02 12:23:02 +02:00
gaelle morin 03dc7a4251 fix: project-picture-edit - wip 2020-06-30 17:36:14 +02:00
gaelle morin 7dbbe51c6e wip 2020-06-30 13:07:29 +02:00