klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-07-03 11:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
516 Commits 14 Branches 0 Tags 113 MiB
f594a99751
Commit Graph

301 Commits

Author SHA1 Message Date
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
Skia
6e05207e84 "Finish" the accounting views 2016-05-03 08:50:54 +02:00
Skia
9c0b17a9ae Fix custom special views 403,404 to return the right HTTP code 2016-05-02 11:33:38 +02:00
Skia
b4c3f2f4dc Fix tests 2016-04-20 03:30:49 +02:00
Skia
c6a3559bf5 Improve accounting model according to current site's one 2016-04-20 02:07:01 +02:00
Skia
20a97526d4 Make counter login forms 2016-04-12 10:00:47 +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
7d7652e319 Small fix (le gaulois) 2016-03-24 11:55:39 +01: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
0dba76e02e Make some tests for clubs 2016-03-22 09:01:24 +01:00
Skia
fe8f5bb2e3 Fix club rights 2016-03-15 18:26:03 +01:00
Skia
e2b0668ee8 Improve Club views 2016-02-08 17:09:52 +01:00
Skia
a14d940db2 Some refactoring and misc improvements 2016-02-05 16:59:42 +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
239133e355 Fix generate_username for accents 2016-02-02 10:59:00 +01:00
Skia
6b81210ba1 Fix permissions Mixins 2016-02-02 10:15:50 +01:00
Skia
03bc0973fe WIP: Move to Jinja2 2016-02-01 17:35:55 +01:00
Skia
abb8dc0c5e Add Subscription to setup 2016-02-01 09:55:23 +01:00
Skia
4322318c31 Club model implementation, various other changes 2016-01-29 15:20:00 +01:00
Skia
8fc360a977 Improve subscription and add it to admin app 2016-01-28 17:42:22 +01:00
Skia
f71ce2f7df Add first accounting implementation 2016-01-28 16:53:37 +01:00
Skia
2b999d87ba Another date field update 2016-01-28 10:13:45 +01:00
Skia
367fddbdab Alter date_of_birth 2016-01-28 09:36:24 +01:00
Skia
8ea1727475 Fix URLs 2016-01-11 10:13:30 +01:00
Skia
8b0939ca79 Core: rename full_name in _full_name because this attribute is for internal use only 2016-01-11 10:02:41 +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
f5b07887a5 Fix typo in setup 2016-01-08 16:27:59 +01:00
Skia
8ebd6c64a7 Add Markdown support and better url tolerance for pages 2016-01-08 16:15:06 +01:00
Skia
a6aac76d75 Alter date_join field in User 2015-12-15 09:27:50 +01:00