erdnaxe
							
						 
					 | 
					
						
						
							
						
						ae90a957ce
					 | 
					
						
						
							
							Merge branch 'master' into 'turbolinks'
						
						
						
						
						
						
						
						# Conflicts:
#   apps/note/views.py 
						
						
					 | 
					
						2020-02-22 11:09:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						3597e79dc1
					 | 
					
						
						
							
							Dynamic tabs on conso view
						
						
						
						
						
						
					 | 
					
						2020-02-21 22:40:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						9a0d74c18b
					 | 
					
						
						
							
							Fix no cache in ConsoView
						
						
						
						
						
						
					 | 
					
						2020-02-21 19:46:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						3fd99ebac7
					 | 
					
						
						
							
							Ability to disable cache storage
						
						
						
						
						
						
					 | 
					
						2020-02-21 18:28:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						b395d3a633
					 | 
					
						
						
							
							Overflow on collapsing tables and Bootstrap4 style
						
						
						
						
						
						
					 | 
					
						2020-02-21 12:29:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						45ce2eab9e
					 | 
					
						
						
							
							Two colomn profile page
						
						
						
						
						
						
					 | 
					
						2020-02-21 11:53:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						43fd765a34
					 | 
					
						
						
							
							Title on profile update page
						
						
						
						
						
						
					 | 
					
						2020-02-21 11:17:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						a304f6a97d
					 | 
					
						
						
							
							Some initial data
						
						
						
						
						
						
					 | 
					
						2020-02-20 22:10:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						e28b19b353
					 | 
					
						
						
							
							Import NK15 passwords
						
						
						
						
						
						
					 | 
					
						2020-02-20 10:26:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						4fe61fdc5f
					 | 
					
						
						
							
							fix json file format
						
						
						
						
						
						
						
						test struct of json
json file finish 
						
						
					 | 
					
						2020-02-19 19:23:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						204fe53047
					 | 
					
						
						
							
							Remove broken code
						
						
						
						
						
						
					 | 
					
						2020-02-18 21:47:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						4bbd464f9c
					 | 
					
						
						
							
							Unify file headers
						
						
						
						
						
						
					 | 
					
						2020-02-18 21:30:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						e679a4b629
					 | 
					
						
						
							
							Fix formatting issues
						
						
						
						
						
						
					 | 
					
						2020-02-18 21:14:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						f89d91e524
					 | 
					
						
						
							
							Format code
						
						
						
						
						
						
					 | 
					
						2020-02-18 12:31:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Iooss
							
						 
					 | 
					
						
						
							
						
						55722b801a
					 | 
					
						
						
							
							Split API in each app
						
						
						
						
						
						
					 | 
					
						2020-02-18 11:58:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						987b898a33
					 | 
					
						
						
							
							Auth token is hidden
						
						
						
						
						
						
					 | 
					
						2020-02-17 23:30:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						b7383b35f7
					 | 
					
						
						
							
							Manage auth token
						
						
						
						
						
						
					 | 
					
						2020-02-17 21:32:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						559445c8b4
					 | 
					
						
						
							
							Add some decoration
						
						
						
						
						
						
					 | 
					
						2020-02-17 19:44:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						55977bcbe7
					 | 
					
						
						
							
							Token authentication
						
						
						
						
						
						
					 | 
					
						2020-02-17 19:25:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f3f13c5153
					 | 
					
						
						
							
							Reformat code, add some missing lines at end of files
						
						
						
						
						
						
					 | 
					
						2020-02-17 14:08:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c884cbb0ad
					 | 
					
						
						
							
							Add some comments
						
						
						
						
						
						
					 | 
					
						2020-02-17 11:36:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						3ce5f31411
					 | 
					
						
						
							
							Cannot set username that is similar to an alias we don't own
						
						
						
						
						
						
					 | 
					
						2020-02-17 11:21:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						6a4e0de444
					 | 
					
						
						
							
							Show autocompleted aliases instead of note names
						
						
						
						
						
						
					 | 
					
						2020-02-17 11:19:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						52514f58d6
					 | 
					
						
						
							
							Show matched aliases in the autocompletion list
						
						
						
						
						
						
					 | 
					
						2020-02-17 01:13:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						4bc342c668
					 | 
					
						
						
							
							Request for autocompletion is normalized
						
						
						
						
						
						
					 | 
					
						2020-02-16 23:39:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						2e4464e982
					 | 
					
						
						
							
							Autocomplete note aliases for consos
						
						
						
						
						
						
					 | 
					
						2020-02-16 23:27:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						4d7e552681
					 | 
					
						
						
							
							One import was missing
						
						
						
						
						
						
					 | 
					
						2020-02-16 22:29:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						00d560c20e
					 | 
					
						
						
							
							Merge branch 'master' into api
						
						
						
						
						
						
						
						# Conflicts:
#	apps/note/forms.py
#	apps/note/urls.py
#	apps/note/views.py 
						
						
					 | 
					
						2020-02-16 22:25:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						9cc0731ded
					 | 
					
						
						
							
							Merge branch 'consos' into 'master'
						
						
						
						
						
						
						
						Consos
See merge request bde/nk20!7 
						
						
					 | 
					
						2020-02-09 15:47:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						596686497d
					 | 
					
						
						
							
							Aliases are case insensitive
						
						
						
						
						
						
					 | 
					
						2020-02-08 23:49:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						732f8bc3d8
					 | 
					
						
						
							
							Préparation du code pour le système de droits & filtrage par type de note pour l'auto-complétion
						
						
						
						
						
						
					 | 
					
						2020-02-08 23:24:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						142b3359e3
					 | 
					
						
						
							
							Comment some code
						
						
						
						
						
						
					 | 
					
						2020-02-08 21:40:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						ce012400e1
					 | 
					
						
						
							
							Club members autocomplete
						
						
						
						
						
						
					 | 
					
						2020-02-08 20:39:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c053235996
					 | 
					
						
						
							
							Autocomplete
						
						
						
						
						
						
					 | 
					
						2020-02-08 20:23:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						db218a2783
					 | 
					
						
						
							
							Add __init__ files
						
						
						
						
						
						
					 | 
					
						2020-02-08 18:27:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						2880b5b3c7
					 | 
					
						
						
							
							Useless to search a note by its id (already implemented)
						
						
						
						
						
						
					 | 
					
						2020-02-08 17:37:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						dc87a5d77b
					 | 
					
						
						
							
							Filter notes and aliases by aliases (regexp) or note type
						
						
						
						
						
						
					 | 
					
						2020-02-08 17:17:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f54e2ed145
					 | 
					
						
						
							
							Aliases were missing
						
						
						
						
						
						
					 | 
					
						2020-02-08 15:08:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						71a88e84f7
					 | 
					
						
						
							
							initiate import command
						
						
						
						
						
						
					 | 
					
						2020-02-07 22:23:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d22350faf8
					 | 
					
						
						
							
							/note/user, /note/club, /note/special => /note
						
						
						
						
						
						
					 | 
					
						2020-02-07 20:51:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f52a89637c
					 | 
					
						
						
							
							Polymorphic types
						
						
						
						
						
						
					 | 
					
						2020-02-07 20:47:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						e8e22541fa
					 | 
					
						
						
							
							Small fix
						
						
						
						
						
						
					 | 
					
						2020-02-07 17:10:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						5633f0123d
					 | 
					
						
						
							
							Clean code
						
						
						
						
						
						
					 | 
					
						2020-02-07 17:02:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c28884114c
					 | 
					
						
						
							
							Add some doc
						
						
						
						
						
						
					 | 
					
						2020-02-07 00:29:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						92fc92ba40
					 | 
					
						
						
							
							Add note models in API
						
						
						
						
						
						
					 | 
					
						2020-02-07 00:12:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						5de93066db
					 | 
					
						
						
							
							Add activity models in API
						
						
						
						
						
						
					 | 
					
						2020-02-06 23:49:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						8e2b0688b5
					 | 
					
						
						
							
							Add member models in API
						
						
						
						
						
						
					 | 
					
						2020-02-06 23:44:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						edc428a05e
					 | 
					
						
						
							
							Add member models in API
						
						
						
						
						
						
					 | 
					
						2020-02-06 23:43:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						f4a665cb7f
					 | 
					
						
						
							
							API
						
						
						
						
						
						
					 | 
					
						2020-02-06 23:29:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						c4a60633f8
					 | 
					
						
						
							
							Consos
						
						
						
						
						
						
					 | 
					
						2020-02-04 01:18:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |