| 
							
							
								 Yohann D'ANELLO | e48ef92137 | Revert commit that broke beta branch | 2020-09-23 18:32:09 +02:00 |  | 
			
				
					| 
							
							
								 erdnaxe | 919d0b7e85 | Merge branch 'ics_cache' into 'beta' Ics cache
See merge request bde/nk20!127 | 2020-09-21 15:46:34 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 439bf35b62 | APT python memcache is PyPi memcached | 2020-09-21 15:25:07 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 74b26335d1 | Cache ICS calendar | 2020-09-21 15:13:59 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 3d733ed6af | Use memcached cache | 2020-09-21 15:13:43 +02:00 |  | 
			
				
					| 
							
							
								 erdnaxe | d54ab94ceb | Merge branch 'oauth' into 'beta' Oauth
See merge request bde/nk20!126 | 2020-09-21 12:53:03 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 4f188ca3e5 | Admin is autodiscovering partially | 2020-09-21 12:34:34 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 72bac75fbd | Add Django OAuth toolkit admin | 2020-09-21 12:15:40 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 6d54aae614 | Fix django-oauth-toolkit version | 2020-09-21 11:15:00 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 8052152ea5 | Add OAuth2 endpoints | 2020-09-21 11:03:07 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 70448db8e5 | Remove Django CAS server and add oauth toolkit | 2020-09-21 10:31:42 +02:00 |  | 
			
				
					| 
							
							
								 ynerant | ac2d1e8111 | Merge branch 'no_side_effect_permission_check' into 'beta' No side effect permission check
See merge request bde/nk20!124 | 2020-09-20 11:24:46 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 3ba61385a3 | Debit is not credit | 2020-09-20 11:12:44 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 7353348d7a | Rollback transaction when checking an add permission (experimental) | 2020-09-20 09:07:51 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | f63e2e088e | Don't log when the permission to lock a note is checked | 2020-09-20 08:56:42 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 420a24ebac | enable JavaScriptCatalog view | 2020-09-19 22:42:35 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | d566def706 | Try to translate js, not working... | 2020-09-19 22:03:45 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | eaf6769e8b | Treasurers can make transactions with people that are no longer a member | 2020-09-19 16:33:52 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | a61ec81cff | note.crans.org is the default domain | 2020-09-19 16:03:32 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 60f2a73cc5 | Don't check if the user is a member of the parent club if there is no parent club | 2020-09-18 13:35:55 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | bcd96b2ed8 | The BDE membership and the club membership must now be in two parts | 2020-09-18 12:35:36 +02:00 |  | 
			
				
					| 
							
							
								 ynerant | 5c702187e5 | Merge branch 'beta' into 'master' Corrections diverses
See merge request bde/nk20!123v1.0.1 | 2020-09-14 10:16:13 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 905d65371f | The user validation form was ugly | 2020-09-14 09:56:15 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 180cd3e1ec | Fix registration permissions and procedure | 2020-09-14 09:49:30 +02:00 |  | 
			
				
					| 
							
							
								 ynerant | 73ca65aa91 | Merge branch 'atomicity' into 'beta' Atomicité
See merge request bde/nk20!122 | 2020-09-14 09:38:54 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 5ed0560953 | Fix linting | 2020-09-14 09:09:20 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | dbc6fbbf71 | Fix the validation clicker issue, now the note is safe | 2020-09-14 09:05:35 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 872fd8f86d | Don't cache permissions in debug mode, that's very slow | 2020-09-14 08:58:12 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | f89234b69a | JS was broken, please close your HTML tags | 2020-09-13 23:18:00 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 36a980555b | Revert "Make the nk20 usable for pirates" This reverts commit 0f53ac45f7. | 2020-09-13 20:42:44 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 826cd4d87f | Revert "Use underscore in locales" This reverts commit 2270a0aa82. | 2020-09-13 20:42:34 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | e8005a6c58 | Update Django locale selector | 2020-09-13 20:17:59 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 2270a0aa82 | Use underscore in locales | 2020-09-13 20:10:26 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 0f53ac45f7 | Make the nk20 usable for pirates | 2020-09-13 20:05:06 +02:00 |  | 
			
				
					| 
							
							
								 erdnaxe | 670556c59e | Merge branch 'traduction' into 'beta' End of Spanish translation
See merge request bde/nk20!121 | 2020-09-13 18:55:56 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 5b02ba48e0 | Some OTL, but so much remain | 2020-09-13 12:40:10 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | f3f18bc25e | Merge branch 'beta' into traduction | 2020-09-13 12:17:25 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 03124e124c | Translation : typo | 2020-09-13 11:52:43 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 6308964e93 | Translation : French OTL | 2020-09-13 11:52:13 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | ed79097288 | Spanish translation : ~end | 2020-09-13 11:51:29 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | d7eaef8cee | Spanish translation : 88%, ¡ quedan 77 para mañana ! | 2020-09-12 22:54:41 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 01d405e54b | Spanish translation : 70%, a comer! | 2020-09-12 20:18:11 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 80e3cba4c6 | BDE Treasurers can see the remittance interface | 2020-09-12 18:40:14 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | f190053e84 | Display the right amount in soge credit detail | 2020-09-12 18:36:05 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 218960adb5 | Spanish translation : 57%, not always 57 | 2020-09-12 16:34:24 +02:00 |  | 
			
				
					| 
							
							
								 elkmaennchen | 88a1eae631 | Spanish translation : 42%, always 42 | 2020-09-12 11:59:59 +02:00 |  | 
			
				
					| 
							
							
								 Alexandre Iooss | 2a2ecb2acc | Activate es locale | 2020-09-12 09:17:15 +02:00 |  | 
			
				
					| 
							
							
								 erdnaxe | f5486bdb63 | Merge branch 'traduction' into 'beta' Traduction
See merge request bde/nk20!120 | 2020-09-12 09:19:04 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 9b090a145c | All transactions are now atomic | 2020-09-11 22:52:16 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 860c7b50e5 | Filter a consumer by its note id | 2020-09-10 14:42:52 +02:00 |  |