| 
							
							
								 Yohann D'ANELLO | f567b1a343 | Activity list is displayed in the right order | 2020-05-29 21:37:44 +02:00 |  | 
			
				
					| 
							
							
								 ynerant | 395c52220f | Merge branch 'master' into 'tranfer_front' # Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html | 2020-05-07 18:48:35 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 16af9ac0ea | Improve survey, comment code | 2020-04-20 01:26:53 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 154ea64b9f | Launching WEI app, add models | 2020-04-11 03:37:06 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 751147f254 | Don't display a note that we can't see, fix CI, fix distinct fields on PostgresSQL DB | 2020-04-10 00:02:22 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 161d2ceed7 | Merge branch 'explicit>implicit' into 'master' Explicit>implicit
See merge request bde/nk20!75 | 2020-04-09 22:41:04 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 99d3ba9c1a | Merge branch 'master' into 'explicit>implicit' # Conflicts:
#   apps/activity/views.py | 2020-04-09 22:31:54 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 68808ddece | Merge branch 'master' into 'fix_distinct' # Conflicts:
#   apps/activity/views.py | 2020-04-09 22:30:19 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 7e0aac0125 | add docstring for entry | 2020-04-06 12:32:44 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 61b32f9aec | explicit context is better than implicit ctx | 2020-04-06 12:13:12 +02:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 9fbfac7bdb | distinct on field not supported by sqlite | 2020-04-06 11:44:02 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 6fedbe2a2a | Some model translations were missing | 2020-04-06 10:58:16 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | bd41560f45 | Update permission fixtures | 2020-04-06 10:45:32 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 9d584ae87a | Add shortcuts for transfers and credits in the activity entry page | 2020-04-06 07:06:52 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 6498a20b87 | A user is active iff the email and the account are validated | 2020-04-06 03:58:48 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 17ea2246ca | Remove useless field in activities | 2020-04-02 15:43:41 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 1aae18e6a6 | Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) | 2020-03-31 04:16:30 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | b0b3aa35a9 | Guests can't be invited if the activity is not validated | 2020-03-30 17:35:47 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | fcb4da2db3 | Guests can't be invited since the activity is started | 2020-03-30 17:27:02 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | fb5796d35e | Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. | 2020-03-30 00:42:32 +02:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 691a03ecad | Add some initial permissions for activities | 2020-03-28 19:05:21 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | c8b72cf1ff | Guests can pay with CB or coins, lot of other improvements | 2020-03-28 16:52:58 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 81cfaf12fa | People can join activities | 2020-03-28 13:38:31 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | a805e41367 | Fix CI | 2020-03-28 02:09:10 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 08ed694438 | Update translations | 2020-03-28 02:08:29 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | a8422411bc | Entry page (we can search people) | 2020-03-28 01:45:13 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 8c1d902c30 | Open and validate activities | 2020-03-27 22:48:20 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | d6e202a26f | Display guests list | 2020-03-27 21:18:27 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 0d43d74c60 | Display activity details | 2020-03-27 19:47:43 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 34949f0859 | Fix activity in Guest model | 2020-03-27 19:16:38 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | ceb5690838 | Invite people | 2020-03-27 18:02:22 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | f09364d3d8 | Custom auto-complete fields, remove DAL requirement | 2020-03-27 16:19:33 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | f81e2b5b5b | Use custom inputs for date picker and amounts | 2020-03-27 13:50:02 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 45b14ed1bd | Create activities | 2020-03-27 01:31:54 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 213e5a8369 | Fix CI | 2020-03-27 00:40:35 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 841d56d5b3 | Merge remote-tracking branch 'origin/master' into activity # Conflicts:
#	note_kfet/urls.py
#	templates/base.html | 2020-03-27 00:32:22 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 3f2b21f7f4 | Fix CI | 2020-03-20 02:14:43 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 057f42fdb6 | Handle permissions (and it seems working!) | 2020-03-18 14:42:35 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 417cd5da04 | Improve REST API with filters | 2020-03-11 11:15:03 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | d0206fb790 | Make erdnaxe be happy | 2020-03-07 22:28:59 +01:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | d5f718fbba | start activity view and urls | 2020-03-01 17:55:48 +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 | 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 | 5de93066db | Add activity models in API | 2020-02-06 23:49:33 +01:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | cbf0f59373 | An activity entry transaction is not mandatory. | 2020-01-21 22:16:07 +01:00 |  | 
			
				
					| 
							
							
								 Pierre-antoine Comby | 5a7d779a90 | Add/ Complete docstring for every models. | 2020-01-21 22:06:06 +01:00 |  |