| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a8f76c646
					 | 
					
						
						
							
							new icon for circle-admin added
						
						
						
						
						
						
					 | 
					
						2019-11-07 12:05:17 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e0653f14b
					 | 
					
						
						
							
							Merge branch 'jbpasquier/circle-information' into circle-wip-merge
						
						
						
						
						
						
					 | 
					
						2019-10-29 15:03: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71dc40a7f4
					 | 
					
						
						
							
							header modified: dash and description added
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:33:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9db2e1b99b
					 | 
					
						
						
							
							update: Cleanup circle information
						
						
						
						
						
						
					 | 
					
						2019-10-29 11:31:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30ce7d3bfd
					 | 
					
						
						
							
							header modified: dash and description added
						
						
						
						
						
						
					 | 
					
						2019-10-28 18:38:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6139c5df19
					 | 
					
						
						
							
							fix: double vertical scrollbar on chat fixed
						
						
						
						
						
						
					 | 
					
						2019-10-28 16:28:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4de5229960
					 | 
					
						
						
							
							fix: css merge
						
						
						
						
						
						
					 | 
					
						2019-10-25 19:25:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09f35bd3c0
					 | 
					
						
						
							
							update: add administration & circle creation
						
						
						
						
						
						
					 | 
					
						2019-10-25 19:15:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c2789812e
					 | 
					
						
						
							
							Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin
						
						
						
						
						
						
					 | 
					
						2019-10-25 19:08:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1170e8b619
					 | 
					
						
						
							
							fix: CSS fix on circle-edit page
						
						
						
						
						
						
					 | 
					
						2019-10-25 18:20:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4279b0c7a
					 | 
					
						
						
							
							update: Cleanup circle information
						
						
						
						
						
						
					 | 
					
						2019-10-25 15:35:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48075b2419
					 | 
					
						
						
							
							update: imbricate edit in profile & fix css
						
						
						
						
						
						
					 | 
					
						2019-10-24 22:03:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e3dc8fe8c
					 | 
					
						
						
							
							fix: edit template dup name
						
						
						
						
						
						
					 | 
					
						2019-10-24 21:44:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7086dbd931
					 | 
					
						
						
							
							Merge branch '201-right-column-missing-on-the-circles' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
						
						
						
						
						
						
					 | 
					
						2019-10-24 21:44:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4314210b4
					 | 
					
						
						
							
							update: working form + back link
						
						
						
						
						
						
					 | 
					
						2019-10-24 21:23:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a71fbf1b78
					 | 
					
						
						
							
							Merge branch 'staging' into gm-missing-edit-circle
						
						
						
						
						
						
					 | 
					
						2019-10-24 16:22:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a865693a1
					 | 
					
						
						
							
							feature: new page to display info about a circle and add members
						
						
						
						
						
						
						
						- New styles for "add users" drodown
- New custom widget to display members
- Use of the permission system 
						
						
					 | 
					
						2019-10-23 22:20:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						45064062fd
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2019-10-23 13:55:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						397e0a4dc3
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2019-10-23 09:57:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7faff9b88
					 | 
					
						
						
							
							members block OK + delete-circle button added
						
						
						
						
						
						
					 | 
					
						2019-10-22 15:50:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afa5fa0451
					 | 
					
						
						
							
							new architecture for member list yeah
						
						
						
						
						
						
					 | 
					
						2019-10-21 15:02:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d4b863e3b
					 | 
					
						
						
							
							delete button ok
						
						
						
						
						
						
					 | 
					
						2019-10-21 13:12:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57885c6655
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2019-10-18 15:39:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba6e21a71c
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2019-10-18 10:26:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d2566abe0
					 | 
					
						
						
							
							wip table
						
						
						
						
						
						
					 | 
					
						2019-10-17 16:06:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b71d79e608
					 | 
					
						
						
							
							Merge branch '145' into 'staging'
						
						
						
						
						
						
						
						Solves #145: add project captains to project page
See merge request startinblox/applications/sib-app!68 
						
						
					 | 
					
						2019-10-16 13:22:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a3aac00c8
					 | 
					
						
						
							
							Solves #145: add project captains to project page
						
						
						
						
						
						
					 | 
					
						2019-10-16 15:08:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21d485c492
					 | 
					
						
						
							
							fix: _ & LDFlex on header
						
						
						
						
						
						
					 | 
					
						2019-10-16 13:21:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |