ynerant
							
						 
					 | 
					
						
						
							
						
						6f7374710b
					 | 
					
						
						
							
							Merge branch 'master' into 'logging'
						
						
						
						
						
						
						
						# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po 
						
						
					 | 
					
						2020-03-07 10:32:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Graillot
							
						 
					 | 
					
						
						
							
						
						8a9ad0a6e5
					 | 
					
						
						
							
							[permission] Handle add rights
						
						
						
						
						
						
					 | 
					
						2020-03-07 09:30:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						38feb693f3
					 | 
					
						
						
							
							crop,resized, and save picture at the right place
						
						
						
						
						
						
					 | 
					
						2020-03-06 20:07:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						08b97e722b
					 | 
					
						
						
							
							add support for cropping image. WIP.
						
						
						
						
						
						
					 | 
					
						2020-03-05 23:32:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						2e8505e9b4
					 | 
					
						
						
							
							ménage dans les imports
						
						
						
						
						
						
					 | 
					
						2020-03-04 16:34:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						fd74080ce3
					 | 
					
						
						
							
							profile picture update view is working
						
						
						
						
						
						
					 | 
					
						2020-03-04 16:34:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						c4198a64af
					 | 
					
						
						
							
							add button for profile pic view
						
						
						
						
						
						
					 | 
					
						2020-03-03 14:45:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						14ccc8da75
					 | 
					
						
						
							
							Add ImageForm
						
						
						
						
						
						
					 | 
					
						2020-03-03 14:26:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						f992c117f4
					 | 
					
						
						
							
							rename second_form to profile_form
						
						
						
						
						
						
					 | 
					
						2020-03-03 14:25:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						211859e940
					 | 
					
						
						
							
							add default profile pic
						
						
						
						
						
						
					 | 
					
						2020-03-03 14:24:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						901454f338
					 | 
					
						
						
							
							rename template for consistency
						
						
						
						
						
						
					 | 
					
						2020-03-03 11:05:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						d5f718fbba
					 | 
					
						
						
							
							start activity view and urls
						
						
						
						
						
						
					 | 
					
						2020-03-01 17:55:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						b7e68722aa
					 | 
					
						
						
							
							front improvement on alias page
						
						
						
						
						
						
					 | 
					
						2020-03-01 16:20:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						35d5bcdf0f
					 | 
					
						
						
							
							Deletion of alias now possible!
						
						
						
						
						
						
					 | 
					
						2020-03-01 00:25:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						27391049f2
					 | 
					
						
						
							
							remove duplicated form
						
						
						
						
						
						
					 | 
					
						2020-02-28 16:12:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						db95944574
					 | 
					
						
						
							
							add delete boutons, work with only one alias
						
						
						
						
						
						
					 | 
					
						2020-02-28 15:25:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						c77bc0c032
					 | 
					
						
						
							
							add deleteView for aliases
						
						
						
						
						
						
					 | 
					
						2020-02-28 13:52:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						9133c84ef2
					 | 
					
						
						
							
							comment bug
						
						
						
						
						
						
					 | 
					
						2020-02-28 13:49:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						f77351b444
					 | 
					
						
						
							
							Add view for aliases
						
						
						
						
						
						
					 | 
					
						2020-02-28 13:37:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						0ea0d77707
					 | 
					
						
						
							
							fix #27
						
						
						
						
						
						
					 | 
					
						2020-02-27 20:56:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						3764bc44ff
					 | 
					
						
						
							
							Fix money creation, closes #25
						
						
						
						
						
						
					 | 
					
						2020-02-27 17:22:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						b23237f669
					 | 
					
						
						
							
							Uncomment required line
						
						
						
						
						
						
					 | 
					
						2020-02-27 16:26:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						9cd050e2f0
					 | 
					
						
						
							
							Logging is finally processed at post saved, but old instance is querried
						
						
						
						
						
						
					 | 
					
						2020-02-27 16:25:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						bcee5f8f2f
					 | 
					
						
						
							
							Don't log when there is no modification, or only when a user is connected
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:53:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						125f437345
					 | 
					
						
						
							
							Profiles are saved after the user
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:41:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						3c52c1d002
					 | 
					
						
						
							
							Users have now automatically an attached profile to a user (fix an old bug)
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:36:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						d316c3130c
					 | 
					
						
						
							
							Logs are created post save
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:35:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						aecd3fc86f
					 | 
					
						
						
							
							Update excluded models list
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:30:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						12ddfad254
					 | 
					
						
						
							
							Update JSON
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:59:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						2f51057f4c
					 | 
					
						
						
							
							Add IP address to migrations
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:47:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						079e423343
					 | 
					
						
						
							
							Merge branch 'master' into logging
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:36:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						5995969a67
					 | 
					
						
						
							
							Detect migrations
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:35:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						1c762e5444
					 | 
					
						
						
							
							Trying to get IP
						
						
						
						
						
						
					 | 
					
						2020-02-27 13:34:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						10854eb334
					 | 
					
						
						
							
							Update some excluded models
						
						
						
						
						
						
					 | 
					
						2020-02-26 23:55:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						1c0bf21cbe
					 | 
					
						
						
							
							Content type stored in logs instead of model name
						
						
						
						
						
						
					 | 
					
						2020-02-26 23:34:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						707770a5b4
					 | 
					
						
						
							
							fix #28
						
						
						
						
						
						
					 | 
					
						2020-02-25 22:55:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						eb6f142bf8
					 | 
					
						
						
							
							autofocus of signup form on first field
						
						
						
						
						
						
					 | 
					
						2020-02-25 22:26:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						25fc35c857
					 | 
					
						
						
							
							Merge branch 'import_nk15' into 'master'
						
						
						
						
						
						
						
						Import nk15
See merge request bde/nk20!23 
						
						
					 | 
					
						2020-02-25 20:31:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						0cd0b11fa5
					 | 
					
						
						
							
							remove name Field of TemplateTransaction
						
						
						
						
						
						
						
						Redundant with `reason` from Transaction 
						
						
					 | 
					
						2020-02-25 14:15:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						33eba8a403
					 | 
					
						
						
							
							add last_negative field to note
						
						
						
						
						
						
					 | 
					
						2020-02-25 14:15:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						4e5e80978b
					 | 
					
						
						
							
							Merge branch 'import_nk15' into 'master'
						
						
						
						
						
						
						
						Import nk15: rm import_nk15
See merge request bde/nk20!22 
						
						
					 | 
					
						2020-02-24 18:48:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						5421943fba
					 | 
					
						
						
							
							Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15
						
						
						
						
						
						
					 | 
					
						2020-02-24 18:44:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Graillot
							
						 
					 | 
					
						
						
							
						
						640e48b5df
					 | 
					
						
						
							
							[note] no transaction_type
						
						
						
						
						
						
					 | 
					
						2020-02-24 18:33:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yohann D'ANELLO
							
						 
					 | 
					
						
						
							
						
						fd529a53c8
					 | 
					
						
						
							
							Logging support
						
						
						
						
						
						
					 | 
					
						2020-02-24 18:18:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						6ad7974612
					 | 
					
						
						
							
							import script is move to new repository
						
						
						
						
						
						
					 | 
					
						2020-02-24 14:17:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benjamin Graillot
							
						 
					 | 
					
						
						
							
						
						c2fbb1bcdf
					 | 
					
						
						
							
							Polymorphic transaction
						
						
						
						
						
						
					 | 
					
						2020-02-24 10:36:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						9207c5cdec
					 | 
					
						
						
							
							add aliases import
						
						
						
						
						
						
					 | 
					
						2020-02-23 21:11:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						e850c5755b
					 | 
					
						
						
							
							clean code, dont activate user
						
						
						
						
						
						
					 | 
					
						2020-02-23 21:10:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						f5a80dd0a5
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2020-02-23 21:05:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pierre-antoine Comby
							
						 
					 | 
					
						
						
							
						
						4de817bd75
					 | 
					
						
						
							
							Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15
						
						
						
						
						
						
					 | 
					
						2020-02-23 18:56:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |