| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c7700e966
					 | 
					
						
						
							
							update: semantic css for buttons
						
						
						
						
						
						
					 | 
					
						2019-11-05 16:52:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b49ddadee
					 | 
					
						
						
							
							ok title + button.
						
						
						
						
						
						
					 | 
					
						2019-11-05 15:00:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						12ffa2467a
					 | 
					
						
						
							
							create circle button ok
						
						
						
						
						
						
					 | 
					
						2019-11-04 15:12:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff2b07afb4
					 | 
					
						
						
							
							buttons centered
						
						
						
						
						
						
					 | 
					
						2019-11-04 14:34:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2661be13b6
					 | 
					
						
						
							
							styles for admins ok. Need padding ? + refactoring
						
						
						
						
						
						
					 | 
					
						2019-11-04 14:14:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57045b44e3
					 | 
					
						
						
							
							create-circle: table-headers ok
						
						
						
						
						
						
					 | 
					
						2019-10-30 16:42:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c4ce4127b
					 | 
					
						
						
							
							create-button ok
						
						
						
						
						
						
					 | 
					
						2019-10-30 15:29:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db7b1116c3
					 | 
					
						
						
							
							circle-admin: header ok
						
						
						
						
						
						
					 | 
					
						2019-10-30 14:34:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fda9e3dd22
					 | 
					
						
						
							
							circle-info buttons styled + form buttons refactored
						
						
						
						
						
						
					 | 
					
						2019-10-30 11:47:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4aa69a1605
					 | 
					
						
						
							
							update: simplify dom for circles
						
						
						
						
						
						
					 | 
					
						2019-10-29 15:48:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c50e05530e
					 | 
					
						
						
							
							fix: js recursive parent selector for admin
						
						
						
						
						
						
					 | 
					
						2019-10-29 15:38:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5adbd98f51
					 | 
					
						
						
							
							fix: path template & js leave button
						
						
						
						
						
						
					 | 
					
						2019-10-29 15:15:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e0653f14b
					 | 
					
						
						
							
							Merge branch 'jbpasquier/circle-information' into circle-wip-merge
						
						
						
						
						
						
					 | 
					
						2019-10-29 15:03:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c72a4fee0
					 | 
					
						
						
							
							update: user avatar on admin
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:59:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a80ce71399
					 | 
					
						
						
							
							merge conflict
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:58:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						250ad6c395
					 | 
					
						
						
							
							fix add member button (need refactoring)
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:48:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5a63bd162
					 | 
					
						
						
							
							Merge branch 'circle-admin' into circle-wip-merge
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:43:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40eeef9d44
					 | 
					
						
						
							
							fix: account context
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:38:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5eb9b6aad8
					 | 
					
						
						
							
							feat: add template for circle admin page
						
						
						
						
						
						
					 | 
					
						2019-10-29 14:22:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1489f1b1cb
					 | 
					
						
						
							
							edit button ok
						
						
						
						
						
						
					 | 
					
						2019-10-29 13:34:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27bea38d88
					 | 
					
						
						
							
							description field removed from page
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:33:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71dc40a7f4
					 | 
					
						
						
							
							header modified: dash and description added
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:33:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a24d37d8f
					 | 
					
						
						
							
							fix: creation date issue
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:33:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6803b965fb
					 | 
					
						
						
							
							fix: add bug info with issue link
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:32:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb22295aa6
					 | 
					
						
						
							
							update: add administration & circle creation
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:32:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9db2e1b99b
					 | 
					
						
						
							
							update: Cleanup circle information
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:31:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2334098e31
					 | 
					
						
						
							
							description field removed from page
						
						
						
						
						
						
					 | 
					
						2019-10-28 18:40:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30ce7d3bfd
					 | 
					
						
						
							
							header modified: dash and description added
						
						
						
						
						
						
					 | 
					
						2019-10-28 18:38:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c53f4c8d94
					 | 
					
						
						
							
							Merge branch 'gm-fix-scrollbar' into 'staging'
						
						
						
						
						
						
						
						fix: double vertical scrollbar erased
See merge request startinblox/applications/sib-app!75 
						
						
					 | 
					
						2019-10-28 17:08:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6139c5df19
					 | 
					
						
						
							
							fix: double vertical scrollbar on chat fixed
						
						
						
						
						
						
					 | 
					
						2019-10-28 16:28:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fc7732b1b9
					 | 
					
						
						
							
							feat: add circles display
						
						
						
						
						
						
					 | 
					
						2019-10-28 15:44:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af0db1462e
					 | 
					
						
						
							
							name + owner displayed
						
						
						
						
						
						
					 | 
					
						2019-10-28 15:44:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9489fece13
					 | 
					
						
						
							
							route for circle admin ok
						
						
						
						
						
						
					 | 
					
						2019-10-28 15:44:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d08153c797
					 | 
					
						
						
							
							fix: creation date issue
						
						
						
						
						
						
					 | 
					
						2019-10-28 13:55:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4de5229960
					 | 
					
						
						
							
							fix: css merge
						
						
						
						
						
						
					 | 
					
						2019-10-25 19:25:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e56a65a0cd
					 | 
					
						
						
							
							fix: add bug info with issue link
						
						
						
						
						
						
					 | 
					
						2019-10-25 19:17:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |