klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
908 Commits 24 Branches 0 Tags 106 MiB
41a9bf9953
Commit Graph

435 Commits

Author SHA1 Message Date
Skia
3970965781 Merge branch 'Tresorerie' into 'master' 
Refound Account

See merge request !26
 2016-11-30 15:44:43 +01:00
Skia
8771cc9b86 Enhance user picture view 2016-11-30 12:59:03 +01:00
Skia
7453b857fb Add thumbnails to albums 2016-11-30 09:28:54 +01:00
klmp200
3c8a4f068e Refound Account 2016-11-30 08:19:52 +01:00
Krophil
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
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
da35292cd5 Add is_in_sas field, to perform queries on it 2016-11-23 11:46:45 +01:00
Skia
0e0e57458f Improve SAS UX 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
157b1e4c78 Add file moderation tool 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
cfbd610305 Revert "Merge branch 'fond-gala' into 'master'" 
This reverts merge request !25
 2016-11-21 14:10:29 +01:00
klmp200
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
guillaume-renaud
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
Skia
54d3ca8e65 Merge branch 'sli' into 'master' 
Edit CONTRIBUTING instructions

See merge request !20
 2016-11-06 23:27:00 +01:00
klmp200
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01:00
Skia
20ff409547 Fix tests 2016-11-06 11:36:54 +01:00
Skia
59f5917b8c Fix Page locking 2016-11-05 13:37:39 +01:00
Skia
9cfc029fb2 Permission fix 2016-10-27 18:39:40 +02:00
klmp200
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02:00
klmp200
224374f5e8 More readable user_account 2016-10-19 01:57:54 +02:00
klmp200
029bc7cc7c Add link to create club in rootplace 2016-10-18 23:36:26 +02:00
klmp200
c40171fe86 Clean permission check for alcohol and counter ban 2016-10-18 23:02:53 +02:00
klmp200
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
klmp200
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
klmp200
257cb9cfe7 Add ban for alcohol 2016-10-15 02:33:38 +02:00
klmp200
178a4af196 Add lazy way to make an user property editable once only 2016-10-13 22:58:26 +02:00
klmp200
579c25d63a Deny date of birth, first and last name modification for non board or root user 2016-10-13 22:32:13 +02:00
Skia
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00
klmp200
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
guillaume-renaud
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
guillaume-renaud
760b33728b Addition of the user's club tab as table 2016-10-06 11:08:32 +02:00
guillaume-renaud
1b63d58586 Addition of the user's club tab 2016-10-06 11:08:32 +02:00
Skia
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
Skia
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
Skia
cd23fdf3ef Add missing eticket banner 2016-10-03 19:43:22 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
52184c4012 Merge branch 'sli' into 'master' 
Godfathers deletion



See merge request !11
 2016-09-29 15:12:19 +02:00
klmp200
2c6f17063a Can delete Godfathers 2016-09-29 15:06:39 +02:00
klmp200
a008f34288 Fix bug where slots appears when slot expired 2016-09-28 17:22:34 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
klmp200
8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
klmp200
17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +02:00
Skia
f152791d90 Merge branch 'sli' into 'master' 
Only club members can view counter's stats

N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres…

See merge request !9
 2016-09-27 20:12:57 +02:00
klmp200
3c408551aa Remove nested exception for stats and added property on AnonymusUser 2016-09-27 16:56:30 +02:00
Skia
a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
Skia
37072e1640 Clean up some useless prints 2016-09-26 11:17:55 +02:00
Skia
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
Skia
24d744ee9c Merge branch 'krophil' into 'master' 
Krophil

Few changes in css

See merge request !7
 2016-09-26 09:25:13 +02:00
Skia
4749c45c97 Merge branch 'sli' into 'master' 
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette



See merge request !8
 2016-09-26 09:23:35 +02:00
klmp200
380f41445a Modify property names 2016-09-22 13:07:22 +02:00
klmp200
e250acf82d Used settings for office and launderette 2016-09-22 13:00:00 +02:00
Skia
ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +02:00
Skia
ae6a613f9a Add promo_17.png 2016-09-21 15:41:12 +02:00
Skia
9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
klmp200
748ad1c5c2 Fixed some mistakes 2016-09-21 14:01:44 +02:00
klmp200
2d16b9c296 Hided launderette slots and tokens for non authorized users and added is_office and is_launderette 2016-09-21 13:33:02 +02:00
Skia
f1e54439e1 Small stats fix 2016-09-21 12:19:34 +02:00
Skia
324bd69312 Small templates fixes 2016-09-20 20:38:12 +02:00
Krophil
1d9c058132 Revert "radius removed" 
This reverts commit 26a1300417.
 2016-09-20 17:12:09 +02:00
Krophil
62c4036dee radius removed 2016-09-20 13:22:05 +02:00
Krophil
b11c5bbd1d Merging 2016-09-20 13:19:44 +02:00
Skia
1e0904b48e Merge branch 'sli' into 'master' 
Quick fix to hide account number in profile page when not owner user or root

Faut vite cacher les numéros de compte des gens à qui ils n'apartiennent pas, sinon c'est la faille de sécu D:

See merge request !6
 2016-09-19 20:43:33 +02:00
Skia
5b83aff351 Small UI fix 2016-09-19 20:40:38 +02:00
Skia
5ba2ab925d Add godfathers 2016-09-19 20:29:43 +02:00
klmp200
584025acf0 Quick fix to hide account number in profile page when not owner user or root 2016-09-18 22:50:10 +02:00
Skia
35d811317c Add top 100 to counters 2016-09-15 11:07:03 +02:00
Skia
6aaeb7cdc9 Rename membership to memberships 2016-09-15 11:06:51 +02:00
Skia
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia
6cacfb8d8d Add counter activity 2016-09-12 17:34:33 +02:00
Skia
54444b31ba Some template improvements 2016-09-11 19:00:12 +02:00
Skia
7aec32cef0 Some quick improvement on account view 2016-09-09 20:38:27 +02:00
Skia
5e26e5bde7 Merge branch 'sli' 2016-09-09 19:56:48 +02:00
Skia
5b5006892d Make sellings for clubs 2016-09-09 16:23:35 +02:00
Skia
90e47c9d7d Add a restriction on the counter login view to authorize only the sellers 2016-09-09 01:54:26 +02:00
klmp200
2f7dc9ec19 Used lambda function in user detail 2016-09-08 04:15:34 +02:00
klmp200
41d5a02d77 Fixed account order and detail account view 2016-09-08 03:38:28 +02:00
klmp200
8d060af46c Removed wierd hack 2016-09-08 03:21:39 +02:00
klmp200
bca8dc039a Added macros for slots and tokens display 2016-09-07 23:06:38 +02:00
klmp200
61c77a7877 Added address on profile 2016-09-07 02:07:01 +02:00
klmp200
c0296b9ada Added slots on user profile 2016-09-07 01:51:34 +02:00
klmp200
a64b10776e Monthly user account 2016-09-06 22:13:48 +02:00
klmp200
78bf4b7b84 Fixed markdown api issue 2016-09-06 21:59:13 +02:00
Skia
b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
klmp200
80549c7a33 Fixed get_age 2016-09-04 16:26:02 +02:00
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
Skia
d93dda1c0e Merge branch 'sli' into 'master' 
Fixed old database bug in dev env



See merge request !2
 2016-09-04 15:00:16 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
klmp200
8328e668bd Fixed old database bug in dev env 2016-09-02 21:24:10 +02:00
Skia
c5fd9d0076 Small template fixes 2016-09-02 19:31:47 +02:00
Skia
b2df8fbf18 Fix LoginForm 2016-09-01 17:50:13 +02:00
Skia
d27f62dca9 Small fixes 2016-09-01 16:43:21 +02:00
Skia
f7e3251ae5 Right fix and translation 2016-09-01 11:27:00 +02:00
Skia
1f31d3b56f Send a mail when someone is subscribed 2016-08-31 18:40:17 +02:00
Skia
6af16cc893 Some basic templating 2016-08-31 17:18:21 +02:00
Skia
37d303634c Fix form with files 2016-08-31 15:29:16 +02:00
Skia
a47cca1b1e Very small CSS improvement 2016-08-31 04:08:28 +02:00
Skia
0db7180d43 Do some user profile templating 2016-08-31 04:04:28 +02:00
Skia
55ea2ac763 Change link color 2016-08-31 03:32:55 +02:00
Skia
4a29a431af Display user amount without the account page 2016-08-31 03:25:26 +02:00
Skia
f66b999f24 Improve login form 2016-08-31 02:44:46 +02:00
Skia
fcfbfb3a0b Small file fix 2016-08-31 02:05:04 +02:00
Skia
fe2438ef0c Fix subscription right and typo 2016-08-29 19:48:29 +02:00
Skia
3667a12174 Fix webcam upload 2016-08-29 04:58:25 +02:00
Skia
f0499cdb26 Make a better index page 2016-08-29 03:25:47 +02:00
Skia
4215baec26 Make the bar menu 2016-08-29 03:14:53 +02:00
Skia
325da79e45 Add support for subscription typed products in eboutic 2016-08-29 03:02:13 +02:00
Skia
dfb13c37f2 Add INSERT to old DB for subscriptions and users 2016-08-29 02:19:29 +02:00
Skia
e61b5e7690 Small fixes 2016-08-29 01:31:58 +02:00
Skia
3e0b964e9b Small AnonymousUser fix (le gaulois) 2016-08-26 21:09:32 +02:00
Skia
9927310f6e Update login system to support the multiple threads of UWSGI 2016-08-26 20:56:16 +02:00
Skia
bea7b71f2c Delete unwanted obsolete migration files 2016-08-24 22:10:58 +02:00
Skia
4f67bf4c04 Reset all migrations and migrate companies 2016-08-24 22:09:23 +02:00
Skia
fb8e7ceb5b Some templating and migration fix 2016-08-24 21:49:46 +02:00
Skia
078b63d970 Migrate accounting 2016-08-24 19:50:22 +02:00
Skia
a4df1ae9a5 Add language chooser 2016-08-24 19:11:09 +02:00
Skia
f2c3c7dc25 Add viewable flag for user 2016-08-22 18:44:03 +02:00
Skia
eef5dfd275 Make JPEG progressive when resizing 2016-08-22 14:21:17 +02:00
Skia
8e3eb1e2bf Some templating and add webcam support for profile editing 2016-08-22 02:56:27 +02:00
Skia
4cbfd58660 Add pictures to products 2016-08-21 03:07:15 +02:00
Skia
a49d9850ab Pimp the counter click view 2016-08-21 02:30:49 +02:00
Skia
7797f87dd0 Clean up some useless prints 2016-08-20 22:15:54 +02:00
Skia
dbf0653baf Add support for product buying groups + many cosmetics and form pimping 2016-08-20 22:12:46 +02:00
Skia
62745e89fa User profile template fix 2016-08-20 13:57:27 +02:00
Skia
84efcd87e7 Translate datepicker and add age limit to products 2016-08-20 02:55:48 +02:00
Skia
7e90e657a7 Add ajax-select app and improve some templates 2016-08-19 23:24:23 +02:00
Skia
da96e9da84 Search improvement 2016-08-19 03:12:20 +02:00
Skia
f1105d704e Add basic search bar 2016-08-19 02:53:44 +02:00
Skia
0689f864d2 Migrate permanencies and add user stats view 2016-08-18 21:32:18 +02:00
Skia
b69c3a6792 Improve and fix user accounts 2016-08-18 21:06:10 +02:00
Skia
05bd177a9d Migrate invoices and lot of eboutic improvements 2016-08-18 19:52:20 +02:00
Skia
84364d9018 Improve counter app and migrate products/producttypes/refillings/sellings 2016-08-18 03:04:50 +02:00
Skia
d4f87e7581 Improve file popup 2016-08-15 21:04:06 +02:00
Skia
66fdf6cbf7 Migrate and improve subscriptions 2016-08-14 19:28:14 +02:00
Skia
e1474c7a74 Add is_root property to user 2016-08-14 04:35:08 +02:00
Skia
792563999b Allow root to reset user password 2016-08-13 17:15:45 +02:00
Skia
a033c4dfd2 Improve launderette rights to match with launderette club 2016-08-13 16:39:09 +02:00
Skia
4ec328556e Migrate clubs 2016-08-13 16:08:22 +02:00
Skia
c0a66f9a38 Finish profile of users 2016-08-13 05:33:09 +02:00
Skia
5113d8fda5 Small user profile fix 2016-08-11 04:57:07 +02:00
Skia
43b709bfd5 Make file modale chooser and complete user profile 2016-08-11 04:30:24 +02:00
Skia
a8858fa781 Add home for users and clubs 2016-08-10 16:23:12 +02:00
Skia
830c15a585 Better right handling in files 2016-08-10 14:48:18 +02:00
Skia
1775569ecf Reset all migrations 2016-08-10 13:52:57 +02:00
Skia
792d66da33 Add nice whole file support 2016-08-10 05:48:06 +02:00
klmp200
feb7b4689b First steps with the api 2016-08-07 20:45:06 +02:00
Skia
ad36c1c6f6 Better handle 403 with next argument 2016-08-07 20:36:06 +02:00
Skia
a0f7150c55 Update accounting to have a target 2016-08-07 20:10:50 +02:00
Skia
31ecb50c1d Move user account view into core 2016-08-05 09:52:19 +02:00
Skia
db712c86b8 Fix tests 2016-08-02 22:20:06 +02:00
Skia
7002139176 Finish the launderette click view 2016-08-02 00:32:55 +02:00
Skia
2cf39671e2 Make some more validation on the token click form 2016-08-01 19:59:22 +02:00
Skia
4d8e7b0875 Improve launderette, need to finish the click view 2016-08-01 16:36:16 +02:00
Skia
ba48adab6d Improve launderette plannings and admin part 2016-07-29 13:00:32 +02:00
Skia
a01fc63a82 Begin launderette 2016-07-28 20:05:56 +02:00
Skia
80f72df1de Add product type management views 2016-07-27 20:05:45 +02:00
Skia
f230fbc135 Add product management views 2016-07-27 17:23:02 +02:00
Skia
4e6b592911 Fix eboutic 2016-07-26 19:58:36 +02:00
Skia
c099f1c5d7 Make eboutic working 2016-07-26 18:28:36 +02:00
Skia
a0322fa931 Templating pages 2016-07-22 02:05:29 +02:00
Skia
f04cf9d4d4 Add basics of eboutic, still need to implement the ET API to get bank payment 2016-07-22 01:19:50 +02:00
Skia
1f3e186e27 Update counters and some views 2016-07-21 20:03:56 +02:00
Skia
724f3d8d6f Templates and views 2016-07-21 12:09:57 +02:00
Skia
28aa143f39 Improve Operation numbering in accounting 2016-07-20 18:48:18 +02:00
Skia
150147c69f Fix the removing of built in permissions for admin app 2016-07-20 16:34:18 +02:00
Skia
97ff4341a7 Translate most of the Sith 2016-07-19 19:03:16 +02:00
Skia
2147f6a468 Add permanencies tracking to counters 2016-07-18 13:22:50 +02:00
Skia
593050d9e2 Improve greatly the counter right management 2016-07-18 00:47:56 +02:00
Skia
e92a73dfb1 Add basic account view for user and refactor user tool bar 2016-07-17 12:38:02 +02:00
Skia
14595936e2 Some design 2016-07-17 11:37:52 +02:00
Skia
f600e174b1 CSS and templating, Sith begins to look nice 2016-07-16 16:35:45 +02:00
Skia
67114f51e1 Fix populate to work with Postgres 2016-07-14 17:51:26 +02:00
Skia
0eb203b18b Fix populate with subscriptions 2016-07-14 16:13:43 +02:00
Skia
0248bdf6d1 Update SubscriptionForm to allow creating user on the fly 2016-07-07 00:52:30 +02:00
Skia
5355492c76 Date of birth is no longer mandatory 2016-07-06 01:09:31 +02:00
Skia
e9544f2581 Update CanCreateView and fix accounting views in consequence 2016-06-24 21:07:59 +02:00
Skia
1396f2ca84 Improve accounting ease of use 2016-06-24 19:59:49 +02:00
Skia
d244618dd0 Improve accounting views 2016-06-22 13:19:35 +02:00
Skia
3023d6d744 Add CanCreateMixin, and add amount in journals 2016-06-20 15:47:26 +02:00
Skia
ffe2aec980 Implement barman prices and improve counter views 2016-06-01 01:33:20 +02:00
Skia
6c48b7c718 Add Selling and Refilling classes 2016-05-31 19:32:15 +02:00
Skia
356a2d2683 Refactor page handling 2016-05-31 13:00:52 +02:00
Skia
8da149c979 Some refactoring between accounting and counter 2016-05-31 13:00:52 +02:00
Skia
e75da927c3 Improve group views 2016-05-31 13:00:52 +02:00
Skia
27805640a1 Improve right handling for accounting 2016-05-09 11:49:01 +02:00
Skia
39661b8de7 Add new club view 2016-05-03 12:06:03 +02:00
Skia
6ef39257ee Fix user template 2016-05-03 09:01:54 +02:00