| 
						
					 | 
					
						
						
							
						
						2ba086355e
					 | 
					
						
						
							
							Merge branch '169-project-name-on-2-lines' into 'staging'
						
						
						
						
						
						
						
						Resolve "Project name on 2 lines"
See merge request startinblox/applications/sib-app!84 
						
						
					 | 
					
						2019-12-10 10:53:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7a5555ad3
					 | 
					
						
						
							
							fix: resolve #311
						
						
						
						
						
						
					 | 
					
						2019-12-10 11:52:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a42821001
					 | 
					
						
						
							
							Merge branch 'user-profile-info' into 'staging'
						
						
						
						
						
						
						
						fixed first name display in userDetails
See merge request startinblox/applications/sib-app!86 
						
						
					 | 
					
						2019-12-04 15:16:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef256c70f4
					 | 
					
						
						
							
							external context instead of _ in name
						
						
						
						
						
						
					 | 
					
						2019-12-04 16:11:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d40e538a2
					 | 
					
						
						
							
							modifications according to the changes in the wireframe
						
						
						
						
						
						
					 | 
					
						2019-12-04 14:53:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa4a1f0b0e
					 | 
					
						
						
							
							fixed first name display in userDetails
						
						
						
						
						
						
					 | 
					
						2019-12-04 12:27:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ade7ded23
					 | 
					
						
						
							
							Left-nav bar: new styles + overflow and hovering to handle long names
						
						
						
						
						
						
					 | 
					
						2019-11-29 17:02:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dbf918f351
					 | 
					
						
						
							
							Merge branch 'circle-edit-redirect' into 'staging'
						
						
						
						
						
						
						
						Circle edit redirect
See merge request startinblox/applications/sib-app!80 
						
						
					 | 
					
						2019-11-29 15:16:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d03e58932b
					 | 
					
						
						
							
							Circle edit redirect
						
						
						
						
						
						
					 | 
					
						2019-11-29 15:16:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19bd61ae38
					 | 
					
						
						
							
							Merge branch 'esc-close-rightmenu' into 'staging'
						
						
						
						
						
						
						
						Esc key close rightmenu
See merge request startinblox/applications/sib-app!82 
						
						
					 | 
					
						2019-11-25 18:54:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d63ee9b6fb
					 | 
					
						
						
							
							Esc key close rightmenu
						
						
						
						
						
						
					 | 
					
						2019-11-25 18:54:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5eb67b4d4
					 | 
					
						
						
							
							Merge branch 'circle-css' into 'staging'
						
						
						
						
						
						
						
						Circle
See merge request startinblox/applications/sib-app!77 
						
						
					 | 
					
						2019-11-19 15:07:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba942945f2
					 | 
					
						
						
							
							fix: admin panel is not coming soon!
						
						
						
						
						
						
					 | 
					
						2019-11-18 14:14:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34247826b2
					 | 
					
						
						
							
							fix: context for jabberID
						
						
						
						
						
						
					 | 
					
						2019-11-15 17:13:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27098f59c5
					 | 
					
						
						
							
							fix: context for jabberID
						
						
						
						
						
						
					 | 
					
						2019-11-15 16:51:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						150464dfc1
					 | 
					
						
						
							
							fix: context for jabberID
						
						
						
						
						
						
					 | 
					
						2019-11-15 16:50:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bae6838ca4
					 | 
					
						
						
							
							Merge branch 'collapse-user-control' into 'circle-css'
						
						
						
						
						
						
						
						added listener to collapse user control
See merge request startinblox/applications/sib-app!79 
						
						
					 | 
					
						2019-11-15 13:02:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bbc4a9356c
					 | 
					
						
						
							
							added listener to close user control
						
						
						
						
						
						
					 | 
					
						2019-11-15 13:02:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3381ba8da
					 | 
					
						
						
							
							Merge branch 'circles-admin-page' into 'circle-css'
						
						
						
						
						
						
						
						Link to circles admin page
See merge request startinblox/applications/sib-app!78 
						
						
					 | 
					
						2019-11-15 12:29:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						89f62025b4
					 | 
					
						
						
							
							circles not collapsable
						
						
						
						
						
						
						
						in line with mockup 
						
						
					 | 
					
						2019-11-15 12:29:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c3b74bcaf
					 | 
					
						
						
							
							update: making join leave works
						
						
						
						
						
						
					 | 
					
						2019-11-14 13:27:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a342e5d431
					 | 
					
						
						
							
							hidden class added on sib-router
						
						
						
						
						
						
					 | 
					
						2019-11-13 15:23:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						772e1e456b
					 | 
					
						
						
							
							Tables ok
						
						
						
						
						
						
					 | 
					
						2019-11-13 12:00:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03df657caf
					 | 
					
						
						
							
							full css rework on tables. Need refactor
						
						
						
						
						
						
					 | 
					
						2019-11-12 23:16:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30de8eed82
					 | 
					
						
						
							
							fix: @gaelle target wrong class
						
						
						
						
						
						
					 | 
					
						2019-11-12 13:25:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						809978ecc8
					 | 
					
						
						
							
							fix: last one @gaelle
						
						
						
						
						
						
					 | 
					
						2019-11-12 13:22:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8784ae7641
					 | 
					
						
						
							
							fix: selector for admin css
						
						
						
						
						
						
					 | 
					
						2019-11-12 13:13:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa46aeed78
					 | 
					
						
						
							
							fix: clear cache
						
						
						
						
						
						
					 | 
					
						2019-11-12 12:49:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0566f34ec4
					 | 
					
						
						
							
							fix: @gaelle
						
						
						
						
						
						
					 | 
					
						2019-11-12 12:34:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e60c6d6d1f
					 | 
					
						
						
							
							fix: @gaelle
						
						
						
						
						
						
					 | 
					
						2019-11-12 12:31:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9795498944
					 | 
					
						
						
							
							fix: selector @gaelle
						
						
						
						
						
						
					 | 
					
						2019-11-12 12:26:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1eb83f2a80
					 | 
					
						
						
							
							match the mock-ups ok
						
						
						
						
						
						
					 | 
					
						2019-11-11 11:50:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5da381ce93
					 | 
					
						
						
							
							circle-create form ok
						
						
						
						
						
						
					 | 
					
						2019-11-11 11:22:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						493a1a8525
					 | 
					
						
						
							
							rework on table with 2 columns: flex to grid + wip on the column for buttons in the 3-col table
						
						
						
						
						
						
					 | 
					
						2019-11-09 14:33:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						62bb5a7fff
					 | 
					
						
						
							
							Clean-up circle-profile.scss
						
						
						
						
						
						
					 | 
					
						2019-11-08 13:26:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e274ad20d1
					 | 
					
						
						
							
							Clean-up circle-edit.scss
						
						
						
						
						
						
					 | 
					
						2019-11-08 12:52:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f3409274ee
					 | 
					
						
						
							
							Clean-up circle-admin.scss
						
						
						
						
						
						
					 | 
					
						2019-11-08 12:36:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52377dc92a
					 | 
					
						
						
							
							Clean-up main.scss
						
						
						
						
						
						
					 | 
					
						2019-11-08 11:34:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70e238d230
					 | 
					
						
						
							
							admin-circle table: wip => problem with multiple-members
						
						
						
						
						
						
					 | 
					
						2019-11-07 18:04:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b4e256f98
					 | 
					
						
						
							
							mistake on icon fixed
						
						
						
						
						
						
					 | 
					
						2019-11-07 12:07:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d24bb94367
					 | 
					
						
						
							
							Merge branch 'circle-css' of git.happy-dev.fr:startinblox/applications/sib-app into circle-css
						
						
						
						
						
						
					 | 
					
						2019-11-07 12:06:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a8f76c646
					 | 
					
						
						
							
							new icon for circle-admin added
						
						
						
						
						
						
					 | 
					
						2019-11-07 12:05:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c1c46722da
					 | 
					
						
						
							
							fix: sib-router hidden on circle-profile
						
						
						
						
						
						
					 | 
					
						2019-11-06 20:44:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ba3ef525d
					 | 
					
						
						
							
							fix bug on field alignment + buttons in admin ok
						
						
						
						
						
						
					 | 
					
						2019-11-06 21:28:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4b4a176cd
					 | 
					
						
						
							
							creation date and edit button: OK + form's save button ok
						
						
						
						
						
						
					 | 
					
						2019-11-06 18:44:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9db053ed2
					 | 
					
						
						
							
							edit: leave button => ok
						
						
						
						
						
						
					 | 
					
						2019-11-06 15:48:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5dbbf7384
					 | 
					
						
						
							
							creation date and edit button wip
						
						
						
						
						
						
					 | 
					
						2019-11-06 15:44:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db352b31fc
					 | 
					
						
						
							
							button 'edit and  add member' ok
						
						
						
						
						
						
					 | 
					
						2019-11-06 11:18:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4911cfbb9
					 | 
					
						
						
							
							buttons 'join, leave, delete circle' ok + button to add member ok
						
						
						
						
						
						
					 | 
					
						2019-11-06 10:46:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						372ee5c6e8
					 | 
					
						
						
							
							sidebar corrected
						
						
						
						
						
						
					 | 
					
						2019-11-05 19:58:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |