klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-12-23 16:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,716 Commits 24 Branches 0 Tags 113 MiB
b8430adc50
Commit Graph

489 Commits

Author SHA1 Message Date
klmp200
ee7fd1c423 Rename temporary_design 2017-05-10 10:49:34 +02:00
Krophil
2048f27d58 New temporary design 2017-05-10 10:49:34 +02:00
Skia
20deda8a8e Merge branch 'master' into stock 2017-04-24 18:07:25 +02:00
Skia
3aa5070a38 Add preview button in the Forum 2017-04-12 19:26:27 +02:00
Skia
39b32d456c Some com templates improvments and reordering some models 2017-03-24 09:19:15 +01:00
Skia
e56b2476b7 Fix notifications local time 2017-03-17 18:11:30 +01:00
klmp200
95f984824a Fix accents in wiki page name and allow to delete a page 2017-03-08 14:11:56 +01:00
Skia
d6b5db4a4b Sanitize page name 2017-02-24 04:36:36 +01:00
Skia
59dfcbd567 Merge branch 'forum' into 'master' 
Forum

See merge request !49
 2017-02-24 03:08:07 +01:00
Skia
dea234f98a Change is_subscriber and was_subscriber to cached_properties 2017-02-24 02:59:59 +01:00
Skia
5897318cc6 Fix user picture view with Jinja update 2017-02-24 01:52:26 +01:00
Skia
ea52462217 Add Forum 2017-01-21 03:42:06 +01:00
Skia
147809bb5d Some great weekmail improvements 2017-01-15 22:58:38 +01:00
Skia
83555a3640 Add preferences and improve weekmail 2017-01-15 22:58:38 +01:00
Skia
176b1bf588 Fix QuickNotifMixin 2017-01-15 22:58:37 +01:00
Skia
0aef7656b8 Add quick notifications prototype 2017-01-15 22:58:37 +01:00
guillaume-renaud
0660ea5e64 MAJ translations ; stock acces addition in user tool 2017-01-05 11:15:04 +01:00
klmp200
3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
klmp200
4f62863599 Pimp role and list forms and add edit for election 2016-12-25 19:54:10 +01:00
klmp200
c604282b77 Nice display for elections 2016-12-25 19:52:14 +01:00
Skia
1dc1a0a42c Add news moderation tool 2016-12-23 18:40:37 +01:00
Skia
168622a04d Add com app with first parametric texts 2016-12-21 02:38:21 +01:00
Skia
5b95299bde Add Whoosh index 2016-12-20 14:46:08 +01:00
Krophil
c372b22197 Management for companies added 2016-12-20 12:29:13 +01:00
Skia
68517a5d33 Merge branch 'Tresorerie' into 'master' 
Separate counter for account refounding

See merge request !28
 2016-12-19 16:50:44 +01:00
Skia
94e740fb04 Small improvement in file prop view 2016-12-18 17:59:08 +01:00
Skia
8de0d54940 Allow to delete a launderette slot 2016-12-15 16:11:43 +01:00
klmp200
e231c612c6 Separate counter for account refounding 2016-12-15 11:46:36 +01:00
Skia
e3c86c1d05 Add "Mark all as read" 2016-12-13 17:53:44 +01:00
Skia
f594a99751 Clean up, fix, and improve templates around clipboard 2016-12-13 01:24:23 +01:00
Skia
0859648bd4 Add cut/paste function in files 2016-12-13 00:45:38 +01:00
Skia
28431ec9be Big refactor: remove Subscriber class 2016-12-10 01:58:30 +01:00
Skia
0d4b697079 Refactor group settings 2016-12-10 01:29:56 +01:00
Skia
d92a706920 Refactor notifications 2016-12-10 00:06:17 +01:00
Skia
80fa99d2ac Add notification 2016-12-08 19:47:28 +01:00
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
klmp200
3c8a4f068e Refound Account 2016-11-30 08:19:52 +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
cfbb6f4e1f Lot of small improvement in SAS 2016-11-25 13:47:09 +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
71d22e367b Add picture view to users 2016-11-23 11:46:45 +01:00
Skia
b619619b85 Improve moderation tool in SAS 2016-11-23 11:46:45 +01:00
Skia
d554a5ee8d Begin SAS 2016-11-23 11:38:01 +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
klmp200
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01: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
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +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
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +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
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
Skia
ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +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
324bd69312 Small templates fixes 2016-09-20 20:38:12 +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
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
klmp200
41d5a02d77 Fixed account order and detail account view 2016-09-08 03:38:28 +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
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
Skia
c5fd9d0076 Small template fixes 2016-09-02 19:31:47 +02:00
Skia
d27f62dca9 Small fixes 2016-09-01 16:43:21 +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
0db7180d43 Do some user profile templating 2016-08-31 04:04:28 +02:00
Skia
4a29a431af Display user amount without the account page 2016-08-31 03:25:26 +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
e61b5e7690 Small fixes 2016-08-29 01:31:58 +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
8e3eb1e2bf Some templating and add webcam support for profile editing 2016-08-22 02:56:27 +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
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
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
792d66da33 Add nice whole file support 2016-08-10 05:48:06 +02:00
Skia
ad36c1c6f6 Better handle 403 with next argument 2016-08-07 20:36:06 +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
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
a0322fa931 Templating pages 2016-07-22 02:05:29 +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
97ff4341a7 Translate most of the Sith 2016-07-19 19:03:16 +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
1396f2ca84 Improve accounting ease of use 2016-06-24 19:59:49 +02:00
Skia
356a2d2683 Refactor page handling 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
6ef39257ee Fix user template 2016-05-03 09:01:54 +02:00
Skia
6e05207e84 "Finish" the accounting views 2016-05-03 08:50:54 +02:00
Skia
52153438ac Rename and refactor some settings 2016-03-31 10:36:00 +02:00
Skia
debba55350 Add MetaGroup system 2016-03-29 12:45:10 +02:00
Skia
5bcc94f992 Improve counters views 2016-03-29 10:30:48 +02:00
Skia
21f1393097 Add basic counter model 2016-03-28 14:54:35 +02:00
Skia
c3fb581f97 Refactor a bit right handling 2016-03-22 17:46:26 +01:00
Skia
2e84ee7d4f Fix subscription and improve views 2016-03-22 11:42:00 +01:00
Skia
d51ab088d8 Add first club views, this still sucks, particularly on the right managment 2016-02-02 16:34:36 +01:00
Skia
afc87888a6 Finish the move to Jinja2 2016-02-02 11:00:08 +01:00
Skia
03bc0973fe WIP: Move to Jinja2 2016-02-01 17:35:55 +01:00
Skia
1f4c49ac49 Make a previsualization button in page edit 2016-01-11 09:56:42 +01:00
Skia
771056d6e4 Add a begining of API and CSS+JS (static files folder) 2016-01-08 17:11:38 +01:00
Skia
8ebd6c64a7 Add Markdown support and better url tolerance for pages 2016-01-08 16:15:06 +01:00
Skia
268a33255b Refactor user groups to user prop 2015-12-09 11:01:11 +01:00
Skia
77803596fb Add class wide permissions and clean up migrations 2015-12-09 10:33:55 +01:00
Skia
e3cbe70319 WIP: Improve many views and a bit user permissions (idea for class scale perm) 2015-12-08 17:22:50 +01:00
Skia
475bff14cb Refactor rights handling 2015-12-08 11:10:29 +01:00
Skia
aa732a4ec0 WIP: Add custom 403 and 404, but break a bit the permissions! To be fixed 2015-12-07 17:23:52 +01:00
Skia
92f68f5b42 Add complete revision and history handling in the wiki 2015-12-02 11:09:50 +01:00
Skia
b19ec084b6 Basic group view and permissions management on the pages 2015-11-26 17:40:31 +01:00
Skia
48e3f88b87 Improve user views 2015-11-26 16:32:56 +01:00
Skia
385f91a9db Add a missing template 2015-11-26 11:27:52 +01:00
Skia
431b81cd42 Make all the lost password procedure 2015-11-26 10:57:26 +01:00
Skia
6e54fa075e WIP: password change/reset forms 2015-11-25 17:03:18 +01:00
Skia
04bbf0db5b Refactor login and logout with built-in views 2015-11-25 16:20:28 +01:00
Skia
b237cdbaae Refactor page view with Django's black magic powered DetailView&co 2015-11-25 14:45:18 +01:00
Skia
ebcdcf4245 Basic user profile edit form 2015-11-24 15:52:27 +01:00
Skia
259182c1c4 Add page properties view 2015-11-24 14:01:10 +01:00
Skia
d2005ff997 Almost working wiki before refactoring again 2015-11-23 17:23:37 +01:00
Skia
ace66bba0a Almost working wiki before refactoring 2015-11-23 13:30:30 +01:00
Skia
6253c06235 Add very basic and not safe pages 2015-11-20 15:47:01 +01:00
Skia
7a65215bb5 Basic user permissions for user editing 2015-11-19 16:33:40 +01:00
Skia
d3896ad676 Update login system and add tests 2015-11-19 14:44:48 +01:00
Skia
5ee2baedba Add registering tests 2015-11-19 11:23:08 +01:00
Skia
898490324a Basic user profile 2015-11-19 09:46:05 +01:00
Skia
619e27eb52 Basic auth system 2015-11-18 17:09:06 +01:00
Skia
5bd40b2ec4 First commit: basic users 2015-11-18 09:44:06 +01:00