Commit Graph

491 Commits

Author SHA1 Message Date
Skia
7e335cfbd7 Update rotating function 2016-11-30 09:28:53 +01:00
Skia
00feca44d8 Merge branch 'krophil' into 'master'
pdf generation for operations

See merge request !21
2016-11-29 12:38:18 +01:00
0b4f826594 Add PDF operations generation 2016-11-29 12:35:37 +01:00
Skia
a60063f009 Oops, syntax error + styling footer 2016-11-29 11:49:41 +01:00
Skia
7f0561234f SAS fixes 2016-11-29 11:35:31 +01:00
Skia
7969e9ba5f Update SAS migration script 2016-11-29 11:29:53 +01:00
Skia
47cb5e60ce Merge branch 'juste' into 'master'
First footer + css improvements

Just little improvements such as a footer and deletion of border-radius on log header, it's rather a first try.

See merge request !13
2016-11-29 11:28:49 +01:00
Skia
c1861755bc Translation update 2016-11-29 11:26:18 +01:00
juste
ff9ed9002e a simple footer + traductions 2016-11-28 11:26:06 +01:00
Skia
064abe0741 UTF-8 fix 2016-11-25 18:59:22 +01:00
Skia
cfbb6f4e1f Lot of small improvement in SAS 2016-11-25 13:47:09 +01:00
Skia
0b23d39e15 Fix migrations after rebase 2016-11-23 11:55:10 +01:00
Skia
b8c9aa4e7f WIP: Begin SAS migration script 2016-11-23 11:46:45 +01:00
Skia
9bccc6a5d1 Small fix in the JS 2016-11-23 11:46:45 +01:00
Jean-Baptiste Lenglet
e66d9bd472 Added asynchronous image upload. 2016-11-23 11:46:45 +01:00
Skia
1c5e658e4b Remove shitty AJAX upload 2016-11-23 11:46:45 +01:00
Skia
da35292cd5 Add is_in_sas field, to perform queries on it 2016-11-23 11:46:45 +01:00
Skia
5481a79f64 WIP: AJAX upload 2016-11-23 11:46:45 +01:00
Skia
0e788dd876 Small refactoring 2016-11-23 11:46:45 +01:00
Skia
0e0e57458f Improve SAS UX 2016-11-23 11:46:45 +01:00
Skia
7dff98d853 Small template improvements 2016-11-23 11:46:45 +01:00
Skia
f900db0dd2 Make SAS translations 2016-11-23 11:46:45 +01:00
Skia
815ef03860 Better handle rotations 2016-11-23 11:46:45 +01:00
Skia
869634d6e1 Add thumbnail generation 2016-11-23 11:46:45 +01:00
Skia
71d22e367b Add picture view to users 2016-11-23 11:46:45 +01:00
Skia
22ab21e4e1 Add picture-people relation and ask for removal thing 2016-11-23 11:46:45 +01:00
Skia
b619619b85 Improve moderation tool in SAS 2016-11-23 11:46:45 +01:00
Skia
e681cc65fe Add SAS moderation tool 2016-11-23 11:46:45 +01:00
Skia
157b1e4c78 Add file moderation tool 2016-11-23 11:46:45 +01:00
Skia
5ea41de91d WIP SAS 2016-11-23 11:46:45 +01:00
Skia
585ba55e5e Continue SAS 2016-11-23 11:46:40 +01:00
Skia
d554a5ee8d Begin SAS 2016-11-23 11:38:01 +01:00
Skia
0b068d3e92 Improve file moderation 2016-11-23 11:30:57 +01:00
Skia
9e32840549 Add file moderation tool 2016-11-23 00:51:20 +01:00
Skia
02be5e1629 Protect query on Eboutic to prevend double basket validation 2016-11-22 17:04:12 +01:00
Skia
cfbd610305 Revert "Merge branch 'fond-gala' into 'master'"
This reverts merge request !25
2016-11-21 14:10:29 +01:00
Skia
98d47727e0 Merge branch 'fond-gala' into 'master'
Add background for gala 2016

See merge request !25
2016-11-13 23:38:13 +01:00
d418da679b Add background for gala 2016 2016-11-13 22:55:32 +01:00
Skia
e98ffb5cd5 Fix unappropriate behavior when delete selling 2016-11-10 13:51:56 +01:00
Skia
11c263b6e7 Hotfix: better handle atomicity in eboutic basket validation 2016-11-10 00:35:13 +01:00
Skia
9f4f3bf436 Fix CI 2016-11-08 19:27:04 +01:00
Skia
e9c19438d4 Fix tests and CI 2016-11-08 19:07:25 +01:00
Skia
321dead0de Translation updates, and make the binary compiled translation file ignored 2016-11-08 18:56:57 +01:00
guillaume-renaud
57b663c4c5 counter inactive state with settings variable, traduction file problem fixed 2016-11-08 18:48:27 +01:00
guillaume-renaud
7f6424d51e Fix the number of minutes for a counter to be inactive to 10 2016-11-08 18:47:50 +01:00
guillaume-renaud
0d6b93d085 Add inactive state for counters 2016-11-08 18:47:40 +01:00
guillaume-renaud
be7e0401dd Fix the number of minutes for a counter to be inactive to 10 2016-11-08 18:42:31 +01:00
guillaume-renaud
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
Skia
ba6e2c3712 Merge branch 'sli' into 'master'
Download sellings as csv

See merge request !24
2016-11-08 15:00:58 +01:00
2dd2189314 Download sellings as csv 2016-11-08 14:57:09 +01:00