| 
						
					 | 
					
						
						
							
						
						53a2a160be
					 | 
					
						
						
							
							Add CB refills sum
						
						
						
						
						
						
					 | 
					
						2017-04-05 13:48:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						ec8ee15d0e
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						Serious counter fix
See merge request !62 
						
						
					 | 
					
						2017-04-04 15:48:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34f3fadd3d
					 | 
					
						
						
							
							Rename counter mixin
						
						
						
						
						
						
					 | 
					
						2017-04-04 15:45:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4815df55f
					 | 
					
						
						
							
							Better right counter management
						
						
						
						
						
						
					 | 
					
						2017-04-03 15:21:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						824411b13d
					 | 
					
						
						
							
							Rights fix for counters
						
						
						
						
						
						
					 | 
					
						2017-04-03 13:50:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1430479a1d
					 | 
					
						
						
							
							Some rights fix
						
						
						
						
						
						
					 | 
					
						2017-04-03 11:57:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d89786c8f
					 | 
					
						
						
							
							Serious counter fix
						
						
						
						
						
						
					 | 
					
						2017-04-03 10:46:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						a38d711c62
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						Hide start_date for non root user from clubs
See merge request !61 
						
						
					 | 
					
						2017-04-03 09:47:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb09719317
					 | 
					
						
						
							
							Hide start_date for non root user from clubs
						
						
						
						
						
						
					 | 
					
						2017-04-03 09:41:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						41c9f6381a
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						Fix continuous tests
See merge request !60 
						
						
					 | 
					
						2017-03-31 11:35:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						231922cbaa
					 | 
					
						
						
							
							Merge branch 'sas' into 'master'
						
						
						
						
						
						
						
						Fixed some issues with filepaths and see the future with some preload
See merge request !59 
						
						
					 | 
					
						2017-03-31 11:34:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f2566a244
					 | 
					
						
						
							
							Fix continuous integration
						
						
						
						
						
						
					 | 
					
						2017-03-30 22:18:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60e2e0d4f9
					 | 
					
						
						
							
							Better to use os.path.join for paths
						
						
						
						
						
						
					 | 
					
						2017-03-30 19:13:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1f844da005
					 | 
					
						
						
							
							Preload on sas
						
						
						
						
						
						
					 | 
					
						2017-03-28 18:46:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						33e4cd6ca4
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						Better protection for stats
See merge request !58 
						
						
					 | 
					
						2017-03-28 15:58:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8787e5e708
					 | 
					
						
						
							
							Better protection for stats
						
						
						
						
						
						
					 | 
					
						2017-03-28 15:00:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						a078bae260
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						Fix broken accounting + security fixs
See merge request !57 
						
						
					 | 
					
						2017-03-28 08:11:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						63506b1506
					 | 
					
						
						
							
							Protect stats from other users
						
						
						
						
						
						
					 | 
					
						2017-03-28 01:03:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfd465c7f9
					 | 
					
						
						
							
							Fix bug where customer can't buy an item when they have the just amount
						
						
						
						
						
						
					 | 
					
						2017-03-28 00:55:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d918d80d3
					 | 
					
						
						
							
							Avoid negative value in refilings
						
						
						
						
						
						
					 | 
					
						2017-03-28 00:34:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ccd67e50b8
					 | 
					
						
						
							
							Avoid unothorised customer to buy in counter by modifying url
						
						
						
						
						
						
					 | 
					
						2017-03-27 23:28:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5eb1e609cc
					 | 
					
						
						
							
							Fixed tests issues
						
						
						
						
						
						
					 | 
					
						2017-03-27 22:47:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						50413abf76
					 | 
					
						
						
							
							Fix a weekmail deleteview, and make some translate fix
						
						
						
						
						
						
					 | 
					
						2017-03-27 15:16:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						b28ce200e6
					 | 
					
						
						
							
							Fix some translations
						
						
						
						
						
						
					 | 
					
						2017-03-27 14:31:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						3cf1628435
					 | 
					
						
						
							
							Fix weekmail new article link
						
						
						
						
						
						
					 | 
					
						2017-03-24 14:01:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						39b32d456c
					 | 
					
						
						
							
							Some com templates improvments and reordering some models
						
						
						
						
						
						
					 | 
					
						2017-03-24 09:19:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						d2da5716ba
					 | 
					
						
						
							
							Automodere profile files
						
						
						
						
						
						
					 | 
					
						2017-03-24 08:43:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						e56b2476b7
					 | 
					
						
						
							
							Fix notifications local time
						
						
						
						
						
						
					 | 
					
						2017-03-17 18:11:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						0887fe6c9e
					 | 
					
						
						
							
							Arg, forgot another Ariadne's thread fix
						
						
						
						
						
						
					 | 
					
						2017-03-16 08:15:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						825228cad6
					 | 
					
						
						
							
							Forum cosmetic
						
						
						
						
						
						
					 | 
					
						2017-03-15 19:24:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						3993d17efe
					 | 
					
						
						
							
							Fix forum Ariadne's thread
						
						
						
						
						
						
					 | 
					
						2017-03-15 18:35:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						f400be3a79
					 | 
					
						
						
							
							Refactor topic to use paginator instead of custom paging
						
						
						
						
						
						
					 | 
					
						2017-03-15 18:34:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						701f23b539
					 | 
					
						
						
							
							Merge branch 'bugfix' into 'master'
						
						
						
						
						
						
						
						forgotten o of shame (not for me)
See merge request !55 
						
						
					 | 
					
						2017-03-15 08:15:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfcb671bf0
					 | 
					
						
						
							
							forgoten o of shame (not for me)
						
						
						
						
						
						
					 | 
					
						2017-03-14 19:09:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						5e0f790247
					 | 
					
						
						
							
							Merge branch 'counter' into 'master'
						
						
						
						
						
						
						
						Pagination for cash sumary
See merge request !53 
						
						
					 | 
					
						2017-03-14 17:39:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						493d48bcca
					 | 
					
						
						
							
							Pagination length in settings
						
						
						
						
						
						
					 | 
					
						2017-03-13 23:33:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4deacbe56
					 | 
					
						
						
							
							Pagination for cash sumary
						
						
						
						
						
						
					 | 
					
						2017-03-13 16:32:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						3fd4d4b04b
					 | 
					
						
						
							
							Merge branch 'Tresorerie' into 'master'
						
						
						
						
						
						
						
						Tresorerie
Many modifications linked to the issue #23
See merge request !48 
						
						
					 | 
					
						2017-03-12 23:05:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						729a3608ba
					 | 
					
						
						
							
							Add some pagination on forum topics
						
						
						
						
						
						
					 | 
					
						2017-03-12 20:40:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5932aad9fa
					 | 
					
						
						
							
							Improve journal removing
						
						
						
						
						
						
					 | 
					
						2017-03-12 20:33:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f9ec9a2ab
					 | 
					
						
						
							
							Merge branch 'Tresorerie' of https://ae-dev.utbm.fr/ae/Sith into Tresorerie
						
						
						
						
						
						
					 | 
					
						2017-03-12 20:22:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						65e2514df2
					 | 
					
						
						
							
							Small template fixes in forum
						
						
						
						
						
						
					 | 
					
						2017-03-12 18:31:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						a56d3a3088
					 | 
					
						
						
							
							Add a help_text to Weekmail edit form
						
						
						
						
						
						
					 | 
					
						2017-03-12 18:13:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Skia
							
						 
					 | 
					
						
						
							
						
						73cbfd3e82
					 | 
					
						
						
							
							Add Forum ordering number
						
						
						
						
						
						
					 | 
					
						2017-03-12 18:06:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0bf457de50
					 | 
					
						
						
							
							Hiding some already forbidden stuff
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8329a19cc2
					 | 
					
						
						
							
							fix permissions
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						95775d3b9b
					 | 
					
						
						
							
							adaptations for settings and deletion checked
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c8671c160
					 | 
					
						
						
							
							Better club roles in settings
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1acac17d7e
					 | 
					
						
						
							
							Several modifications in accounting
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8133db804e
					 | 
					
						
						
							
							fix permission for companies
						
						
						
						
						
						
					 | 
					
						2017-03-11 11:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |