Commit Graph

1854 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
cdd509ff48 Merge branch 'feature/sib-poll' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-09-10 14:52:11 +02:00
Marjolaine Le Bon
7a72c12b94 update: integration polls step2 2020-09-10 14:51:44 +02:00
Marjolaine Le Bon
720a9c3ab2 Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component 2020-09-10 12:18:13 +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
Jean-Baptiste Pasquier
7f4115de40 cicd: toulouse 2020-09-08 10:17:44 +00:00
Jean-Baptiste Pasquier
26af9fbcc0 cicd: add hd toulouse & fichemetier.fr 2020-09-08 10:11:55 +00:00
senza
5c2d41e04a edit endpoints for polls component 2020-09-08 12:09:54 +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
Jean-Baptiste Pasquier
e7a6e2d7c2 Merge branch 'master' into release/projects 2020-09-03 19:55:59 +02:00
Jean-Baptiste Pasquier
1172fdba26 fix: remove project description 2020-09-03 15:40:10 +02:00
Benoit Alessandroni
e38e8d17c1 Merge branch 'master' into feature/resource-component 2020-09-03 14:21:24 +02:00
Jean-Baptiste Pasquier
f93b6bc2aa cicd: rename georgetown-uni to ejp 2020-09-03 12:00:59 +00:00
Jean-Baptiste Pasquier
226809cd1b Merge branch 'release/projects' into feature/projects 2020-09-03 12:24:47 +02:00
Jean-Baptiste Pasquier
e98a4ac928 Merge branch 'master' into release/projects 2020-09-03 12:19:40 +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
Benoit Alessandroni
fd47cea803 Swittch to the official release of the different components 2020-09-02 21:11:25 +02:00
Jean-Baptiste Pasquier
e28cbd9805 fix: version 2020-09-02 17:22:29 +00:00
Jean-Baptiste Pasquier
c9315f5f45 Merge branch 'master' into release/projects 2020-09-02 17:34:29 +02:00
Jean-Baptiste Pasquier
7fba227ebb Merge branch 'master' into release/loaders 2020-09-02 17:32:58 +02:00
Jean-Baptiste Pasquier
5ffe0b63ab cicd: add georgetown-uni 2020-09-02 15:29:27 +00:00
gaelle morin
a48d854de6
minor: up dependancies (loaders) 2020-09-02 16:48:55 +02:00
gaelle morin
d8e1f29578
Merge branch 'release/loaders' of git.startinblox.com:applications/sib-app into feature/hubl-673 2020-09-02 16:14:08 +02:00
gaelle morin
bc1830a9b3
loader: beta version of directory, dashboard and job-board 2020-09-02 14:57:30 +02:00
senza
1957c79d2d remove status field in edition form 2020-09-01 12:59:59 +02:00
senza
91e89852b3 make projects always private #631 2020-09-01 12:59:39 +02:00
senza
4a0447f5ae remove logo from edit form #631 2020-09-01 12:47:01 +02:00
senza
b28a2da352 remove logo from creation form #631 2020-09-01 12:45:39 +02:00
senza
51e0a63aad Merge branch 'release/projects' into feature/projects 2020-09-01 12:26:07 +02:00
senza
778aa0c2e3 Merge remote-tracking branch 'origin' into release/projects 2020-09-01 12:24:55 +02:00
senza
1aac23cf4e Merge remote-tracking branch 'origin' into feature/projects 2020-09-01 12:24:09 +02:00
Benoit Alessandroni
f3351d4669 Update README.md 2020-08-31 21:27:07 +00:00
Benoit Alessandroni
af86fe9dbc update: Adding proper conditions 2020-08-31 22:55:33 +02:00
gaelle morin
ed76354912
loader moved to components 2020-08-31 15:55:31 +02:00
gaelle morin
cf6777ae3f
loaders for circle pages added 2020-08-31 12:04:51 +02:00
gaelle morin
430ab36dc7
loaders for admin-create and -edit added 2020-08-31 11:15:10 +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
31091c16ce
loader for users and projects panels added 2020-08-28 14:06:27 +02:00
gaelle morin
db2f343518
loader for left-menu projects and circles added 2020-08-28 13:46:25 +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