 klmp200
|
aab589b5d1
|
Merge branch 'fontawesome' into 'master'
add font-awesome
See merge request ae/Sith!118
|
2017-09-29 14:55:25 +02:00 |
|
|
klmp200
|
9318292ed8
|
Merge branch 'sli' into 'master'
Logo for 18
See merge request !114
|
2017-09-13 18:34:22 +02:00 |
|
|
klmp200
|
b1c3ea9e2c
|
Logo for 18
|
2017-09-13 18:28:18 +02:00 |
|
|
klmp200
|
6d09a9e9b0
|
Merge branch 'krophil' into 'master'
Oups, I did it again...
See merge request !106
|
2017-09-02 15:39:01 +02:00 |
|
|
klmp200
|
e581de0a94
|
Merge branch 'krophil' into 'master'
Add color palette creator + add list of refillings
See merge request !105
|
2017-09-02 15:28:19 +02:00 |
|
|
klmp200
|
bb40d48b62
|
Merge branch 'nintendo_switch' into 'master'
New Sponsors page
See merge request !104
|
2017-08-31 14:19:05 +02:00 |
|
|
klmp200
|
5e8ae83cf2
|
Merge branch 'mailing' into 'master'
mailing: Oups, forgot some \n in mailing format that I couldn't see at the first time
See merge request !103
|
2017-08-25 16:23:01 +02:00 |
|
|
klmp200
|
1f8b035558
|
mailing: Oups, forgot some \n in mailing format that I couldn't see at the first time
|
2017-08-25 16:14:02 +02:00 |
|
|
klmp200
|
c0b3024cc2
|
Merge branch 'mailing' into 'master'
Fix permission for club in user profile
See merge request !102
|
2017-08-24 14:49:04 +02:00 |
|
|
klmp200
|
b0ce8b1b83
|
Fix permission for club in user profile
|
2017-08-24 14:42:57 +02:00 |
|
|
klmp200
|
f65f261cfd
|
mailing: Fix error when deleting user from mailing when only email provided
|
2017-08-24 00:20:20 +02:00 |
|
|
klmp200
|
6f6ad123af
|
Allow disabling CB in crisis time
|
2017-08-24 00:14:36 +02:00 |
|
|
klmp200
|
8e166b75e4
|
Merge branch 'nintendo_switch' into 'master'
Changing urls
See merge request !99
|
2017-08-22 23:53:56 +02:00 |
|
|
klmp200
|
4f6109e27c
|
Refactor mailings email
|
2017-08-22 22:39:12 +02:00 |
|
|
klmp200
|
c83a990165
|
Wtf migration blocking me
|
2017-08-22 16:03:24 +02:00 |
|
|
klmp200
|
62b59f92fd
|
Translations
|
2017-08-22 15:51:09 +02:00 |
|
|
klmp200
|
d179a0a6d0
|
Fix typo and merge migrations
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
470680e760
|
Add moderation for mailing lists
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
fe187dae38
|
Only begining of the mail is now needed
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
ce9e17ea24
|
Some mailing list fixs
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
9e5159152a
|
Little right fix
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
cc8991a938
|
Fix migration for mailing
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
51992e1c30
|
Mailing migration
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
72d968e9a5
|
Mailing migrations
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
76efb91e40
|
Move mailing list admin to com
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
69e997d587
|
Refactoring mailings
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
3a6f7009fd
|
Fix display rights in user profile for mailing
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
e82e338e76
|
Fix mailing settings position
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
8c9f02a142
|
Add fetch function for DSI
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
9cb88a878d
|
Even better mailing
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
feaf6b73b7
|
Begin mailing list system
|
2017-08-22 15:36:39 +02:00 |
|
|
klmp200
|
df42617cda
|
Merge branch 'krophil' into 'master'
Add a new subscription for the Welcome Week
See merge request !97
|
2017-08-21 21:34:20 +02:00 |
|
|
klmp200
|
6cfdcb093f
|
Wtf forgot this little guy
|
2017-08-17 00:10:12 +02:00 |
|
|
klmp200
|
d864c00472
|
Merge branch 'matmatronch' into 'master'
Translations fix for matmatronch
See merge request !94
|
2017-08-15 19:11:12 +02:00 |
|
|
klmp200
|
f49f889d5b
|
Translations fix
|
2017-08-15 18:57:50 +02:00 |
|
|
klmp200
|
0f408d9d89
|
Translations
|
2017-08-15 18:08:32 +02:00 |
|
|
klmp200
|
a9e23920ee
|
Matmat renames
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
dc571836ae
|
Fixed issues with department and sex form
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
86d62f12e7
|
Fully functionnal Matmatronch
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
349475cd37
|
Functionnal search engine
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
39616874a8
|
Fix broken pagination by remembering last search
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
9ff8f02a45
|
Form remember last entered values
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
b7c382a1a8
|
Basic search structure
|
2017-08-15 18:05:07 +02:00 |
|
|
klmp200
|
3e950e1dd1
|
Migration fix
|
2017-08-15 17:37:25 +02:00 |
|
|
klmp200
|
de4521c192
|
Ecocup limit comments
|
2017-08-15 14:03:56 +02:00 |
|
|
klmp200
|
748e3ae326
|
Refactor and migration corrections
|
2017-08-15 13:57:49 +02:00 |
|
|
klmp200
|
240b68f98d
|
Allow negative amount for customer
|
2017-08-15 13:57:49 +02:00 |
|
|
klmp200
|
d60e14a303
|
Migration from old database
|
2017-08-15 13:57:49 +02:00 |
|
|
klmp200
|
7588cc8f73
|
Hardcoding ecocup values
|
2017-08-15 13:57:49 +02:00 |
|
|
klmp200
|
40927fa13d
|
Add limit for ecocup recording
|
2017-08-15 13:57:49 +02:00 |
|
|
klmp200
|
22407e2f85
|
Bottom links migrations to internal wiki
|
2017-08-15 03:30:39 +02:00 |
|
|
klmp200
|
c56094eaaf
|
Some selected club members can now make people subscribe and fix major security hole in board_member verification
|
2017-07-26 20:31:29 +02:00 |
|
|
klmp200
|
ea09604b2e
|
Other line fix
|
2017-06-07 19:36:55 +02:00 |
|
|
klmp200
|
b6a68fa090
|
Fix some ugly lines
|
2017-06-07 19:16:55 +02:00 |
|
|
klmp200
|
41a9bf9953
|
Elections : Fix tests, cleaned urls and add nice description
|
2017-06-07 18:49:24 +02:00 |
|
|
klmp200
|
c4389bb9cd
|
Add a way for admin to delete elections and add archive system
|
2017-06-07 18:42:16 +02:00 |
|
|
klmp200
|
0076c9cdb4
|
Macro for pagination
|
2017-06-07 18:39:42 +02:00 |
|
|
klmp200
|
d3fbc65cdc
|
Pep8 for elections
|
2017-06-07 18:39:42 +02:00 |
|
|
klmp200
|
801d287c0c
|
Random colors for stats graphs
|
2017-06-07 15:23:32 +02:00 |
|
|
klmp200
|
22945483d6
|
Add some graphics for subscriptions stats
|
2017-06-07 14:12:03 +02:00 |
|
|
klmp200
|
88762c492f
|
Subscriptions stats optimisations + form for start and end date
|
2017-06-06 23:27:57 +02:00 |
|
|
klmp200
|
1c05671784
|
Added forgotten column and a link in tools
|
2017-06-06 22:03:56 +02:00 |
|
|
klmp200
|
e97135bf47
|
Add subscriptions stats
|
2017-06-06 22:03:56 +02:00 |
|
|
klmp200
|
e59d769dac
|
Doc for scss
|
2017-05-10 11:13:49 +02:00 |
|
|
klmp200
|
200af57971
|
Put scss in renderer
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
f87ec1e395
|
Better lisibility for scss
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
d083a67725
|
Change year of license on some files
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
acef5be8b3
|
New lite home made scss processor
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
630fdf93a4
|
Refactoring for compilestatic
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
79c769351d
|
Add simple way to compile scss files
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
b23d322a29
|
Instruction for prod with scss
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
ee7fd1c423
|
Rename temporary_design
|
2017-05-10 10:49:34 +02:00 |
|
|
klmp200
|
2ef3c0260a
|
Fix error on accounting when no target_type specified
|
2017-05-06 21:15:44 +02:00 |
|
|
klmp200
|
7cb9ea40ac
|
Anonymous users can't edit weekmail
|
2017-05-06 20:48:48 +02:00 |
|
|
klmp200
|
5a7b743c83
|
Try fix right issues in counter admin
|
2017-05-06 20:48:48 +02:00 |
|
|
klmp200
|
0b81d6a4c6
|
Merge branch 'weekmail' into 'master'
New css for weekmail
See merge request !68
|
2017-05-01 13:17:58 +02:00 |
|
|
klmp200
|
f2aadae8e8
|
Fix errors on election tests
|
2017-04-25 15:30:57 +02:00 |
|
|
klmp200
|
b5363c2987
|
Firsts tests for elections
|
2017-04-25 15:30:57 +02:00 |
|
|
klmp200
|
edc438bc0e
|
More readability for sum
|
2017-04-05 15:08:11 +02:00 |
|
|
klmp200
|
6ca183ad55
|
Better sum writing
|
2017-04-05 14:23:51 +02:00 |
|
|
klmp200
|
53a2a160be
|
Add CB refills sum
|
2017-04-05 13:48:43 +02:00 |
|
|
klmp200
|
34f3fadd3d
|
Rename counter mixin
|
2017-04-04 15:45:02 +02:00 |
|
|
klmp200
|
d4815df55f
|
Better right counter management
|
2017-04-03 15:21:07 +02:00 |
|
|
klmp200
|
824411b13d
|
Rights fix for counters
|
2017-04-03 13:50:28 +02:00 |
|
|
klmp200
|
1430479a1d
|
Some rights fix
|
2017-04-03 11:57:28 +02:00 |
|
|
klmp200
|
5d89786c8f
|
Serious counter fix
|
2017-04-03 10:46:53 +02:00 |
|
|
klmp200
|
fb09719317
|
Hide start_date for non root user from clubs
|
2017-04-03 09:41:35 +02:00 |
|
|
klmp200
|
9f2566a244
|
Fix continuous integration
|
2017-03-30 22:18:03 +02:00 |
|
|
klmp200
|
60e2e0d4f9
|
Better to use os.path.join for paths
|
2017-03-30 19:13:47 +02:00 |
|
|
klmp200
|
1f844da005
|
Preload on sas
|
2017-03-28 18:46:10 +02:00 |
|
|
klmp200
|
8787e5e708
|
Better protection for stats
|
2017-03-28 15:00:09 +02:00 |
|
|
klmp200
|
63506b1506
|
Protect stats from other users
|
2017-03-28 01:03:31 +02:00 |
|
|
klmp200
|
dfd465c7f9
|
Fix bug where customer can't buy an item when they have the just amount
|
2017-03-28 00:55:25 +02:00 |
|
|
klmp200
|
0d918d80d3
|
Avoid negative value in refilings
|
2017-03-28 00:34:58 +02:00 |
|
|
klmp200
|
ccd67e50b8
|
Avoid unothorised customer to buy in counter by modifying url
|
2017-03-27 23:28:06 +02:00 |
|
|
klmp200
|
5eb1e609cc
|
Fixed tests issues
|
2017-03-27 22:47:24 +02:00 |
|
|
klmp200
|
cfcb671bf0
|
forgoten o of shame (not for me)
|
2017-03-14 19:09:12 +01:00 |
|
|
klmp200
|
493d48bcca
|
Pagination length in settings
|
2017-03-13 23:33:43 +01:00 |
|
|
klmp200
|
e4deacbe56
|
Pagination for cash sumary
|
2017-03-13 16:32:59 +01:00 |
|
|
klmp200
|
0bf457de50
|
Hiding some already forbidden stuff
|
2017-03-11 11:57:37 +01:00 |
|