ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-19 05:52:21 +00:00
Code Issues Releases Wiki Activity
866 Commits 20 Branches 4 Tags 27 MiB
b6453ce03d
Commit Graph

288 Commits

Author SHA1 Message Date
Yohann D'ANELLO
6d0ae80610 Update translations (better when uniform...) 2020-04-17 18:33:02 +02:00
Yohann D'ANELLO
96ad5385b0 Distinguish new and old members 2020-04-17 00:48:54 +02:00
Yohann D'ANELLO
080510bcf2 Add WEI form on signup form 2020-04-16 23:31:36 +02:00
Yohann D'ANELLO
db67598b25 Validate WEI memberships 2020-04-14 04:46:52 +02:00
Yohann D'ANELLO
36b26e0baa Validation form (only front) 2020-04-14 03:41:26 +02:00
Yohann D'ANELLO
0bf958dbd6 Edit and view teams 2020-04-13 21:16:52 +02:00
Yohann D'ANELLO
840376a4f5 Add teams 2020-04-13 06:01:27 +02:00
Yohann D'ANELLO
822853be66 Add a bus 2020-04-13 05:02:16 +02:00
Yohann D'ANELLO
6242e316ae Update pre-registrations 2020-04-12 04:39:57 +02:00
Yohann D'ANELLO
bdb0f677e5 List pre-registrations (TODO: filter) 2020-04-12 04:29:44 +02:00
Yohann D'ANELLO
6b8e9d45fd Pre-register 2A+ 2020-04-12 03:31:08 +02:00
Yohann D'ANELLO
ea8e25a7b3 Create WEI 2020-04-12 02:43:22 +02:00
Yohann D'ANELLO
69b7f31eed Add lorem ipsum, update WEI 2020-04-12 02:30:48 +02:00
Yohann D'ANELLO
8fe060847f Display note information larger 2020-04-12 02:07:13 +02:00
Yohann D'ANELLO
7ad32c2afd View detail of a WEI 2020-04-12 00:06:20 +02:00
Yohann D'ANELLO
31d2224b8f List wei 2020-04-11 23:02:12 +02:00
Yohann D'ANELLO
a609d7c995 Fix credit/debit tabs 2020-04-10 23:41:13 +02:00
Alexandre Iooss
7af76899e3
Simplify grids 2020-04-10 23:40:19 +02:00
Alexandre Iooss
700ad7c9f7
Make consume section more bootstrap 2020-04-10 23:15:25 +02:00
Alexandre Iooss
5c1e3dd0ca
Make tooltips opaque again 2020-04-10 22:51:26 +02:00
Alexandre Iooss
45c8fdf1c1
Revert margin for search field 2020-04-10 22:47:59 +02:00
Yohann D'ANELLO
e4a44b0b4a Better transfer page 2020-04-10 22:43:55 +02:00
Alexandre Iooss
0608ebd9f2
Autofocus search field and layout 2020-04-10 22:38:35 +02:00
Alexandre Iooss
64499b65bb
Better tooltips and icons 2020-04-10 22:22:07 +02:00
Alexandre Iooss
57226a0733
Custom style for tooltips 2020-04-10 21:36:04 +02:00
Alexandre Iooss
442ac51373
Clean old search container 2020-04-10 21:28:33 +02:00
Alexandre Iooss
0c70f15721
Placeholder for note search input 2020-04-10 20:21:26 +02:00
Alexandre Iooss
cf67e17e85
Do not use JavaScript to hide double conso after loading 2020-04-10 19:50:42 +02:00
Yohann D'ANELLO
658d402242 Notes of users that don't have validated their email addresses are displayed with a different background 2020-04-10 02:56:56 +02:00
Yohann D'ANELLO
bac81cd13e Merge branch 'master' into tranfer_front 
# Conflicts:
#	static/js/base.js
 2020-04-09 22:49:52 +02:00
Yohann D'ANELLO
fc511689b0 Update mail translation 2020-04-09 22:03:26 +02:00
Yohann D'ANELLO
e067b19d41 Paginate memberships and transactions 2020-04-06 19:51:39 +02:00
Yohann D'ANELLO
f833f1c46c Comment code 2020-04-06 08:58:39 +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
2c3127c746 Société générale can pay BDE membership renewal (only once) 2020-04-05 22:35:56 +02:00
Yohann D'ANELLO
c513759515 Credit note for membership renewals 2020-04-05 21:56:56 +02:00
Yohann D'ANELLO
515edc4459 Credit note for new memberships 2020-04-05 18:37:04 +02:00
Yohann D'ANELLO
f286f99ced Handle payments from the Société Générale, closes #15 2020-04-05 15:31:39 +02:00
Yohann D'ANELLO
3516b1fa04 Add links to resend mail confirmations 2020-04-05 09:48:23 +02:00
Yohann D'ANELLO
fbc25240e6 Validate registrations, closes #14, #18, #19 2020-04-05 09:09:21 +02:00
Yohann D'ANELLO
b1cd46bf7d Invalidate registrations, fix profile creation 2020-04-05 08:01:51 +02:00
Yohann D'ANELLO
f10497bac3 List pending users 2020-04-05 06:40:03 +02:00
Yohann D'ANELLO
49807d33d9 Use a separate app for registration 2020-04-05 05:17:28 +02:00
Yohann D'ANELLO
0f77b9df9a Unvalidate e-mail when the user changes it, but the user still active 2020-04-05 04:37:29 +02:00
Yohann D'ANELLO
26281af673 Send an e-mail verification to a new registered user 2020-04-05 04:26:42 +02:00
Yohann D'ANELLO
3f5faa0b05 Add tab for user list 2020-04-01 20:56:24 +02:00
Yohann D'ANELLO
5eb08fd822 Dynamic user research 2020-04-01 20:14:16 +02:00
Yohann D'ANELLO
2853fe252b Renew memberships 2020-04-01 18:47:56 +02:00
Yohann D'ANELLO
0df0f3f66b Membership fees for paid and unpaid students, closes #43 2020-04-01 04:07:55 +02:00
Yohann D'ANELLO
d5b010980b Full membership support 2020-04-01 03:42:19 +02:00
Yohann D'ANELLO
bf9789bd9e Restructurate memberships, closes #16 2020-03-31 23:54:14 +02:00
Yohann D'ANELLO
e98693b214 Memberships are optional for clubs 2020-03-31 16:22:11 +02:00
Yohann D'ANELLO
dd3b7bd7e5 Remove note activities 2020-03-31 14:57:44 +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
c384ee02eb Implement a new type of note (see #45) 2020-03-31 01:03:30 +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
Pierre-antoine Comby
6ea59a4603 Merge branch 'master' into tranfer_front 2020-03-28 17:47:20 +01:00
Pierre-antoine Comby
948263a867 color codes from note balances 2020-03-28 17:44:22 +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
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
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
dadd840645 Merge remote-tracking branch 'origin/master' into activity 2020-03-27 14:16:10 +01:00
Pierre-antoine Comby
09fb0e1470 Merge branch 'master' into front_club 2020-03-27 14:07:22 +01:00
Pierre-antoine Comby
ee3d441a56 add parent club link 2020-03-27 14:04:30 +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
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
Pierre-antoine Comby
f7a66920e0 move common script to alias.js 2020-03-26 23:05:08 +01:00
Pierre-antoine Comby
e125601f52 almost working javascript 2020-03-26 17:48:17 +01:00
Pierre-antoine Comby
04b39f09af remove forms 2020-03-26 17:45:49 +01:00
Pierre-antoine Comby
7568abb681 some minor cleaning 2020-03-26 17:41:11 +01:00
Pierre-antoine Comby
33e3657120 add aliases view to clubs 2020-03-25 18:00:40 +01:00
Pierre-antoine Comby
a41e51e23a add member get side information 2020-03-25 17:42:54 +01:00
Pierre-antoine Comby
26d70c4ef9 page title and edit buttons 2020-03-25 17:25:44 +01:00
Pierre-antoine Comby
c41999422f Merge branch 'front_club' into 'master' 
Front club

See merge request bde/nk20!68
 2020-03-25 17:02:55 +01:00
Pierre-antoine Comby
ff17f1e877 Club view should as good as profile ones 2020-03-25 16:11:44 +01:00
ynerant
57a01c48a8 Merge branch 'master' into 'tresorerie' 
# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
 2020-03-25 00:30:14 +01:00
Pierre-antoine Comby
0411646ae6 make the CI pass and nicer front 2020-03-25 00:03:48 +01:00
Pierre-antoine Comby
b3c1032f4f wrap in function for correct behavior 2020-03-24 23:27:08 +01:00
Pierre-antoine Comby
9f53bda1cd clean code 2020-03-24 23:02:12 +01:00
Pierre-antoine Comby
41568916b8 error fixes 2020-03-24 22:28:03 +01:00
Pierre-antoine Comby
ba04a6555f dynamically delete buttons 2020-03-24 22:12:59 +01:00
Yohann D'ANELLO
432f14d9d1 Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want) 2020-03-24 22:01:02 +01:00
Yohann D'ANELLO
a33d373f6e Comment code 2020-03-24 20:22:15 +01:00
Yohann D'ANELLO
a52741b87f Add tabs (can be improved) 2020-03-24 01:12:22 +01:00
Yohann D'ANELLO
5682c5489e Close remittances 2020-03-24 00:50:55 +01:00
Pierre-antoine Comby
33139bdbde Dynamic search of buttons 2020-03-24 00:07:25 +01:00
Yohann D'ANELLO
414722df18 Link transactions and remittances 2020-03-23 23:42:37 +01:00
Yohann D'ANELLO
95888ea316 Add some tables for special transactions 2020-03-23 22:43:16 +01:00
Pierre-antoine Comby
7cd8a37aec non dynamic search for button 2020-03-23 20:21:25 +01:00
Pierre-antoine Comby
1ce7dc0118 reorganize tabs of nav bar 2020-03-23 15:53:18 +01:00
Pierre-antoine Comby
4e17b50e35 Merge branch 'master' into manage_button 2020-03-23 15:40:01 +01:00
Pierre-antoine Comby
bbda99a3ac Merge branch 'master' into manage_button 2020-03-23 15:31:39 +01:00