| 
						
					 | 
					
						
						
							
						
						b512cf3e9a
					 | 
					
						
						
							
							Merge branch 'update-event' into 'staging'
						
						
						
						
						
						
						
						Update event
See merge request startinblox/applications/sib-app!113 
						
						
					 | 
					
						2020-02-10 12:22:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3551794d40
					 | 
					
						
						
							
							remove dependencies changes
						
						
						
						
						
						
					 | 
					
						2020-02-10 12:22:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d13f28195
					 | 
					
						
						
							
							Merge branch 'circle-leaving-refresh-redirect' into 'staging'
						
						
						
						
						
						
						
						Refreshing sib-displays in absence of reactive store
See merge request startinblox/applications/sib-app!114 
						
						
					 | 
					
						2020-02-05 12:39:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f227bfc57
					 | 
					
						
						
							
							Refreshing sib-displays in absence of reactive store
						
						
						
						
						
						
					 | 
					
						2020-02-05 12:39:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						815e5a69b5
					 | 
					
						
						
							
							ui : update fonts + colors
						
						
						
						
						
						
					 | 
					
						2020-02-04 15:27:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78637dea70
					 | 
					
						
						
							
							ui : update Fonts + colors
						
						
						
						
						
						
					 | 
					
						2020-02-04 13:38:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75d87bd632
					 | 
					
						
						
							
							init css file + font
						
						
						
						
						
						
					 | 
					
						2020-02-04 12:25:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c15afa496f
					 | 
					
						
						
							
							Merge branch 'extends-config-json' into 'staging'
						
						
						
						
						
						
						
						Extends config json
See merge request startinblox/applications/sib-app!112 
						
						
					 | 
					
						2020-02-03 17:39:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78f3025a22
					 | 
					
						
						
							
							Merge branch 'staging' into extends-config-json
						
						
						
						
						
						
					 | 
					
						2020-02-03 18:07:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						998fa6099e
					 | 
					
						
						
							
							Fixing upload dir
						
						
						
						
						
						
					 | 
					
						2020-02-03 18:01:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d69fc976fc
					 | 
					
						
						
							
							Fixing arguments
						
						
						
						
						
						
					 | 
					
						2020-02-03 17:48:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						08e7d5f908
					 | 
					
						
						
							
							Fixing the event component declaration
						
						
						
						
						
						
					 | 
					
						2020-02-03 17:22:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80d6ca10bb
					 | 
					
						
						
							
							Merge branch 'extends-config-json' into 'staging'
						
						
						
						
						
						
						
						Adapted Sib App for ETUC & more flexible way to handle optional components
See merge request startinblox/applications/sib-app!110 
						
						
					 | 
					
						2020-02-03 15:16:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2bf2206634
					 | 
					
						
						
							
							update readme for typeevent and uploads
						
						
						
						
						
						
					 | 
					
						2020-02-03 16:16:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						239645eda2
					 | 
					
						
						
							
							update: add upload-src and range-typeevents
						
						
						
						
						
						
					 | 
					
						2020-02-03 16:07:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d5e19c469c
					 | 
					
						
						
							
							update: add events component
						
						
						
						
						
						
					 | 
					
						2020-02-03 15:43:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f43e021f2
					 | 
					
						
						
							
							fix: no endpoint for clientCSS
						
						
						
						
						
						
					 | 
					
						2020-02-03 14:47:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7eff652d5d
					 | 
					
						
						
							
							Adapted Sib App for ETUC & more flexible way to handle optional components
						
						
						
						
						
						
					 | 
					
						2020-02-03 14:39:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d37796f86f
					 | 
					
						
						
							
							Merge branch 'circle-perf-fix' into 'master'
						
						
						
						
						
						
						
						Circle perf fix
See merge request startinblox/applications/sib-app!108 
						
						
					 | 
					
						2020-01-27 12:30:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9562289e53
					 | 
					
						
						
							
							fix: css for left menu
						
						
						
						
						
						
					 | 
					
						2020-01-27 13:29:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb703e7246
					 | 
					
						
						
							
							fix: move next to parent
						
						
						
						
						
						
					 | 
					
						2020-01-27 13:18:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7277983e08
					 | 
					
						
						
							
							fix: left menu circle on widget
						
						
						
						
						
						
					 | 
					
						2020-01-24 19:30:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4d9fae0f3
					 | 
					
						
						
							
							Merge branch 'staging' into circle-perf-fix
						
						
						
						
						
						
					 | 
					
						2020-01-24 17:58:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9e9a5d75e
					 | 
					
						
						
							
							Merge branch 'gm-admin-tag-fix' into 'staging'
						
						
						
						
						
						
						
						project: admin tag displayed when it is needed + some CSS
See merge request startinblox/applications/sib-app!107 
						
						
					 | 
					
						2020-01-22 15:36:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3042c8efe2
					 | 
					
						
						
							
							project: admin tag displayed when it is needed + some CSS
						
						
						
						
						
						
					 | 
					
						2020-01-22 16:33:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae3d6cb282
					 | 
					
						
						
							
							try to set menu to user container
						
						
						
						
						
						
					 | 
					
						2020-01-20 14:35:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						541ace4e3f
					 | 
					
						
						
							
							Merge branch 'responsive-fix' into 'staging'
						
						
						
						
						
						
						
						Responsive fixes
See merge request startinblox/applications/sib-app!106 
						
						
					 | 
					
						2020-01-20 12:59:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83e6957934
					 | 
					
						
						
							
							fix a lot of problems and add js for menus
						
						
						
						
						
						
					 | 
					
						2020-01-20 13:57:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36a045cacb
					 | 
					
						
						
							
							sidebar is responsive for the circles
						
						
						
						
						
						
					 | 
					
						2020-01-19 14:25:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a20cfe3a8
					 | 
					
						
						
							
							header is responsive
						
						
						
						
						
						
					 | 
					
						2020-01-19 13:57:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e281edc5c
					 | 
					
						
						
							
							Sidebar is responsive
						
						
						
						
						
						
					 | 
					
						2020-01-19 13:19:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56953601e1
					 | 
					
						
						
							
							Left menu is responsive
						
						
						
						
						
						
					 | 
					
						2020-01-19 10:48:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90a92cc832
					 | 
					
						
						
							
							scrollbars are customised
						
						
						
						
						
						
					 | 
					
						2020-01-18 21:43:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd9e478264
					 | 
					
						
						
							
							scrollbars on left menu and content added
						
						
						
						
						
						
					 | 
					
						2020-01-18 15:51:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf5a379b13
					 | 
					
						
						
							
							Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2
						
						
						
						
						
						
					 | 
					
						2020-01-18 12:17:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29ce7cdfd0
					 | 
					
						
						
							
							fix: quickfix for client logo height
						
						
						
						
						
						
					 | 
					
						2020-01-16 20:56:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfac96b12a
					 | 
					
						
						
							
							fix: title from config.sjon
						
						
						
						
						
						
					 | 
					
						2020-01-16 20:51:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9185793c04
					 | 
					
						
						
							
							fix: logo auto size
						
						
						
						
						
						
					 | 
					
						2020-01-16 20:50:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2485e00aff
					 | 
					
						
						
							
							Merge branch 'parameters-on-sample-for-clients' into 'staging'
						
						
						
						
						
						
						
						Parameters on sample for clients
See merge request startinblox/applications/sib-app!103 
						
						
					 | 
					
						2020-01-16 19:33:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0cd6bb468
					 | 
					
						
						
							
							Merge branch 'staging' into 'parameters-on-sample-for-clients'
						
						
						
						
						
						
						
						# Conflicts:
#   src/menu-left.pug 
						
						
					 | 
					
						2020-01-16 19:32:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4cf9cce6ad
					 | 
					
						
						
							
							fix: add parameters on sample and var for logo
						
						
						
						
						
						
					 | 
					
						2020-01-16 20:31:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b0e7584a07
					 | 
					
						
						
							
							css for project-edit added + refactoring
						
						
						
						
						
						
					 | 
					
						2020-01-16 18:48:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2209492836
					 | 
					
						
						
							
							fixed merge conflicts
						
						
						
						
						
						
					 | 
					
						2020-01-14 11:57:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a0821a59b
					 | 
					
						
						
							
							customer dropdown for project create
						
						
						
						
						
						
					 | 
					
						2020-01-13 11:50:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e50845455b
					 | 
					
						
						
							
							customer dropdown in project-edit
						
						
						
						
						
						
					 | 
					
						2020-01-13 10:33:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b1eab139e
					 | 
					
						
						
							
							Merge branch 'project-admin' into 'staging'
						
						
						
						
						
						
						
						Project admin listing & project creation
See merge request startinblox/applications/sib-app!88 
						
						
					 | 
					
						2020-01-10 19:59:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78532f230c
					 | 
					
						
						
							
							temporary removed project from menu
						
						
						
						
						
						
					 | 
					
						2020-01-10 16:43:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb40beb449
					 | 
					
						
						
							
							customer dropdown in edit-project
						
						
						
						
						
						
					 | 
					
						2020-01-09 15:21:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07abdce85c
					 | 
					
						
						
							
							Merge branch 'staging' into project-admin
						
						
						
						
						
						
					 | 
					
						2020-01-09 11:34:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ad8126311
					 | 
					
						
						
							
							Merge branch 'project-admin-display' into 'staging'
						
						
						
						
						
						
						
						project team displaying is_admin and avatar correctly
See merge request startinblox/applications/sib-app!98 
						
						
					 | 
					
						2020-01-09 09:03:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |