klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2026-07-17 12:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,224 Commits 18 Branches 0 Tags
b5ebf09fcba1adefb24c19ca39429db6b9a9feb9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
krophil d5c3dbf864 Add git introduction 2019-10-08 20:22:36 +02:00
krophil 18f464a49f small fix to follow python recommendations 2019-02-02 00:32:34 +01:00
krophil 8388f4ee65 Avoid error 500 when target is forgotten 2018-12-18 23:50:24 +01:00
krophil 09bde1bfdf Merge branch 'cotiz' into 'master' 
added 6 month free cotiz and changed compute_end

See merge request ae/Sith!156
 2018-09-01 18:42:13 +02:00
krophil 73bd8b0fd3 Merge branch 'revert-3c2f48b7' into 'master' 
Revert "Merge branch 'pere200' into 'master'"

See merge request ae/Sith!139
 2017-12-12 13:12:10 +01:00
krophil d2c278ba0e Revert "Merge branch 'pere200' into 'master'" 
This reverts merge request !138
 2017-12-12 13:01:09 +01:00
krophil 3c2f48b750 Merge branch 'pere200' into 'master' 
Pere200

See merge request ae/Sith!138
 2017-12-11 05:19:30 +01:00
krophil 93f430ac38 PERE 200 2017-12-11 05:11:23 +01:00
krophil 4af3239f4c fix can_buy in customer 2017-12-01 01:44:38 +01:00
krophil bb47ad97a3 Search field in Subscription admin area 2017-11-17 11:48:16 +01:00
krophil 33964e0bab Better way to check if a user is subscriber 2017-11-16 13:50:34 +01:00
krophilandSkia 0ba69da3b6 Fix AGAIN subscription display 2017-11-09 14:49:07 +01:00
krophil 846be54431 Merge branch 'teeshirt' into 'master' 
Add gift function

See merge request ae/Sith!129
 2017-11-06 00:55:28 +01:00
krophil f1a9344524 Fix external ressources 2017-11-05 13:27:58 +01:00
krophil 6113de33ec Add comment in product type 2017-10-25 23:02:46 +02:00
krophil 2bb510932b Fix date displaying in user_detail 2017-10-24 13:08:18 +02:00
krophil 5fb57e97f7 Add possibility to not link an operation 2017-10-22 22:29:36 +02:00
krophil 6c957e3ce4 Integrate external_res variable 2017-10-18 14:44:47 +02:00
krophil 3994a58a2f Add search form in admin 2017-10-11 00:01:24 +02:00
krophil 3104270675 Few changes in accounting design 2017-10-09 16:24:34 +02:00
krophil be958bca7e Small fix for logo in news 2017-10-06 12:00:12 +02:00
krophil c8c60b8b7d Few changes in design 2017-10-06 11:58:51 +02:00
krophil 3089b484d3 Enhanced news 2017-10-02 14:29:36 +02:00
krophil acbeb3d3c8 add font-awesome 2017-09-29 14:35:06 +02:00
krophil 56b5fa733b Small fixes on news 2017-09-18 16:28:11 +02:00
krophil a89109b4e8 Add translations and small fix 2017-09-17 15:04:30 +02:00
krophil d888a6b68a Add Twitter button 2017-09-12 19:20:12 +02:00
krophil a40c48a792 Add facebook button 2017-09-12 19:04:37 +02:00
krophil 2f912a197c Allow to subscribe before subscription end 2017-09-06 19:55:14 +02:00
krophil 97cdf0e9d8 Link to old site updated 2017-09-03 18:04:05 +02:00
krophil 9489b52304 Oups, I did it again... 2017-09-02 15:31:20 +02:00
krophil e71db5a997 Add translations 2017-09-02 15:22:50 +02:00
krophil 39ce14804a Add refillings list 2017-09-02 15:16:29 +02:00
krophil 63ae89b30a Add color palette creator 2017-09-02 13:41:29 +02:00
krophil 3be64d6a8f New subscription type for jewels 
New condition to consider floats in subscriptions
 2017-08-31 16:37:03 +02:00
krophil 94582a2d96 Free subscription for jewels 2017-08-31 16:18:28 +02:00
krophil 2bd1927e39 New Sponsors page 2017-08-31 14:11:18 +02:00
krophil b74600b3f3 Changing urls 2017-08-22 23:47:55 +02:00
krophil e785ad985f Add a new subscription for the Welcome Week 2017-08-21 21:06:05 +02:00
krophil 2ae4e36eea Add a nice favicon 2017-07-06 14:04:24 +02:00
krophil f8e0147bf5 Small fix on accounting permissions 2017-06-26 11:17:30 +02:00
krophil 7515e826f8 Remove ambiguity 2017-06-14 00:47:16 +02:00
krophil e08a8c4927 Fix import in trombi views 2017-06-13 11:45:17 +02:00
krophil 890943ea48 Fix trombi creation 2017-06-13 10:55:12 +02:00
krophil 9447de4468 fix merging 2017-06-13 10:49:11 +02:00
krophil 69c95cfd37 Format trombi 2017-06-13 10:22:41 +02:00
krophil 113c9e696b Format subscription 2017-06-13 10:07:57 +02:00
krophil cd46e099b6 Format sith 2017-06-13 10:04:13 +02:00
krophil e2311dcb71 Format sas 2017-06-13 10:04:13 +02:00
krophil 13ec91e7e5 Format launderette 2017-06-13 10:04:13 +02:00
krophil 6a43c2cef6 Format forum 2017-06-13 10:04:13 +02:00
krophil b3466237ca Format settings 2017-06-13 10:04:13 +02:00
krophil 4395d62cd8 Format eboutic 2017-06-13 10:04:13 +02:00
krophil d722efc40f Format counter 2017-06-13 10:04:13 +02:00
krophil e7de8b2aec Format core 2017-06-13 10:04:13 +02:00
krophil 4f4ea5dde9 Format com 2017-06-13 09:48:24 +02:00
krophil 73b2c9d4c5 Format club 2017-06-13 09:48:24 +02:00
krophil 544ff630a5 Format accounting 2017-06-13 09:48:24 +02:00
krophil 43b1d1f3b5 Fix operation form 2017-06-12 19:29:47 +02:00
krophil 8ba21b94dc add translations 2017-06-09 16:39:38 +02:00
krophil 0e171fbc8f add some validationErrors on OperationForm 2017-06-09 16:06:18 +02:00
krophil eb510e102c Test for click 2017-06-07 19:28:15 +02:00
krophil 0af72500c6 Add some tests on counter 2017-06-07 18:36:26 +02:00
krophil 1ebfcdedec fix topic creation 2017-06-02 10:55:50 +02:00
krophil d79416f80a fix date format in Trombi model 2017-05-11 13:25:51 +02:00
krophil 05d1f43b55 Few modifications in accordance with com 2017-05-10 15:32:50 +02:00
krophilandklmp200 2048f27d58 New temporary design 2017-05-10 10:49:34 +02:00
krophil 95d5907a3e Add translation 2017-05-10 10:37:49 +02:00
krophil 87c457498c Add small explanation in subscriptions 2017-05-10 10:32:30 +02:00
krophil 635702b58f color to hexa and change email for weekmail 2017-05-05 15:28:53 +02:00
krophil d7305488b6 Add new banner 2017-04-28 13:59:10 +02:00
krophil 7815796d8b New css for weekmail 2017-04-27 15:31:18 +02:00
krophil 553b33c313 Proposal for summary sending confirmation 2017-04-19 11:01:56 +02:00
krophil 5932aad9fa Improve journal removing 2017-03-12 20:33:17 +01:00
krophil 5f9ec9a2ab Merge branch 'Tresorerie' of https://ae-dev.utbm.fr/ae/Sith into Tresorerie 2017-03-12 20:22:52 +01:00
krophilandklmp200 8329a19cc2 fix permissions 2017-03-11 11:57:37 +01:00
krophilandklmp200 95775d3b9b adaptations for settings and deletion checked 2017-03-11 11:57:37 +01:00
krophilandklmp200 1acac17d7e Several modifications in accounting 2017-03-11 11:57:37 +01:00
krophilandklmp200 8133db804e fix permission for companies 2017-03-11 11:57:37 +01:00
krophilandklmp200 554929b4ec small fix in canViewList 2017-03-11 11:57:37 +01:00
krophil ebe76c83c7 fix permissions 2017-02-27 01:10:01 +01:00
krophil 9152688efd adaptations for settings and deletion checked 2017-02-26 18:04:58 +01:00
krophil c19e2d1cb0 Several modifications in accounting 2017-02-26 18:04:58 +01:00
krophil 346e07f0a8 fix permission for companies 2017-02-26 18:04:58 +01:00
krophil b3c2c79975 small fix in canViewList 2017-02-26 18:04:58 +01:00
krophil 6f48b4a2b0 small fix in pdf generation for operations 2017-01-20 16:00:02 +01:00
krophil 41b5be1fba Add CR 01.05 2017-01-07 17:39:47 +01:00
krophil 4a5d789d9f partners banner added 2017-01-07 17:39:21 +01:00
krophil 83938a69dd add CR 2017-01-05 19:44:11 +01:00
krophil 16979aa3c1 tests for accounting 2016-12-25 12:09:32 +01:00
krophil 493148f761 new tests for operations 2016-12-24 16:16:14 +01:00
krophil f7b4258f20 populate updated 2016-12-24 16:16:14 +01:00
krophil 418537bc8e tests for accounting added 2016-12-24 16:16:14 +01:00
krophilandSkia 6d756423d9 tabs added 2016-12-21 05:19:16 +01:00
krophilandSkia 93211d8ada operations added in populate 2016-12-21 05:19:16 +01:00
krophilandSkia 1457a7bf74 Bilan for accounting added 2016-12-21 05:19:16 +01:00
krophilandSkia 96c6bf8067 bilan added 2016-12-21 05:19:16 +01:00
krophilandSkia 5cd64fb384 bilan in development 2016-12-21 05:19:16 +01:00
krophilandSkia 6bb1e0e418 person bilan added and renamed classes 2016-12-21 05:19:16 +01:00
krophilandSkia 147287f9a9 Now, I understand how ORM works... or not 2016-12-21 05:19:16 +01:00