1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Commit Graph

1916 Commits

Author SHA1 Message Date
Sylvain
e4b2b1ca7f New translations mails.en.yml (German) 2021-01-16 22:19:35 +01:00
Sylvain
e5e9c5d025 New translations mails.en.yml (German) 2021-01-16 22:08:30 +01:00
Sylvain
a8cdb2986f New translations mails.en.yml (German) 2021-01-16 21:58:23 +01:00
Sylvain
f67e12ccea New translations mails.en.yml (German) 2021-01-16 21:49:13 +01:00
Sylvain
615d3dcc49 New translations mails.en.yml (German) 2021-01-16 21:38:17 +01:00
Sylvain
4026b31591 New translations mails.en.yml (German) 2021-01-16 21:29:09 +01:00
Sylvain
c4ee96fd4b New translations devise.en.yml (German) 2021-01-15 20:10:47 +01:00
Sylvain
b69e78414f New translations devise.en.yml (German) 2021-01-15 19:59:34 +01:00
Sylvain
738ae0e1c6 New translations devise.en.yml (German) 2021-01-15 19:50:25 +01:00
Sylvain
4353ab41e0 New translations devise.en.yml (German) 2021-01-15 19:40:21 +01:00
Sylvain
fdb987ebd1 New translations en.yml (German) 2021-01-15 19:40:19 +01:00
Sylvain
2f25319d32 New translations en.yml (German) 2021-01-15 19:29:51 +01:00
Sylvain
dd13f18c31 New translations en.yml (German) 2021-01-15 19:19:08 +01:00
Sylvain
60d4295fd7 New translations en.yml (German) 2021-01-15 19:12:39 +01:00
Sylvain
26f723d565 New translations en.yml (German) 2021-01-15 19:03:00 +01:00
Sylvain
bfc68d67a0 New translations en.yml (German) 2021-01-15 18:50:38 +01:00
Sylvain
f476f46f57 New translations en.yml (German) 2021-01-15 18:40:50 +01:00
Sylvain
8110b8d6d4 New translations en.yml (German) 2021-01-15 18:32:44 +01:00
Sylvain
17d6b247c1 New translations en.yml (German) 2021-01-15 18:24:00 +01:00
Sylvain
3f44721120 New translations app.public.en.yml (German) 2021-01-15 08:50:34 +01:00
Sylvain
eafaa15b16 New translations app.shared.en.yml (German) 2021-01-15 08:43:17 +01:00
Sylvain
06d6ce7d35 New translations app.public.en.yml (German) 2021-01-15 08:43:15 +01:00
Sylvain
bf1570b4b3 New translations app.public.en.yml (German) 2021-01-15 08:31:46 +01:00
Sylvain
638c2a5f89 New translations mails.en.yml (German) 2021-01-15 08:31:44 +01:00
Sylvain
ec9a0d189c New translations mails.en.yml (German) 2021-01-15 08:21:37 +01:00
Sylvain
ab790d7749 New translations app.shared.en.yml (German) 2021-01-14 23:20:55 +01:00
Sylvain
ac2b3867ac New translations app.logged.en.yml (German) 2021-01-14 23:20:53 +01:00
Sylvain
21fd02a99a New translations app.shared.en.yml (German) 2021-01-14 23:09:01 +01:00
Sylvain
17ae644ca9 New translations app.public.en.yml (German) 2021-01-14 23:08:58 +01:00
Sylvain
06f9d863e5 New translations app.shared.en.yml (German) 2021-01-14 23:01:32 +01:00
Sylvain
0e8fd19a01 New translations app.public.en.yml (German) 2021-01-14 23:01:30 +01:00
Sylvain
e52bbd6e96 New translations app.logged.en.yml (German) 2021-01-14 23:01:28 +01:00
Sylvain
52803760ab New translations app.admin.en.yml (German) 2021-01-14 23:01:26 +01:00
Sylvain
8cc428c347 New translations app.shared.en.yml (German) 2021-01-14 22:49:15 +01:00
Sylvain
5b9591149e New translations app.public.en.yml (German) 2021-01-14 22:49:13 +01:00
Sylvain
8568a43f74 New translations app.public.en.yml (German) 2021-01-14 22:40:19 +01:00
Sylvain
cc22e61b10 New translations app.shared.en.yml (German) 2021-01-14 22:30:10 +01:00
Sylvain
cab60499ce New translations app.admin.en.yml (German) 2021-01-14 22:30:08 +01:00
Sylvain
30b5d04d7b New translations app.shared.en.yml (German) 2021-01-14 22:22:17 +01:00
Sylvain
405f467d1d New translations app.public.en.yml (German) 2021-01-14 22:22:15 +01:00
Sylvain
ccfa59f09d New translations app.admin.en.yml (German) 2021-01-14 22:22:13 +01:00
Sylvain
2529ae6f1d New translations app.public.en.yml (German) 2021-01-14 22:12:17 +01:00
Sylvain
d80b6819a1 New translations app.logged.en.yml (German) 2021-01-14 22:12:16 +01:00
Sylvain
ce0bc469d6 New translations en.yml (German) 2021-01-14 22:12:14 +01:00
Sylvain
08055f1b9c New translations app.shared.en.yml (German) 2021-01-14 22:03:58 +01:00
Sylvain
4984a2cc3a New translations app.public.en.yml (German) 2021-01-14 22:03:56 +01:00
Sylvain
b854b4f9e6 New translations app.public.en.yml (German) 2021-01-14 21:49:56 +01:00
Sylvain
f3611cf556 New translations app.public.en.yml (German) 2021-01-14 21:40:06 +01:00
Sylvain
94dc841367 New translations en.yml (German) 2021-01-14 18:51:40 +01:00
Sylvain
4c1b4637c0 New translations app.admin.en.yml (German) 2021-01-14 18:45:24 +01:00
Sylvain
e06d3e322b New translations en.yml (German) 2021-01-14 18:45:22 +01:00
Sylvain
fcde4aaec0 New translations en.yml (German) 2021-01-14 18:31:09 +01:00
Sylvain
5b64b2363f New translations en.yml (German) 2021-01-14 18:22:17 +01:00
Sylvain
7f68309dfd New translations en.yml (German) 2021-01-14 18:00:09 +01:00
Sylvain
44c75a1617 New translations en.yml (German) 2021-01-14 17:48:49 +01:00
Sylvain
e6bb748a95 New translations en.yml (German) 2021-01-14 17:40:08 +01:00
Sylvain
ea2aa88b7a New translations en.yml (German) 2021-01-14 17:28:43 +01:00
Sylvain
815f0a1572 New translations app.shared.en.yml (German) 2021-01-14 16:13:30 +01:00
Sylvain
96de83b3b5 New translations en.yml (German) 2021-01-14 16:13:28 +01:00
Sylvain
96622b6dc9 New translations app.shared.en.yml (German) 2021-01-14 16:02:01 +01:00
Sylvain
1494c5744f New translations app.public.en.yml (German) 2021-01-14 16:01:59 +01:00
Sylvain
4c4aed36df New translations app.logged.en.yml (German) 2021-01-14 16:01:57 +01:00
Sylvain
6b63561bd0 New translations app.admin.en.yml (German) 2021-01-14 16:01:55 +01:00
Sylvain
df4980cc15 New translations en.yml (German) 2021-01-14 16:01:53 +01:00
Sylvain
cf85b72d51 New translations app.shared.en.yml (German) 2021-01-14 14:37:01 +01:00
Sylvain
6885339fc0 New translations app.public.en.yml (German) 2021-01-14 14:36:58 +01:00
Sylvain
5dcec2d5ff New translations app.logged.en.yml (German) 2021-01-14 14:36:56 +01:00
Sylvain
dc8dca97c1 New translations app.admin.en.yml (German) 2021-01-14 14:36:54 +01:00
Sylvain
224c9bda3b New translations mails.en.yml (German) 2021-01-14 14:36:52 +01:00
Sylvain
4cc5b44071 New translations devise.en.yml (German) 2021-01-14 14:36:51 +01:00
Sylvain
c7bc328aa0 New translations en.yml (German) 2021-01-14 14:36:49 +01:00
Sylvain
12e99f4c9c generate payment schedule pdf 2021-01-04 18:12:44 +01:00
Sylvain
728ae4310c improved testing of payment schedules + some fixes
TODO: fix the test
rails test test/integration/reservations/create_test.rb
Reservations::CreateTest#test_user_reserves_a_machine_and_renew_a_subscription_with_payment_schedule_and_coupon_and_wallet [test/integration/reservations/create_test.rb:841]
Minitest::Assertion: Expected: "stripe"
  Actual: nil
2020-12-30 18:43:33 +01:00
Sylvain
dc00df4afc fix stripe subscription w/ coupon + wallet 2020-12-30 12:19:33 +01:00
Sylvain
ffc3051444 TODO: handle coupon w/ stripe subscription 2020-12-29 19:08:43 +01:00
Sylvain
609d19e5d1 refactored subscription process + renew (update) subscription/ offre free days 2020-12-21 16:12:34 +01:00
Sylvain
2950eddb07 Updated environment documentation + removed unused rails.*.yml 2020-12-21 10:15:59 +01:00
Sylvain
c3c881d2a8 process the schedule to the stripe subscription
- only for subscriptions for now
- TODO: reservations (see app/services/reservations/reserv.rb:13)
2020-12-09 16:47:51 +01:00
Sylvain
1d64c517c9 create stripe's paymentIntent
associate the paymentMethod (the card) with the customer (the user)
for futur usages in subscriptions
2020-12-08 12:26:03 +01:00
Sylvain
7ed0f6141a Merge branch 'dev' into monthly-payment 2020-12-07 10:29:34 +01:00
Sylvain
17907061db New translations app.admin.en.yml (Portuguese) 2020-11-26 00:01:37 +01:00
Sylvain
b72a1991d6 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:51:43 +01:00
Sylvain
9813bef907 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:38:20 +01:00
Sylvain
8fe3ab8d36 New translations app.admin.en.yml (Portuguese) 2020-11-25 23:21:36 +01:00
Sylvain
4e556696cf New translations app.admin.en.yml (Portuguese) 2020-11-25 22:52:55 +01:00
Sylvain
7b88f870c7 New translations app.admin.en.yml (Portuguese) 2020-11-25 22:42:27 +01:00
Sylvain
108206c527 New translations app.admin.en.yml (Portuguese) 2020-11-25 22:32:43 +01:00
Sylvain
04c20cf046 New translations app.public.en.yml (Portuguese) 2020-11-25 22:32:41 +01:00
Sylvain
d18d58b9bf New translations app.public.en.yml (Portuguese) 2020-11-25 22:24:48 +01:00
Sylvain
bf62425c4e New translations app.shared.en.yml (Portuguese) 2020-11-25 22:18:15 +01:00
Sylvain
65e4a62c12 New translations app.public.en.yml (Portuguese) 2020-11-25 22:18:13 +01:00
Sylvain
5cd7a2ad06 New translations app.shared.en.yml (Portuguese) 2020-11-25 22:05:21 +01:00
Sylvain
2ab881d9b5 New translations devise.en.yml (Portuguese) 2020-11-25 22:05:19 +01:00
Sylvain
d9317a52d5 New translations en.yml (Portuguese) 2020-11-25 22:05:17 +01:00
Sylvain
298589fe1b New translations mails.en.yml (Portuguese) 2020-11-25 21:53:05 +01:00
Sylvain
cf86bd90dd New translations app.logged.en.yml (Portuguese) 2020-11-25 21:53:03 +01:00
Sylvain
17e8e27830 New translations app.public.en.yml (Portuguese) 2020-11-25 21:42:01 +01:00
Sylvain
2f6707b8ff New translations app.logged.en.yml (Portuguese) 2020-11-25 21:41:59 +01:00
Sylvain
f5709ef60e get stripe payment method 2020-11-25 17:13:45 +01:00
Sylvain
6abee0cea0 define payment method before validating schedule 2020-11-18 16:01:05 +01:00
Sylvain
a56112a47f using stripe api 2020-11-17 16:23:55 +01:00
Sylvain
678af0de1f using stripe api + improved ui + ui to configure schedules reference
TODO: as an admin, I can select if payment_method = (stripe || local)
2020-11-16 16:37:40 +01:00
Sylvain
a321771040 user consent about payment schedule 2020-11-10 09:51:13 +01:00
Sylvain
2af6c8b9cc style fix 2020-11-09 15:22:22 +01:00
Sylvain
0fe4f13110 component to display the payment schedule 2020-11-05 17:32:37 +01:00
Sylvain
7833b0924b add other cart items to the first schedule 2020-11-05 14:55:06 +01:00
Sylvain
2fc9fd4028 show subscription summary in cart payment modal 2020-11-05 09:57:38 +01:00
Sylvain
b0afa02f1d use cart directive on the plan subscription page
+ fix payment schedule compute
+ fix price for monthly-payments plans in plan-card
+ TODO: valid_reservation_modal.html
+ TODO: Stripe processing
2020-11-04 16:22:31 +01:00
Sylvain
21bd1312bc compute payment schedule + basic display 2020-11-03 16:50:11 +01:00
Sylvain
7084e88d2d display monthly price for compatible plans 2020-11-02 12:29:08 +01:00
Sylvain
4bdcb44e33 Merge branch 'dev' into monthly-payment 2020-10-29 15:53:38 +01:00
Sylvain
5ad7a317ab
Merge pull request #235 from sleede/l10n_dev
New Crowdin updates
2020-10-28 12:22:56 +01:00
Sylvain
d1f28900cb New translations app.public.en.yml (French) 2020-10-28 12:14:50 +01:00
Sylvain
9afd7842b8 New translations app.public.en.yml (French) 2020-10-28 12:13:29 +01:00
Sylvain
d9055bb7c5 New translations app.public.en.yml (Spanish) 2020-10-28 12:13:23 +01:00
Sylvain
42ef888f15 New translations app.public.en.yml (Portuguese) 2020-10-28 12:13:17 +01:00
Sylvain
cb205920a0 New translations app.public.en.yml (Zulu) 2020-10-28 12:13:08 +01:00
Sylvain
44525f9bad Merge branch 'dev' into monthly-payment 2020-10-28 09:53:28 +01:00
Sylvain
84fc81e618 Display a message when no plans are available 2020-10-28 09:53:11 +01:00
Sylvain
5f93e6d3be plan creation: set if it allows monthly payments 2020-10-27 13:06:37 +01:00
Sylvain
26c8453f4b New translations app.admin.en.yml (French) 2020-10-27 08:10:56 +01:00
Sylvain
3651164d56 New translations app.admin.en.yml (Zulu) 2020-10-26 16:59:33 +01:00
Sylvain
5acf3fa5a1 New translations app.admin.en.yml (French) 2020-10-26 16:59:31 +01:00
Sylvain
dc844bb10c Enlarged privacy policy display and edition zones 2020-10-26 16:52:05 +01:00
Sylvain
6b097e9ea4
Merge pull request #232 from sleede/l10n_dev
New Crowdin updates
2020-09-29 12:11:37 +02:00
Sylvain
29237e1592 New translations app.shared.en.yml (Spanish) 2020-09-29 12:11:05 +02:00
Sylvain
d536f1f39f New translations app.shared.en.yml (Portuguese) 2020-09-29 12:11:01 +02:00
Sylvain
93c157c38e New translations app.shared.en.yml (French) 2020-09-29 12:07:52 +02:00
Sylvain
93b65d63ea New translations app.admin.en.yml (French) 2020-09-29 12:07:45 +02:00
Sylvain
57b76d156b Alert before cancelling a reservation that credits will be lost 2020-09-29 12:03:13 +02:00
Sylvain
510af9d53b New translations app.shared.en.yml (French) 2020-09-29 12:02:30 +02:00
Sylvain
139af2c768 New translations app.admin.en.yml (Spanish) 2020-09-29 12:02:28 +02:00
Sylvain
2d86f4b8b0 New translations app.shared.en.yml (Spanish) 2020-09-29 12:02:24 +02:00
Sylvain
137286ea5b New translations app.admin.en.yml (Portuguese) 2020-09-29 12:02:22 +02:00
Sylvain
dda606e91e New translations app.admin.en.yml (French) 2020-09-29 12:02:18 +02:00
Sylvain
b84e569ab0 New translations app.shared.en.yml (Portuguese) 2020-09-29 12:02:16 +02:00
Sylvain
1462eccc9f New translations app.admin.en.yml (Zulu) 2020-09-29 12:02:06 +02:00
Sylvain
6d2b833ebd New translations app.shared.en.yml (Zulu) 2020-09-29 12:02:03 +02:00
Sylvain
13bc5334cc ability to configure until when the events are shown on the home page 2020-09-29 09:39:32 +02:00
Sylvain
84c47ceaa6
Merge pull request #231 from sleede/l10n_dev
New Crowdin updates
2020-09-23 15:44:24 +02:00
Sylvain
518e302385 New translations app.shared.en.yml (French) 2020-09-23 15:43:26 +02:00
Sylvain
cfb79b8c7e New translations app.shared.en.yml (Spanish) 2020-09-23 15:43:22 +02:00
Sylvain
fba08604b2 New translations app.shared.en.yml (Portuguese) 2020-09-23 15:43:18 +02:00
Sylvain
7a4d932a21 New translations app.shared.en.yml (Zulu) 2020-09-23 15:40:23 +02:00
Sylvain
35e85e3a30 New translations app.shared.en.yml (Portuguese) 2020-09-23 15:40:21 +02:00
Sylvain
6e8961fe2c New translations app.shared.en.yml (Spanish) 2020-09-23 15:40:16 +02:00
Sylvain
daa4026c1d New translations app.shared.en.yml (French) 2020-09-23 15:40:11 +02:00
Sylvain
8945dbfb39 [bug] unable to create a subscription plan for only one group 2020-09-23 15:28:20 +02:00
Sylvain
bb95376fc5 New translations app.public.en.yml (French) 2020-08-26 08:44:10 +02:00
Sylvain
9c78093e95 New translations app.admin.en.yml (French) 2020-08-26 08:44:08 +02:00
Sylvain
787353f4e2 New translations app.public.en.yml (Zulu) 2020-08-24 17:00:36 +02:00
Sylvain
330f93284e New translations app.admin.en.yml (French) 2020-08-24 17:00:34 +02:00
Sylvain
aedc29850e New translations app.public.en.yml (French) 2020-08-24 17:00:31 +02:00
Sylvain
279ec4e99e New translations app.public.en.yml (Spanish) 2020-08-24 17:00:25 +02:00
Sylvain
353c57b682 New translations app.public.en.yml (Portuguese) 2020-08-24 17:00:20 +02:00
Sylvain
e7f8dacfce New translations app.admin.en.yml (Zulu) 2020-08-24 17:00:17 +02:00
Sylvain
abd6979ec7 [bug] erroneous translations in english (#226) 2020-08-24 16:54:30 +02:00
Sylvain
c527ffaeae New translations app.logged.en.yml (Portuguese) 2020-08-17 22:39:24 +02:00
Sylvain
0a386ee4e2
Merge pull request #225 from sleede/l10n_dev
New Crowdin updates
2020-07-29 15:05:13 +02:00
Sylvain
18c82f2d1b New translations en.yml (French) 2020-07-29 14:40:21 +02:00
Sylvain
98cf40a93c New translations en.yml (Spanish) 2020-07-29 14:40:17 +02:00
Sylvain
7e2a409b94 New translations en.yml (Portuguese) 2020-07-29 14:40:14 +02:00
Sylvain
e2d701719d New translations en.yml (French) 2020-07-29 14:38:06 +02:00
Sylvain
94354dca82 New translations en.yml (Spanish) 2020-07-29 14:38:02 +02:00
Sylvain
e7e96a5289 New translations en.yml (Portuguese) 2020-07-29 14:37:57 +02:00
Sylvain
1e1658cd67 New translations en.yml (Zulu) 2020-07-29 14:37:50 +02:00
Sylvain
190e815f73 [bug] unable to export subscriptions 2020-07-22 12:33:35 +02:00
Sylvain
52ac637e27
Merge pull request #224 from sleede/l10n_dev
New Crowdin updates
2020-07-21 18:22:23 +02:00
Sylvain
3a9c221cec New translations en.yml (French) 2020-07-21 18:21:13 +02:00
Sylvain
c0de645f67 New translations en.yml (Spanish) 2020-07-21 18:21:09 +02:00
Sylvain
f0858ffa11 New translations en.yml (Portuguese) 2020-07-21 18:21:06 +02:00
Sylvain
9cd55b1a07 New translations en.yml (Spanish) 2020-07-21 18:19:33 +02:00
Sylvain
075f4a5c0b New translations en.yml (French) 2020-07-21 18:19:31 +02:00
Sylvain
346cbb570f New translations en.yml (Portuguese) 2020-07-21 18:19:27 +02:00
Sylvain
1fd70fb1da New translations en.yml (Zulu) 2020-07-21 18:19:23 +02:00
Sylvain
e5cef6e6bf [bug] unable to export reservations 2020-07-21 17:25:19 +02:00
Sylvain
3628b318bd
Merge pull request #220 from sleede/l10n_dev
New Crowdin updates
2020-06-24 11:45:47 +02:00
Sylvain
b7ba86456f New translations app.shared.en.yml (Spanish) 2020-06-24 11:43:47 +02:00
Sylvain
2875250f18 New translations app.shared.en.yml (Spanish) 2020-06-24 11:39:34 +02:00
Sylvain
5f45301a15 New translations app.shared.en.yml (Portuguese) 2020-06-24 11:37:40 +02:00
Sylvain
97133071e8 New translations app.public.en.yml (French) 2020-06-24 11:37:36 +02:00
Sylvain
a8cb9cbd89 New translations app.logged.en.yml (French) 2020-06-24 11:37:34 +02:00
Sylvain
0837d42036 New translations app.admin.en.yml (French) 2020-06-24 11:37:33 +02:00
Sylvain
8db77e4088 New translations mails.en.yml (French) 2020-06-24 11:37:31 +02:00
Sylvain
e066fc01fc New translations en.yml (French) 2020-06-24 11:37:29 +02:00
Sylvain
842d6c950f New translations app.shared.en.yml (French) 2020-06-24 11:19:57 +02:00
Sylvain
7b23861168 New translations app.admin.en.yml (French) 2020-06-24 11:19:53 +02:00
Sylvain
e7c12b3539 New translations app.shared.en.yml (Zulu) 2020-06-24 11:11:52 +02:00
Sylvain
6858ff496e New translations app.shared.en.yml (French) 2020-06-24 11:11:48 +02:00
Sylvain
d187c2a855 New translations app.shared.en.yml (Spanish) 2020-06-24 11:11:43 +02:00
Sylvain
d73c61a7b1 New translations app.shared.en.yml (Portuguese) 2020-06-24 11:11:39 +02:00
Sylvain
a3c6560833 wording 2020-06-24 11:11:14 +02:00
Sylvain
42cbf83074 New translations app.shared.en.yml (French) 2020-06-24 11:06:40 +02:00
Sylvain
02bb8ff0cb New translations app.shared.en.yml (Zulu) 2020-06-24 10:53:50 +02:00
Sylvain
6eb8de6149 New translations app.shared.en.yml (French) 2020-06-24 10:53:47 +02:00
Sylvain
003aac569e New translations app.shared.en.yml (Spanish) 2020-06-24 10:53:44 +02:00
Sylvain
8302a6b90f New translations app.shared.en.yml (Portuguese) 2020-06-24 10:53:41 +02:00
Sylvain
bafef4e5f1 corrected wording 2020-06-24 10:52:59 +02:00
Sylvain
c1ad0fd8fb New translations app.admin.en.yml (French) 2020-06-24 10:47:51 +02:00
Sylvain
3d3424da12 New translations app.admin.en.yml (French) 2020-06-17 15:52:16 +02:00
Sylvain
48126fe9d8 New translations app.shared.en.yml (French) 2020-06-17 15:52:12 +02:00
Sylvain
5bc9e1ca81 New translations app.admin.en.yml (Spanish) 2020-06-17 15:52:09 +02:00
Sylvain
0ad9d8fdbc New translations app.admin.en.yml (Portuguese) 2020-06-17 15:52:05 +02:00
Sylvain
857433b947 New translations app.admin.en.yml (Zulu) 2020-06-17 15:51:59 +02:00
Sylvain
40dd39304e enable/disable statistics module fomr the UI 2020-06-17 12:20:51 +02:00
Sylvain
d2b57b89b3
Merge pull request #219 from sleede/l10n_dev
New Crowdin updates
2020-06-16 17:19:20 +02:00
Sylvain
5d6ee4c49d New translations app.admin.en.yml (French) 2020-06-16 17:17:50 +02:00
Sylvain
1f296d2757 New translations app.admin.en.yml (French) 2020-06-16 17:16:28 +02:00
Sylvain
cd3410f9ba New translations app.public.en.yml (French) 2020-06-16 17:16:26 +02:00
Sylvain
9220d73b33 New translations en.yml (Spanish) 2020-06-16 17:16:24 +02:00
Sylvain
1e294c8c17 New translations app.admin.en.yml (Spanish) 2020-06-16 17:16:21 +02:00
Sylvain
0441bd9fc0 New translations app.public.en.yml (Spanish) 2020-06-16 17:16:17 +02:00
Sylvain
1d54e98f34 New translations en.yml (Portuguese) 2020-06-16 17:16:14 +02:00
Sylvain
642af991c4 New translations app.admin.en.yml (Portuguese) 2020-06-16 17:16:11 +02:00
Sylvain
9b1137d208 New translations app.public.en.yml (Portuguese) 2020-06-16 17:16:09 +02:00
Sylvain
9aee137931 New translations en.yml (French) 2020-06-16 17:16:03 +02:00
Sylvain
a7b494708c New translations app.admin.en.yml (French) 2020-06-16 17:05:44 +02:00
Sylvain
2e6de7cb18 New translations app.public.en.yml (French) 2020-06-16 17:05:41 +02:00
Sylvain
167b5247b7 New translations en.yml (Spanish) 2020-06-16 17:05:39 +02:00
Sylvain
d438cd32af New translations app.admin.en.yml (Spanish) 2020-06-16 17:05:36 +02:00
Sylvain
8db0479ac0 New translations app.public.en.yml (Spanish) 2020-06-16 17:05:32 +02:00
Sylvain
ecf14ca471 New translations en.yml (Portuguese) 2020-06-16 17:05:29 +02:00
Sylvain
f851ef0932 New translations app.admin.en.yml (Portuguese) 2020-06-16 17:05:26 +02:00
Sylvain
73b5de89bf New translations app.public.en.yml (Portuguese) 2020-06-16 17:05:24 +02:00
Sylvain
d6ab5250e4 New translations app.admin.en.yml (Zulu) 2020-06-16 17:05:19 +02:00
Sylvain
44a5505f1a New translations app.public.en.yml (Zulu) 2020-06-16 17:05:17 +02:00
Sylvain
895fab184e New translations en.yml (French) 2020-06-16 17:05:15 +02:00
Sylvain
a9cce243fb updated user's guide to 4.5 2020-06-16 16:47:38 +02:00
Sylvain
8611a2753b fix text 2020-06-16 12:31:27 +02:00
Sylvain
e7f458e22e
Merge branch 'dev' into l10n_dev 2020-06-16 10:57:04 +02:00
Sylvain
0b881c70b8 New translations app.admin.en.yml (Spanish) 2020-06-16 10:43:11 +02:00
Sylvain
94da18296b New translations app.admin.en.yml (French) 2020-06-16 10:37:59 +02:00
Sylvain
6e14bb0d05 New translations app.admin.en.yml (French) 2020-06-16 10:35:40 +02:00
Sylvain
a3f8f4873c New translations app.admin.en.yml (Spanish) 2020-06-16 10:35:35 +02:00
Sylvain
c2b54116b1 New translations app.admin.en.yml (Portuguese) 2020-06-16 10:35:30 +02:00
Sylvain
59fca295ed New translations app.admin.en.yml (Zulu) 2020-06-16 10:35:24 +02:00
Sylvain
6bc2438348 fix translation key 2020-06-16 10:33:56 +02:00
Sylvain
130642152c New translations app.public.en.yml (French) 2020-06-16 10:18:38 +02:00
Sylvain
6552d19b2b New translations app.admin.en.yml (French) 2020-06-16 10:18:36 +02:00
Sylvain
59015241a0 New translations mails.en.yml (French) 2020-06-16 10:18:34 +02:00
Sylvain
7ec5944c1b New translations en.yml (French) 2020-06-16 10:18:33 +02:00
Sylvain
62e452a63f New translations app.admin.en.yml (French) 2020-06-16 10:11:35 +02:00
Sylvain
cad37e1c3f New translations app.admin.en.yml (French) 2020-06-16 10:01:50 +02:00
Sylvain
4393a19ce9 New translations mails.en.yml (French) 2020-06-15 18:12:35 +02:00
Sylvain
55c239f87f New translations app.admin.en.yml (French) 2020-06-15 18:12:33 +02:00
Sylvain
a6ede0c528 New translations app.public.en.yml (French) 2020-06-15 18:12:30 +02:00
Sylvain
87f898dccc New translations en.yml (Spanish) 2020-06-15 18:12:28 +02:00
Sylvain
3025f1298f New translations mails.en.yml (Spanish) 2020-06-15 18:12:24 +02:00
Sylvain
e8c30af1cd New translations app.admin.en.yml (Spanish) 2020-06-15 18:12:23 +02:00
Sylvain
99cb04060e New translations app.public.en.yml (Spanish) 2020-06-15 18:12:20 +02:00
Sylvain
734a221393 New translations en.yml (Portuguese) 2020-06-15 18:12:17 +02:00
Sylvain
c98b0988a6 New translations mails.en.yml (Portuguese) 2020-06-15 18:12:16 +02:00
Sylvain
3b4d0cea2c New translations app.admin.en.yml (Portuguese) 2020-06-15 18:12:14 +02:00
Sylvain
54499df779 New translations app.public.en.yml (Portuguese) 2020-06-15 18:12:10 +02:00
Sylvain
3e8808c4d3 New translations en.yml (Zulu) 2020-06-15 18:12:07 +02:00
Sylvain
9f0dfecc4d New translations mails.en.yml (Zulu) 2020-06-15 18:12:05 +02:00
Sylvain
49e0febe8b New translations app.admin.en.yml (Zulu) 2020-06-15 18:12:03 +02:00
Sylvain
4583e2e809 New translations app.public.en.yml (Zulu) 2020-06-15 18:12:01 +02:00
Sylvain
0b30f859e3 New translations en.yml (French) 2020-06-15 18:11:58 +02:00
Sylvain
be9ee9d25d complete features-tour for invoices page 2020-06-15 15:56:55 +02:00
Sylvain
dbbf306bf2 complete features-tour for projects page 2020-06-15 15:43:28 +02:00
Sylvain
6af5f51ff2 complete features-tour for settings page 2020-06-15 15:32:30 +02:00
Sylvain
24155bc009 ability to lock settings from the env vars 2020-06-15 13:20:48 +02:00
Sylvain
42872ab107 configure wallet from UI 2020-06-15 12:44:43 +02:00
Sylvain
f46c78a476 read email_confirmation_required from the UI 2020-06-15 11:57:13 +02:00
Sylvain
48bcf0b838 configure invoices prefix from the DB 2020-06-15 10:58:15 +02:00
Sylvain
78518e17fb read stripe_currency from the UI
We prevent the currency from being changed if any stripe payment was made, because a stripe user cannot made pay with different currencies. If we try to charge a user with a different currency than the currency he used for a previous payment, this will fail; so we must prevent this case
2020-06-10 16:37:11 +02:00
Sylvain
dbda82ac9b notify after members sync on stripe 2020-06-09 15:06:46 +02:00
Sylvain
a70668f52a sync members on stripe after keys update 2020-06-09 14:27:18 +02:00
Sylvain
d5939a9de5 set the stripe keys from the UI 2020-06-09 13:09:31 +02:00
Sylvain
06b5da9df8 configure online payment from the UI 2020-06-08 17:42:59 +02:00
Sylvain
b44a8da73b set openlab_default from the UI 2020-06-08 16:15:44 +02:00
Sylvain
88f2fb3749 secure the settings API (read) + read the openlab settings from the db 2020-06-08 15:08:07 +02:00
Sylvain
db8de18bd4 set openlab-projects id & secret from the UI 2020-06-08 11:38:49 +02:00
Sylvain
6af3f12917 use the db settings to validate mime types & extensions + fix texts + force lowercase 2020-06-03 17:56:39 +02:00
Sylvain
8f32eb92db interface to manage file extensions & mime types 2020-06-03 17:39:32 +02:00
Sylvain
5c152412db test mime type of a file
use marcel to test mime types
updated mimemagic
2020-06-03 16:25:13 +02:00
Sylvain
a5e1b77ce4 check the file content with mimemagic for project CAD files 2020-06-03 12:28:04 +02:00
Sylvain
45013be950 configure default_host & default_protocol from env
reverts 478a6c40 (partially) & b2434864
2020-06-02 18:29:24 +02:00
Sylvain
1a38a8750b updated carrierware + validate file upload in front 2020-06-02 17:57:24 +02:00
Sylvain
9a0f36c245 configure disqus_shortname from the UI 2020-06-01 18:31:43 +02:00
Sylvain
59cb17789c rename section project_elements to projects 2020-06-01 17:52:39 +02:00
Sylvain
478a6c409d define default_protocol & default_host from the UI + fix email_from + various minor fixes 2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26 configure default_mail_from from the UI 2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf configure the features tour display mode from the UI 2020-05-27 18:49:53 +02:00
Sylvain
0d211e2e31 configure google recaptcha from UI 2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080 configure twitter analytics from the UI 2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3 configure facebook_app_id from the UI 2020-05-27 12:29:51 +02:00
Sylvain
2d628d8826 disable the invoicing module from the UI config panel 2020-05-26 18:07:07 +02:00
Sylvain
537743a740 configure the plans module from the admin UI 2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce refactored app to gather spaces module status from the settings 2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d UI to configure the spaces module 2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6 configure events_in_calendar form the UI panel 2020-05-25 17:36:53 +02:00
Sylvain
57ceeec2e7 refactored settings/reservations/confidentiality section 2020-05-25 17:05:54 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a configuration of book concurrent slots through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
419605e551 configuration of google analytics tracking ID through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
4841027216 interface to collect the google analytics ID 2020-05-25 12:55:00 +02:00
Sylvain
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
af136cab71 New translations en.yml (French) 2020-05-18 09:14:27 +02:00
Sylvain
a79bcae9e1
Merge pull request #209 from sleede/l10n_dev
New Crowdin translations
2020-05-18 09:12:33 +02:00
Sylvain
39c6a6cc4d New translations en.yml (Portuguese) 2020-05-13 12:17:51 +02:00
Sylvain
3f35308ad5 New translations en.yml (Zulu) 2020-05-13 12:17:48 +02:00
Sylvain
c8121b78b9 New translations en.yml (Spanish) 2020-05-13 12:17:40 +02:00
Sylvain
a275fd462a New translations en.yml (French) 2020-05-13 12:17:30 +02:00
Sylvain
7e1edef8a0 [bug] when an admin logs on the subscription page, his view is broken
Also: Prevent admins from leaving their dedicated group
2020-05-13 08:37:49 +02:00
Sylvain
a78a91c583
Merge pull request #207 from sleede/l10n_dev
New Crowdin translations
2020-05-06 17:11:26 +02:00
Sylvain
2099e6cd98 New translations app.admin.en.yml (French) 2020-05-06 17:09:24 +02:00
Sylvain
c668583965 New translations app.shared.en.yml (French) 2020-05-06 17:09:17 +02:00
Sylvain
2ea976f16e New translations app.shared.en.yml (Zulu) 2020-05-06 17:00:56 +02:00
Sylvain
ae28ae896c New translations app.admin.en.yml (French) 2020-05-06 17:00:49 +02:00
Sylvain
20005278f7 New translations app.admin.en.yml (Spanish) 2020-05-06 17:00:47 +02:00
Sylvain
df51249155 New translations app.admin.en.yml (Portuguese) 2020-05-06 17:00:44 +02:00
Sylvain
b0ac7f54c6 New translations app.shared.en.yml (French) 2020-05-06 17:00:37 +02:00
Sylvain
41103a5b7c New translations app.shared.en.yml (Spanish) 2020-05-06 17:00:35 +02:00
Sylvain
ef6fd82941 New translations app.shared.en.yml (Portuguese) 2020-05-06 17:00:33 +02:00
Sylvain
9472febf39 New translations app.admin.en.yml (Zulu) 2020-05-06 17:00:32 +02:00
Sylvain
0a336f14e4 updated messages about prices 2020-05-06 16:55:26 +02:00
Sylvain
5f7287cec7 Ask for confirmation before booking a slot for a member without the required tag 2020-05-06 15:32:40 +02:00
Sylvain
6d0ed0bfb5 info box for current availabity in admin calendar 2020-05-05 16:19:46 +02:00
Sylvain
f1e0bce08b
Merge branch 'dev' into l10n_dev 2020-05-05 11:50:01 +02:00
Sylvain
49bfb7e725 New translations mails.en.yml (French) 2020-05-05 11:47:41 +02:00
Sylvain
eaada1fc9f New translations app.admin.en.yml (French) 2020-05-05 11:47:38 +02:00
Sylvain
330c4e95b5 New translations en.yml (Spanish) 2020-05-05 11:47:36 +02:00
Sylvain
51a4de289a New translations en.yml (French) 2020-05-05 11:47:29 +02:00
Sylvain
2c72d757bf New translations en.yml (Portuguese) 2020-05-05 11:38:06 +02:00
Sylvain
da3593c8b4 New translations en.yml (Zulu) 2020-05-05 11:38:05 +02:00
Sylvain
117139c819 New translations mails.en.yml (French) 2020-05-05 11:38:01 +02:00
Sylvain
c3acd235b9 New translations mails.en.yml (Spanish) 2020-05-05 11:38:00 +02:00
Sylvain
4320977ff7 New translations mails.en.yml (Portuguese) 2020-05-05 11:37:58 +02:00
Sylvain
a7e8a19921 New translations mails.en.yml (Zulu) 2020-05-05 11:37:56 +02:00
Sylvain
a610965a3c New translations app.admin.en.yml (French) 2020-05-05 11:37:55 +02:00
Sylvain
a48c3baace New translations app.admin.en.yml (Spanish) 2020-05-05 11:37:53 +02:00
Sylvain
a72f69fb29 New translations en.yml (Spanish) 2020-05-05 11:37:51 +02:00
Sylvain
413b6b0512 New translations app.admin.en.yml (Portuguese) 2020-05-05 11:37:49 +02:00
Sylvain
b299f53844 New translations app.public.en.yml (Spanish) 2020-05-05 11:37:45 +02:00
Sylvain
02dbb0e2b6 New translations app.admin.en.yml (Zulu) 2020-05-05 11:37:41 +02:00
Sylvain
e68cdba9f5 New translations en.yml (French) 2020-05-05 11:37:40 +02:00
Sylvain
03445e4793 New translations app.admin.en.yml (French) 2020-05-05 11:32:04 +02:00
Sylvain
a9d3a4cc97 New translations app.admin.en.yml (Spanish) 2020-05-05 11:32:02 +02:00
Sylvain
cc4b42a01b New translations app.admin.en.yml (Portuguese) 2020-05-05 11:32:00 +02:00
Sylvain
8600077dd9 New translations app.admin.en.yml (Zulu) 2020-05-05 11:31:59 +02:00
Sylvain
2ae03e3b27 New translations app.public.en.yml (Spanish) 2020-05-05 11:31:54 +02:00
Sylvain
aae56404b7 New translations app.public.en.yml (Portuguese) 2020-05-05 11:31:53 +02:00
Sylvain
2d8df2c1cd Ability to promote a user to a higher role (member > manager > admin) 2020-05-05 11:28:04 +02:00
Sylvain
881cc97e8d The invoices list displays the operator in case of offline payment 2020-05-04 10:56:27 +02:00
Sylvain
ad52f825fa
Merge branch 'dev' into l10n_dev 2020-04-29 17:12:51 +02:00
Sylvain
4566838965 New translations app.admin.en.yml (Spanish) 2020-04-29 17:07:21 +02:00
Sylvain
a58cf8a219 New translations app.admin.en.yml (Portuguese) 2020-04-29 17:07:20 +02:00
Sylvain
27438701eb New translations app.public.en.yml (Spanish) 2020-04-29 17:07:15 +02:00
Sylvain
6d11bfc57e New translations app.public.en.yml (Portuguese) 2020-04-29 17:07:14 +02:00
Sylvain
2b5f14ee0a New translations app.public.en.yml (French) 2020-04-29 16:55:26 +02:00
Sylvain
a6c5e5c2f3 New translations app.public.en.yml (French) 2020-04-29 16:54:10 +02:00
Sylvain
c19425f32e New translations app.public.en.yml (Spanish) 2020-04-29 16:54:08 +02:00
Sylvain
4d50f7270d New translations app.public.en.yml (Portuguese) 2020-04-29 16:54:06 +02:00
Sylvain
fae69d0a00 New translations app.public.en.yml (Zulu) 2020-04-29 16:54:05 +02:00
Sylvain
a4d8c893ab New translations app.admin.en.yml (French) 2020-04-29 16:53:56 +02:00
Sylvain
3bc8e69cf0 fix typo 2020-04-29 16:52:57 +02:00
Sylvain
c2e6be3de0 New translations app.admin.en.yml (French) 2020-04-29 16:33:30 +02:00
Sylvain
81e5395b12 New translations app.admin.en.yml (Spanish) 2020-04-29 16:33:29 +02:00
Sylvain
c4ff2772cd New translations app.admin.en.yml (Portuguese) 2020-04-29 16:33:26 +02:00
Sylvain
28b1c34658 New translations app.public.en.yml (French) 2020-04-29 16:33:22 +02:00
Sylvain
8a5742b0dc New translations app.public.en.yml (Spanish) 2020-04-29 16:33:20 +02:00
Sylvain
fb55213586 New translations app.public.en.yml (Portuguese) 2020-04-29 16:33:19 +02:00
Sylvain
ecd92e12c1 New translations app.public.en.yml (Zulu) 2020-04-29 16:33:17 +02:00
Sylvain
5f46865c1e New translations app.admin.en.yml (Zulu) 2020-04-29 16:33:13 +02:00
Sylvain
b97ff2ec5b improved feature tour for managers 2020-04-29 16:30:39 +02:00
Sylvain
ff9636e12f help tour for managers 2020-04-29 15:20:39 +02:00
Sylvain
68fd322398 managers: edit user/edit subscription 2020-04-29 11:11:57 +02:00
Sylvain
35ce577651 [bug] subscription page shows the groups without any active plans
[bug] cart price inconsistently updated after a subscription
[feature] plans page for managers
2020-04-29 10:57:32 +02:00
Sylvain
05479e043c [ongoing] plans interface for managers 2020-04-28 18:11:25 +02:00
Sylvain
6a8746b110 [bug] updating a setting without any changes triggers an error
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85 manager can create memebrs & credit wallets 2020-04-28 15:34:17 +02:00
Sylvain
e56fba1c03 [bug] Free entry label for events without reservation 2020-04-28 11:21:04 +02:00
Sylvain
c45c92e86a basic manager menu 2020-04-22 12:31:44 +02:00
Sylvain
91165d0432 Merge branch 'dev' into manager 2020-04-22 09:39:37 +02:00
Sylvain
0712db5cdf
Merge pull request #200 from sleede/l10n_dev
New Crowdin translations
2020-04-22 09:38:43 +02:00
Sylvain
02ce7a4fbf New translations app.shared.en.yml (Spanish) 2020-04-22 09:38:10 +02:00
Sylvain
d0e4aa91ee New translations app.admin.en.yml (French) 2020-04-22 09:32:03 +02:00
Sylvain
d0e6764f24 New translations app.shared.en.yml (French) 2020-04-22 09:32:00 +02:00
Sylvain
52b408647c New translations app.shared.en.yml (Portuguese) 2020-04-22 09:31:56 +02:00
Sylvain
2ca5c8c50f managers interface 2020-04-21 17:24:22 +02:00
Sylvain
c350c9bd17 New translations app.admin.en.yml (French) 2020-04-21 16:56:20 +02:00
Sylvain
d80f34f521 New translations app.admin.en.yml (Portuguese) 2020-04-21 16:56:17 +02:00
Sylvain
7c5a22c308 New translations app.admin.en.yml (Spanish) 2020-04-21 16:56:14 +02:00
Sylvain
c929e001fc New translations app.admin.en.yml (Zulu) 2020-04-21 16:56:11 +02:00
Sylvain
f88472eeb3 Interface to manage partners 2020-04-21 16:47:35 +02:00
Sylvain
dec628df93 New translations app.admin.en.yml (French) 2020-04-21 15:31:32 +02:00
Sylvain
23705e9df8 New translations app.admin.en.yml (Portuguese) 2020-04-21 15:31:28 +02:00
Sylvain
24c4713d4c New translations app.admin.en.yml (Spanish) 2020-04-21 15:31:24 +02:00
Sylvain
5d7ccf378c New translations app.admin.en.yml (Zulu) 2020-04-21 15:31:20 +02:00
Sylvain
d717ed704c adjust nb of slots per availability 2020-04-21 15:20:33 +02:00
Sylvain
91953d2ca1
Merge pull request #199 from sleede/l10n_dev
New Crowdin translations
2020-04-20 11:34:33 +02:00
Sylvain
bf49eef81a New translations app.admin.en.yml (Portuguese) 2020-04-20 11:07:41 +02:00
Sylvain
161d5ce9b4 New translations app.admin.en.yml (Portuguese) 2020-04-20 11:03:09 +02:00
Sylvain
943360a388 New translations app.admin.en.yml (Spanish) 2020-04-20 11:03:05 +02:00
Sylvain
874324eb8c New translations app.shared.en.yml (Portuguese) 2020-04-20 10:56:30 +02:00
Sylvain
93210a3b86 New translations app.shared.en.yml (French) 2020-04-20 10:54:49 +02:00
Sylvain
eb9054332e New translations app.shared.en.yml (Zulu) 2020-04-20 10:25:44 +02:00
Sylvain
48374a9e9d New translations app.shared.en.yml (French) 2020-04-20 10:25:41 +02:00
Sylvain
8f44f695c9 New translations app.shared.en.yml (Portuguese) 2020-04-20 10:25:39 +02:00
Sylvain
10415ffa91 New translations app.shared.en.yml (Spanish) 2020-04-20 10:25:36 +02:00
Sylvain
92866d85c4 New translations app.admin.en.yml (French) 2020-04-20 10:23:23 +02:00
Sylvain
38ae5178bc New translations app.admin.en.yml (Portuguese) 2020-04-20 10:23:04 +02:00
Sylvain
9cc4ac4b05 New translations app.admin.en.yml (Spanish) 2020-04-20 10:22:43 +02:00
Sylvain
fc0f153e8a fixed strings 2020-04-20 10:20:42 +02:00
Sylvain
925f38024c New translations app.admin.en.yml (French) 2020-04-20 10:01:20 +02:00
Sylvain
be945e7d6f New translations app.admin.en.yml (Portuguese) 2020-04-20 10:01:18 +02:00
Sylvain
a913ec4c22 New translations app.admin.en.yml (Spanish) 2020-04-20 10:01:15 +02:00
Sylvain
d4a1dd5851 New translations app.admin.en.yml (Zulu) 2020-04-20 10:01:12 +02:00
Sylvain
d665c71157 non-english transations admit some more accordances 2020-04-20 10:00:24 +02:00
Sylvain
6b8ecfda7c New translations app.admin.en.yml (French) 2020-04-20 09:56:20 +02:00
Sylvain
8126af7f1b New translations app.admin.en.yml (French) 2020-04-20 09:50:24 +02:00
Sylvain
7852877554 New translations app.admin.en.yml (Portuguese) 2020-04-20 09:50:20 +02:00
Sylvain
e7588009d4 New translations app.admin.en.yml (Spanish) 2020-04-20 09:50:16 +02:00
Sylvain
5d44f6abc8 New translations app.admin.en.yml (Zulu) 2020-04-20 09:50:11 +02:00
Sylvain
5f90393fb1 updated sentences to match customizable duration of slots 2020-04-20 09:48:20 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00
Sylvain
4b9e1322d6 Changed In-Context pseudo-language to Zulu instead of Acholi 2020-04-08 14:43:46 +02:00
Sylvain
987b007981
Merge pull request #197 from sleede/l10n_dev
New Crowdin translations
2020-04-01 17:59:02 +02:00
Sylvain
b4c5ac7118 New translations en.yml (Portuguese) 2020-04-01 17:40:26 +02:00
Sylvain
f2db6133c6 New translations en.yml (Spanish) 2020-04-01 17:40:19 +02:00
Sylvain
cf3ae8a614 New translations en.yml (French) 2020-04-01 17:40:07 +02:00
Sylvain
e1bdc04a78 New translations en.yml (Portuguese) 2020-04-01 17:28:22 +02:00
Sylvain
7952a09191 New translations en.yml (Spanish) 2020-04-01 17:28:14 +02:00
Sylvain
f1c21307d7 New translations en.yml (Acholi) 2020-04-01 17:28:08 +02:00
Sylvain
a992596102 New translations en.yml (French) 2020-04-01 17:28:03 +02:00
Sylvain
3917d6042c [bug] no statistics for subscriptions (#196)
+ [bug] issing translation for subscriptions statistics > duration
2020-04-01 17:25:55 +02:00
Sylvain
0fabc1bc05
Merge pull request #195 from sleede/l10n_dev
New Crowdin translations
2020-03-31 17:37:03 +02:00
Sylvain
a63071342c New translations app.admin.en.yml (French) 2020-03-31 17:27:51 +02:00
Sylvain
ade3ec80eb New translations app.public.en.yml (French) 2020-03-31 17:20:10 +02:00
Sylvain
c403b486f5 New translations en.yml (Portuguese) 2020-03-31 17:20:07 +02:00
Sylvain
9eae157449 New translations en.yml (Spanish) 2020-03-31 17:19:57 +02:00
Sylvain
4fae34a5b2 New translations app.admin.en.yml (French) 2020-03-31 17:11:52 +02:00
Sylvain
24fc713bec New translations app.public.en.yml (French) 2020-03-31 17:11:50 +02:00
Sylvain
23fccaaabe New translations app.admin.en.yml (Portuguese) 2020-03-31 17:11:45 +02:00
Sylvain
171348d7ef New translations app.public.en.yml (Portuguese) 2020-03-31 17:11:40 +02:00
Sylvain
dbdb57f413 New translations app.admin.en.yml (Spanish) 2020-03-31 17:11:34 +02:00
Sylvain
8919563802 New translations app.public.en.yml (Spanish) 2020-03-31 17:11:31 +02:00
Sylvain
fae69840b1 New translations app.admin.en.yml (Acholi) 2020-03-31 17:11:26 +02:00
Sylvain
24ef335659 New translations app.public.en.yml (Acholi) 2020-03-31 17:11:24 +02:00
Sylvain
37d49c9b84 updated translations 2020-03-31 17:10:31 +02:00
Sylvain
9ed6244582 New translations app.admin.en.yml (French) 2020-03-31 17:00:59 +02:00
Sylvain
e200f6ba1e New translations en.yml (French) 2020-03-31 17:00:42 +02:00
Sylvain
b8ce9f7fd7 New translations app.admin.en.yml (French) 2020-03-31 16:17:32 +02:00
Sylvain
6255ce0709 New translations app.admin.en.yml (Portuguese) 2020-03-31 16:17:00 +02:00
Sylvain
8741074c57 New translations app.admin.en.yml (Spanish) 2020-03-31 16:16:05 +02:00
Sylvain
3f8625c24a New translations app.admin.en.yml (Acholi) 2020-03-31 16:15:40 +02:00
Sylvain
a502a7061e change translation to prevent button overflow 2020-03-31 16:09:13 +02:00
Sylvain
64342c9e00 [bug] missing translations for some error messages 2020-03-24 17:28:55 +01:00
Sylvain
c3f75f5ad2 New translations en.yml (Acholi) 2020-03-23 17:23:12 +01:00
Sylvain
4b4ddffcd2 New translations en.yml (Portuguese) 2020-03-23 17:22:55 +01:00
Sylvain
2a722f6570 New translations en.yml (Spanish) 2020-03-23 17:22:51 +01:00
Sylvain
0b54816d3d New translations en.yml (French) 2020-03-23 17:22:40 +01:00
Sylvain
c926b96a96 Merge branch 'dev' of github.com:sleede/fab-manager into dev 2020-03-23 15:15:16 +01:00
Sylvain
50d43c61ec New translations en.yml (Spanish) 2020-03-11 16:33:22 +01:00
Sylvain
f4e8150a22 fixes translation string 2020-03-11 15:57:12 +01:00
Sylvain
0e9bbe92d0
Merge pull request #190 from sleede/l10n_dev
New Crowdin translations
2020-03-11 15:52:41 +01:00
Sylvain
154b026975 New translations mails.en.yml (French) 2020-03-11 15:27:41 +01:00
Sylvain
ebefd721fd New translations app.shared.en.yml (French) 2020-03-11 15:27:36 +01:00
Sylvain
643937770d New translations app.shared.en.yml (Portuguese) 2020-03-11 15:27:28 +01:00
Sylvain
7722533c73 New translations mails.en.yml (Spanish) 2020-03-11 15:27:25 +01:00
Sylvain
838a23f9d2 New translations app.shared.en.yml (Spanish) 2020-03-11 15:27:19 +01:00
Sylvain
a25f3bef3c New translations app.shared.en.yml (Acholi) 2020-03-11 15:04:46 +01:00
Sylvain
77f1f8f615 New translations mails.en.yml (French) 2020-03-11 15:04:44 +01:00
Sylvain
e2b43f37ed New translations app.public.en.yml (French) 2020-03-11 15:04:41 +01:00
Sylvain
d0abc2f757 New translations app.shared.en.yml (French) 2020-03-11 15:04:40 +01:00
Sylvain
e5ba914108 New translations mails.en.yml (Portuguese) 2020-03-11 15:04:35 +01:00
Sylvain
11fd0460f0 New translations app.public.en.yml (Portuguese) 2020-03-11 15:04:32 +01:00
Sylvain
c6ea6fcfea New translations app.shared.en.yml (Portuguese) 2020-03-11 15:04:30 +01:00
Sylvain
b19e49fdc4 New translations mails.en.yml (Spanish) 2020-03-11 15:04:25 +01:00
Sylvain
6531d99d5d New translations app.public.en.yml (Spanish) 2020-03-11 15:04:21 +01:00
Sylvain
73a558dfcd New translations app.shared.en.yml (Spanish) 2020-03-11 15:04:19 +01:00
Sylvain
dc4795d513 New translations mails.en.yml (Acholi) 2020-03-11 15:04:16 +01:00
Sylvain
163edc50c0 New translations app.public.en.yml (Acholi) 2020-03-11 15:04:13 +01:00
Sylvain
1115ba064b fixes some translation 2020-03-11 14:45:58 +01:00
Sylvain
3f342dc181 New translations app.public.en.yml (French) 2020-03-11 14:44:36 +01:00
Sylvain
0c0fbd0bab New translations app.shared.en.yml (French) 2020-03-11 14:44:34 +01:00
Sylvain
fdc2f2c6ef fix untranslated string 2020-03-11 14:35:38 +01:00
Sylvain
71d7d7b793 New translations mails.en.yml (French) 2020-03-11 14:31:55 +01:00
Sylvain
ea6c8421af New translations app.logged.en.yml (French) 2020-03-11 14:31:51 +01:00
Sylvain
cf073b405a
Merge pull request #188 from sleede/l10n_dev
New Crowdin translations
2020-03-11 12:35:49 +01:00
Sylvain
42b7e95a46 New translations app.public.en.yml (French) 2020-03-11 12:34:08 +01:00
Sylvain
038ab3ab95 New translations app.public.en.yml (French) 2020-03-11 12:30:46 +01:00
Sylvain
445b07f30d New translations app.public.en.yml (French) 2020-03-11 12:26:16 +01:00
Sylvain
1c9ea10500 New translations app.shared.en.yml (French) 2020-03-11 12:26:15 +01:00
Sylvain
c1840c00f3 New translations app.public.en.yml (Portuguese) 2020-03-11 12:26:07 +01:00
Sylvain
a7edd2971b New translations app.shared.en.yml (Portuguese) 2020-03-11 12:26:05 +01:00
Sylvain
4c0ab026c4 New translations app.public.en.yml (Spanish) 2020-03-11 12:25:59 +01:00
Sylvain
c5e85b8683 New translations app.shared.en.yml (Spanish) 2020-03-11 12:25:58 +01:00
Sylvain
aeb79875e0 New translations app.public.en.yml (Acholi) 2020-03-11 12:25:53 +01:00
Sylvain
85085f1f09 Updated translation documentation 2020-03-11 12:13:43 +01:00
Sylvain
a7ecca5095 New translations app.admin.en.yml (French) 2020-03-11 12:11:15 +01:00
Sylvain
7d6f773aec New translations app.logged.en.yml (French) 2020-03-11 12:11:11 +01:00
Sylvain
b6400c5a25 New translations app.public.en.yml (French) 2020-03-11 12:11:10 +01:00
Sylvain
fe98305244 New translations app.admin.en.yml (Portuguese) 2020-03-11 12:11:04 +01:00
Sylvain
0975445716 New translations app.logged.en.yml (Portuguese) 2020-03-11 12:11:02 +01:00
Sylvain
0cd7ee7881 New translations app.public.en.yml (Portuguese) 2020-03-11 12:11:00 +01:00
Sylvain
07aac42041 New translations app.admin.en.yml (Spanish) 2020-03-11 12:10:55 +01:00
Sylvain
24f4f2dc7f New translations app.logged.en.yml (Spanish) 2020-03-11 12:10:51 +01:00
Sylvain
7f7b1a3bdd New translations app.public.en.yml (Spanish) 2020-03-11 12:10:50 +01:00
Sylvain
64780dcd20 New translations app.shared.en.yml (Acholi) 2020-03-11 10:40:36 +01:00
Sylvain
da437711a4 New translations app.admin.en.yml (French) 2020-03-11 10:40:34 +01:00
Sylvain
7dfe742126 New translations app.logged.en.yml (French) 2020-03-11 10:40:32 +01:00
Sylvain
b7deeb9125 New translations app.public.en.yml (French) 2020-03-11 10:40:30 +01:00
Sylvain
bdb22a293a New translations app.shared.en.yml (French) 2020-03-11 10:40:28 +01:00
Sylvain
3cd69851b6 New translations app.admin.en.yml (Portuguese) 2020-03-11 10:40:24 +01:00
Sylvain
94d49f3204 New translations app.logged.en.yml (Portuguese) 2020-03-11 10:40:21 +01:00
Sylvain
61a4aad9ee New translations app.public.en.yml (Portuguese) 2020-03-11 10:40:19 +01:00
Sylvain
1c9c5c1704 New translations app.shared.en.yml (Portuguese) 2020-03-11 10:40:17 +01:00
Sylvain
51707239ee New translations app.admin.en.yml (Spanish) 2020-03-11 10:40:13 +01:00
Sylvain
5912c7b8c3 New translations app.logged.en.yml (Spanish) 2020-03-11 10:40:10 +01:00
Sylvain
ec51abbe7f New translations app.public.en.yml (Spanish) 2020-03-11 10:40:08 +01:00
Sylvain
f77f8cff03 New translations app.shared.en.yml (Spanish) 2020-03-11 10:40:06 +01:00
Sylvain
a16baf7a9d New translations app.admin.en.yml (Acholi) 2020-03-11 10:40:02 +01:00
Sylvain
436d935766 New translations app.logged.en.yml (Acholi) 2020-03-11 10:40:01 +01:00
Sylvain
1118c194e5 New translations app.public.en.yml (Acholi) 2020-03-11 10:39:59 +01:00
Sylvain
60cf79a2b4
Merge pull request #186 from sleede/l10n_dev
New Crowdin translations
2020-03-11 10:33:40 +01:00
Sylvain
7292fb348b Merge branch 'help' into dev 2020-03-11 10:27:05 +01:00
Sylvain
79857c2aae New translations app.public.en.yml (French) 2020-03-11 10:08:43 +01:00
Sylvain
4e272dfbc4 New translations app.shared.en.yml (French) 2020-03-11 10:08:41 +01:00
Sylvain
e44499d7ee fixed some translations 2020-03-11 10:04:32 +01:00
Sylvain
5a3fc03199 New translations app.admin.en.yml (French) 2020-03-11 09:43:00 +01:00
Sylvain
914e7cb7c3 New translations app.logged.en.yml (French) 2020-03-11 09:42:58 +01:00
Sylvain
9160c3cbba New translations app.admin.en.yml (French) 2020-03-11 09:22:27 +01:00
Sylvain
a440336f74 added base.ach.yml 2020-03-11 08:47:08 +01:00
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
40208a196e fix ach locale 2020-03-10 15:36:03 +01:00
Sylvain
d40ae6fb2f add rails ach locale 2020-03-10 09:52:55 +01:00
Sylvain
e78827c8eb New translations en.yml (French) 2020-03-09 15:32:39 +01:00
Sylvain
ac456a8b2f New translations app.admin.en.yml (Portuguese) 2020-03-09 14:25:46 +01:00
Sylvain
f3b489e868 New translations devise.en.yml (French) 2020-03-09 14:25:41 +01:00
Sylvain
448e3217fc New translations app.admin.en.yml (Portuguese) 2020-03-09 14:11:01 +01:00
Sylvain
4ea8537d5a New translations en.yml (Spanish) 2020-03-09 13:49:36 +01:00
Sylvain
5a0b150498 New translations app.logged.en.yml (Portuguese) 2020-03-09 13:23:06 +01:00
Sylvain
f8a8394dc0 New translations en.yml (Spanish) 2020-03-09 13:22:58 +01:00
Sylvain
b165ccf20d New translations app.logged.en.yml (Spanish) 2020-03-09 13:22:54 +01:00
Sylvain
be5b6eca58 New translations app.logged.en.yml (Portuguese) 2020-03-09 13:08:19 +01:00
Sylvain
64b77972e2 New translations app.logged.en.yml (Spanish) 2020-03-09 13:08:07 +01:00
Sylvain
c29f017763
Merge branch 'dev' into l10n_dev 2020-03-09 13:06:03 +01:00
Sylvain
51862ba751 New translations devise.en.yml (Portuguese) 2020-03-09 13:00:44 +01:00
Sylvain
d2857b892b
Delete rails.ach.yml 2020-03-09 12:53:48 +01:00
Sylvain
18e9d8e760
Update devise.pt.yml 2020-03-09 12:52:15 +01:00
Sylvain
e2d1aa1f69 New translations app.logged.en.yml (Spanish) 2020-03-09 12:52:05 +01:00
Sylvain
2343d8cbc9 New translations app.logged.en.yml (French) 2020-03-09 12:51:57 +01:00
Sylvain
3a3fc22b94 New translations app.shared.en.yml (French) 2020-03-09 12:51:54 +01:00
Sylvain
9b1328e709 New translations app.logged.en.yml (Portuguese) 2020-03-09 12:51:50 +01:00
Sylvain
1369b5e6fa New translations devise.en.yml (French) 2020-03-09 12:51:46 +01:00
Sylvain
b89df4fde4 New translations devise.en.yml (Spanish) 2020-03-09 12:51:44 +01:00
Sylvain
d5fa65141f
Update devise.pt.yml 2020-03-09 12:51:43 +01:00
Sylvain
4adb827c21 New translations app.admin.en.yml (Portuguese) 2020-03-09 12:51:42 +01:00
Sylvain
342566520e
Update devise.fr.yml 2020-03-09 12:49:33 +01:00
Sylvain
23b14fbc9b
Update devise.es.yml 2020-03-09 12:44:57 +01:00
Sylvain
899a6616a3
Update devise.es.yml 2020-03-09 12:44:35 +01:00
Sylvain
8ff6af743a
Update devise.es.yml 2020-03-09 12:43:44 +01:00
Sylvain
fdae79ee56
Update devise.es.yml 2020-03-09 12:41:28 +01:00
Sylvain
721d7ac0fa
Update app.shared.fr.yml 2020-03-09 12:40:41 +01:00
Sylvain
63a676607d
Update app.logged.pt.yml 2020-03-09 12:39:17 +01:00
Sylvain
37db4be5bb
Update app.logged.fr.yml 2020-03-09 12:37:46 +01:00
Sylvain
b9fbf4c32a
Update app.logged.es.yml 2020-03-09 12:36:26 +01:00
Sylvain
0db857e5a3
Remove TODO 2020-03-09 12:34:17 +01:00
Sylvain
ca1f0105de New translations app.admin.en.yml (French) 2020-03-09 12:30:48 +01:00
Sylvain
46ccc77e22 New translations app.logged.en.yml (French) 2020-03-09 12:30:45 +01:00
Sylvain
274ce008de New translations app.admin.en.yml (Portuguese) 2020-03-09 12:30:39 +01:00
Sylvain
ca8a72c19d New translations app.logged.en.yml (Portuguese) 2020-03-09 12:30:37 +01:00
Sylvain
e4a6850f64 New translations app.admin.en.yml (Spanish) 2020-03-09 12:30:31 +01:00
Sylvain
375c030ab4 New translations app.logged.en.yml (Spanish) 2020-03-09 12:30:28 +01:00
Sylvain
a6bde5a855 New translations app.admin.en.yml (Acholi) 2020-03-09 12:30:22 +01:00
Sylvain
47096a9b90 New translations app.logged.en.yml (Acholi) 2020-03-09 12:30:21 +01:00
Sylvain
f7980e52f9 refactor translations for crowdin 2020-03-09 12:29:39 +01:00
Sylvain
75f96b34a2 New translations app.admin.en.yml (French) 2020-03-09 12:18:59 +01:00
Sylvain
7d6dbcf309 New translations app.admin.en.yml (Portuguese) 2020-03-09 12:18:50 +01:00
Sylvain
8efe27a448 New translations app.admin.en.yml (Spanish) 2020-03-09 12:18:42 +01:00
Sylvain
8652eaabee New translations app.admin.en.yml (Acholi) 2020-03-09 12:18:34 +01:00
Sylvain
2e85f39b12 move comments to help translating in crowdin 2020-03-09 12:17:47 +01:00
Sylvain
315c78fc26 New translations app.shared.en.yml (Acholi) 2020-03-09 12:11:08 +01:00
Sylvain
b2b0abb1d0 New translations mails.en.yml (French) 2020-03-09 12:11:07 +01:00
Sylvain
468f9d0f89 New translations app.admin.en.yml (French) 2020-03-09 12:11:05 +01:00
Sylvain
571541d68c New translations app.logged.en.yml (French) 2020-03-09 12:11:02 +01:00
Sylvain
81e597f40a New translations app.public.en.yml (French) 2020-03-09 12:11:00 +01:00
Sylvain
31e331202e New translations app.shared.en.yml (French) 2020-03-09 12:10:58 +01:00
Sylvain
4cb19929e7 New translations en.yml (Portuguese) 2020-03-09 12:10:57 +01:00
Sylvain
5be85b8007 New translations devise.en.yml (Portuguese) 2020-03-09 12:10:55 +01:00
Sylvain
0e11ccabcc New translations mails.en.yml (Portuguese) 2020-03-09 12:10:53 +01:00
Sylvain
8c4fa92031 New translations app.admin.en.yml (Portuguese) 2020-03-09 12:10:51 +01:00
Sylvain
8fc79b411a New translations app.logged.en.yml (Portuguese) 2020-03-09 12:10:48 +01:00
Sylvain
d5861737e1 New translations app.admin.en.yml (Spanish) 2020-03-09 12:10:42 +01:00
Sylvain
264d4d8da3 New translations app.logged.en.yml (Spanish) 2020-03-09 12:10:38 +01:00
Sylvain
59692507d5 New translations app.admin.en.yml (Acholi) 2020-03-09 12:10:33 +01:00
Sylvain
969b6682d5 New translations app.logged.en.yml (Acholi) 2020-03-09 12:10:31 +01:00
Sylvain
63d671609f refactor translations to work with crowdin pull requests 2020-03-09 12:08:01 +01:00
Sylvain
9704803478 New translations app.admin.en.yml (Portuguese) 2020-03-09 11:54:21 +01:00
Sylvain
a02899278a New translations app.logged.en.yml (Portuguese) 2020-03-09 11:54:18 +01:00
Sylvain
3dcd41f429 New translations app.public.en.yml (Portuguese) 2020-03-09 11:54:16 +01:00
Sylvain
7ac9fc0468 New translations app.shared.en.yml (Portuguese) 2020-03-09 11:54:14 +01:00
Sylvain
206745b74b New translations devise.en.yml (French) 2020-03-09 11:54:12 +01:00
Sylvain
caa8210712 New translations en.yml (Spanish) 2020-03-09 11:54:11 +01:00
Sylvain
67eb3086d1 New translations mails.en.yml (Spanish) 2020-03-09 11:54:10 +01:00
Sylvain
0d525790b8 New translations app.admin.en.yml (Spanish) 2020-03-09 11:54:07 +01:00
Sylvain
dc7a36e400 New translations app.logged.en.yml (Spanish) 2020-03-09 11:54:05 +01:00
Sylvain
8120811481 New translations app.public.en.yml (Spanish) 2020-03-09 11:54:04 +01:00
Sylvain
6cb0124c94 New translations app.shared.en.yml (Spanish) 2020-03-09 11:54:01 +01:00
Sylvain
de5ac12906 New translations en.yml (Acholi) 2020-03-09 11:53:59 +01:00
Sylvain
0bbc300584 New translations devise.en.yml (Acholi) 2020-03-09 11:53:58 +01:00
Sylvain
b66b0b4ba9 New translations mails.en.yml (Acholi) 2020-03-09 11:53:56 +01:00
Sylvain
88648202b6 New translations rails.en.yml (Acholi) 2020-03-09 11:53:55 +01:00
Sylvain
b9e1282292 New translations app.admin.en.yml (Acholi) 2020-03-09 11:53:54 +01:00
Sylvain
e5e969cb5c New translations app.logged.en.yml (Acholi) 2020-03-09 11:53:52 +01:00
Sylvain
b2c1d31a63 New translations app.public.en.yml (Acholi) 2020-03-09 11:53:51 +01:00
Sylvain
1da5cde400 New translations devise.en.yml (Spanish) 2020-03-09 11:53:50 +01:00
Sylvain
da6af320f7 New translations en.yml (French) 2020-03-09 11:53:48 +01:00
Sylvain
bb752f1218 refactor translations to work with crowdin pull requests 2020-03-09 11:47:18 +01:00
Sylvain
8976336a6a updated user's manual for v4.3 (fr) 2020-03-04 17:24:06 +01:00
Sylvain
5301a237ca Change style and pluralize the text of the slot division alert in new availability assistant 2020-03-04 14:42:00 +01:00
Sylvain
6aafd0c7e1 add missing translations 2020-03-03 18:06:19 +01:00
Sylvain
8a1518dabc prevent admin from changing group + add info about configuring groups first 2020-03-03 11:59:17 +01:00
Sylvain
f5955b74d2 reposition tour modals to prevent screen overflow
also: fix issue on tour completed
+ fix issue on statistics when no plans created
+ info area on statistics when no plans created
2020-03-03 11:20:17 +01:00
Sylvain
5765e3d2e4 move availability options to new step + wording 2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
f34b87c597 harmonized translations 2020-03-02 15:29:19 +01:00
Sylvain
9ce9079ef9 auto-start home tour after login + reorganizer tour to comply with new menu 2020-03-02 10:32:51 +01:00
Sylvain
1a7d7258d8 [bug] in some cases, bogus admin notification on profile completed 2020-03-02 10:20:10 +01:00
Sylvain
4e72cd16a1 harmonized Fab-manager typo 2020-03-02 08:59:43 +01:00
Sylvain
38b196feb8 rearrange main menu 2020-02-26 18:05:09 +01:00
Sylvain
fc5b935495 helpers between reservables screens 2020-02-26 17:30:27 +01:00
Sylvain
a62e31090e tours wording 2020-02-26 16:49:29 +01:00
Sylvain
fdc8ec6a9e import icalendars every hours 2020-02-26 16:04:40 +01:00
Sylvain
c111fca980 alert about slots division on availability creation 2020-02-26 15:58:41 +01:00
Sylvain
0ea7e774d3 wording in training & calendar tours + label on ical button 2020-02-26 15:48:42 +01:00
Sylvain
7143801641 start help tour by clicking on help in user menu
also: tour descriptions of home page items
2020-02-26 15:13:58 +01:00
Sylvain
d71a1b7cbd improve settings/privacy tab 2020-02-26 12:20:33 +01:00
Sylvain
e1d346591f rewrited some steps of the home tour 2020-02-26 11:44:49 +01:00
Sylvain
d833f6d812 harmonize Fab-manager trademark syntax 2020-02-26 10:19:43 +01:00
Sylvain
cf8fb0659b open-api tour 2020-02-25 11:47:30 +01:00
Sylvain
9f9656caa4 settings tour 2020-02-25 11:40:01 +01:00
Sylvain
a56f6c4e18 statistics tour 2020-02-25 11:06:03 +01:00
Sylvain
31dce73f14 project elements tour 2020-02-25 10:47:16 +01:00
Sylvain
64e41910ec trainings tour: change tab on tracking step
invoices tour: do not show listing steps if invoicing is disabled
+ typo
2020-02-25 09:48:55 +01:00
Sylvain
7dd5979d64 texts for projects elements and statistics tours 2020-02-24 17:17:51 +01:00
Sylvain
e6f2e60997 spaces tour 2020-02-24 16:57:41 +01:00
Sylvain
76c1b69b7a machines tour 2020-02-24 16:51:03 +01:00
Sylvain
c13ba85230 events tour 2020-02-24 16:21:12 +01:00
Sylvain
7b955f616e fix i18n syntax + missing transaltion 2020-02-24 15:25:15 +01:00
Sylvain
f8f1dde14a pricing tour 2020-02-24 15:02:45 +01:00
Sylvain
807a9596a8 invoices tour 2020-02-24 11:55:13 +01:00
Sylvain
9f68375ae9 admin calendar tour 2020-02-24 10:33:27 +01:00
Sylvain
496e926abd fix members tour if no member 2020-02-19 14:39:45 +01:00
Sylvain
bc63465a84 members tour 2020-02-19 14:30:56 +01:00
Sylvain
906decb620 [ongoing] members tour 2020-02-19 13:00:38 +01:00
Sylvain
05a29a54b3 trainings tour 2020-02-19 10:22:32 +01:00
Sylvain
5b46edd748 welcome tour + save completed tours in database 2020-02-18 17:36:45 +01:00
Sylvain
fd471be40a angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message 2020-02-12 17:18:11 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
d56422de5b typo 2020-02-11 18:04:31 +01:00
Sylvain
e1902b42ac remove confusing quotes in translations yml 2020-02-11 15:49:43 +01:00
Sylvain
71290420bb ui-tour 3 steps 2020-02-11 15:49:43 +01:00
Sylvain
b7dda83060 Merge branch 'edit_event_recurrent' into dev 2020-02-11 15:43:29 +01:00
Sylvain
db26533d94 alert on date change 2020-02-11 15:42:43 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
392ddc6aa5 wording 2020-02-11 11:01:24 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time 2020-02-05 16:53:47 +01:00
Sylvain
b1a98d3574 improved texts 2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5 update event recurrent 2020-01-29 17:20:19 +01:00
Sylvain
72f3d8fd1e updated crowdin in-context keys 2020-01-28 10:59:19 +01:00
Sylvain
3364dcf4d0 Merge branch 'dev' of github.com:sleede/fab-manager into dev 2020-01-28 10:40:24 +01:00
Sylvain
81a42e5935 customize home page : full texts 2020-01-28 10:12:29 +01:00
Du Peng
b1419271e6 edit event recurrent in progress 2020-01-27 18:21:46 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
b85c7ac00b admin set its customized html template for the home page & can reset it to factory value 2020-01-22 11:53:40 +01:00
Sylvain
15ab3c1305 Ability to customize the title of the link to the about page 2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc Create machine availabilities: select all/none in a click 2020-01-21 12:09:24 +01:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Sylvain
7929d3b198 detailled view of collected data in fabanalytics 2020-01-15 12:48:55 +01:00
Sylvain
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
c450312276 fix yml syntax issue 2020-01-14 17:36:09 +01:00
Sylvain
1f3d9cf88d display upgrade infos directly on the interface 2020-01-14 17:12:36 +01:00
Sylvain
54be21729b batch delete periodic events 2020-01-07 17:18:49 +01:00
Sylvain
1c4f144b8d Merge branch 'members-filters' into dev 2020-01-07 10:44:55 +01:00
Sylvain
f778ee9016 fix syntax + add missing translations 2020-01-07 10:44:29 +01:00
Sylvain
3c3e806a29 Merge branch 'user-confirmation' into dev 2020-01-07 10:34:25 +01:00
Sylvain
3eec4f25bb New translations en.yml (Spanish) 2020-01-03 11:38:14 +01:00
Sylvain
034b5d5707 New translations en.yml (Spanish) 2020-01-03 11:19:14 +01:00
Sylvain
e550fd6dbc New translations en.yml (Spanish) 2020-01-03 11:11:53 +01:00
Sylvain
801f73d375 New translations en.yml (Spanish) 2020-01-03 10:57:56 +01:00
Sylvain
1bc25940b5 New translations en.yml (Spanish) 2019-12-31 11:02:37 +01:00
Sylvain
7c8fdf6ffd New translations en.yml (Spanish) 2019-12-31 09:44:00 +01:00
Sylvain
3448acc764 New translations en.yml (Spanish) 2019-12-31 09:27:06 +01:00
Sylvain
cb66584d3b New translations en.yml (Spanish) 2019-12-31 09:07:31 +01:00
Sylvain
8ea5762f02 New translations en.yml (Spanish) 2019-12-31 09:00:17 +01:00
Sylvain
ca8f948bd1 New translations en.yml (Spanish) 2019-12-31 08:14:05 +01:00
Sylvain
1324fbc025 New translations rails.en.yml (Spanish) 2019-12-30 16:18:12 +01:00
Sylvain
392c125d44 New translations rails.en.yml (Spanish) 2019-12-30 16:08:19 +01:00
Sylvain
8917085025 New translations rails.en.yml (Spanish) 2019-12-30 16:02:48 +01:00
Sylvain
aaa63e3e41 New translations app.public.en.yml (Spanish) 2019-12-30 15:48:55 +01:00
Sylvain
bfb5174efa New translations app.admin.en.yml (Spanish) 2019-12-30 15:48:53 +01:00
Sylvain
a766a60535 New translations app.shared.en.yml (Spanish) 2019-12-30 15:37:12 +01:00
Sylvain
3b7c973409 New translations app.admin.en.yml (Spanish) 2019-12-30 15:37:10 +01:00
Sylvain
f161c1ff24 New translations app.public.en.yml (Spanish) 2019-12-30 15:18:21 +01:00
Sylvain
c6575de1e5 New translations app.admin.en.yml (Spanish) 2019-12-30 15:18:19 +01:00
Sylvain
1af9d1a7f2 New translations app.public.en.yml (Spanish) 2019-12-30 14:58:03 +01:00
Sylvain
4be8dd6892 New translations app.public.en.yml (Spanish) 2019-12-30 14:46:58 +01:00
Nicolas Florentin
60e063a15b fix currentUser value after successfull sign up when confirmation is needed, plus improves translations 2019-12-30 13:45:25 +01:00
Nicolas Florentin
0b899fe183 Merge branch 'dev' into user-confirmation 2019-12-30 09:36:43 +01:00
Sylvain
8a7b10e746 updated crowdin pseudo-language for in-context translation 2019-12-24 12:10:06 +01:00
Sylvain
d4f7ff3603 fixes comments syntax for crowdin compat 2019-12-24 11:47:31 +01:00
Sylvain
1b5014e7a6 fix datetime parsing formats for ach locale 2019-12-23 16:02:33 +01:00
Sylvain
b65c76beb3 fix datetime parsing formats for ach locale 2019-12-23 15:18:18 +01:00
Nicolas Florentin
62c979cfc0 members filters, translations for other languages are still needed 2019-12-20 15:47:42 +01:00
Sylvain
bcd0e6833d integrate crowdin in-context translation code 2019-12-18 16:50:16 +01:00
Nicolas Florentin
0a3a6d034a env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in 2019-12-18 16:02:47 +01:00
Sylvain
c67de56405 remove missing translation tags - useless with a TMS 2019-12-18 15:23:52 +01:00
Sylvain
3a458871eb harmonize front translations in portuguese with new model 2019-12-18 15:21:44 +01:00
Sylvain
997e60edb4 harmonize front translations in spanish with new model 2019-12-18 15:02:10 +01:00
Sylvain
ff8319b166 harmonize front translations in english with new model 2019-12-18 14:35:29 +01:00
Sylvain
c5604bbdf8 harmonize admin.en 2019-12-18 13:26:37 +01:00
Sylvain
14c3abb449 refactoring i18n keys: trainings + modals + various missings 2019-12-18 13:04:38 +01:00
Sylvain
1124159f2e refactoring i18n keys: projects 2019-12-18 11:08:14 +01:00
Sylvain
a7b423b151 refactoring i18n keys - admin 2019-12-17 18:06:56 +01:00
Sylvain
88c48e4e69 [ongoing] refactoring i18n keys - admin 2019-12-17 12:40:36 +01:00
Sylvain
d21f616283 [ongoing] refactoring i18n keys 2019-12-16 16:54:40 +01:00
Sylvain
c565d9ff2b unified front-end i18n interpolations syntax to messageformat 2019-12-16 10:16:11 +01:00
Sylvain
0c11f61010 Prevent event reservation in the past 2019-12-10 12:16:26 +01:00
Sylvain
6aa3c0caeb Notify all admins on the creation of a refund invoice 2019-12-09 11:55:31 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
538b5cef78 add/remove ical imports in public agenda
also: a little of refacftoring in CalendarController
2019-12-03 11:27:20 +01:00
Sylvain
32e7fc3900 confirm delete icalendar imports + fix display + add translations 2019-12-03 10:48:53 +01:00
Sylvain
22be9f6a08 display external calendars list in public calendar + pull availabilities 2019-12-02 16:49:20 +01:00
Sylvain
55d2c88134 delete & sync ical sources 2019-12-02 12:19:30 +01:00
Sylvain
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
9e2134c9cf ics sources configuration interface 2019-11-27 16:17:42 +01:00
Sylvain
91008b3df1 improved calendar legend 2019-11-27 11:52:37 +01:00
Sylvain
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +01:00
Sylvain
5d358efb9f correct conjugation for event canceled 2019-11-25 10:50:32 +01:00
Sylvain
ce366beaa2 display that an event reservation was canceled
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
b725a5a071 Merge branch 'cancel' into dev 2019-11-20 10:27:56 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
0d740c95a9 recapitulative screen 2019-11-13 10:59:10 +01:00
Sylvain
22251e6516 summary screen
TODO: eventModal.html.erb:167
2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486 recurrence UI 2019-11-12 14:25:28 +01:00
Sylvain
1ed3eba129 [feature] export last connection date to members.xlsx 2019-10-29 11:09:17 +01:00
Sylvain
f94d8feba6 [feature] admin can delete an user 2019-10-29 09:59:21 +01:00
Sylvain
35fb991cdb Improved user experience in defining slots in the calendar management 2019-10-23 17:48:31 +02:00
Sylvain
d7aed3fa1f Improved notification email to the member when a rolling subscription is taken 2019-10-23 11:43:42 +02:00
Sylvain
e8930924e4 [bug] do not display each days in invoices for multiple days event reservation 2019-10-16 16:11:37 +02:00
Sylvain
2897eec723 various bugfixes
- in profile_complete form, the user's group is not selected by default
- missing asterisks on some required fields in profile_complete form
- renamed default DatabaseProvider from Fablab to FabManager
2019-10-09 14:41:32 +02:00
Sylvain
7dbfbc4868 fix typo 2019-10-07 17:12:49 +02:00
Sylvain
927479733b migrated links to /users/auth from GET to POST
see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info
2019-10-02 14:37:47 +02:00
Sylvain
0d3cc0fe40 [feature] Ability to disable invoices generation and interfaces 2019-09-30 15:29:20 +02:00
Sylvain
8bd1d72fdf improved results page 2019-09-30 12:49:50 +02:00
Sylvain
ff5de97c92 import new users from CSV and view results in app
TODO:
 - update users though CSV
2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
ad1b7baa05 import members interface 2019-09-24 15:21:18 +02:00
Sylvain
e7bb41f38d [ongoing] import users from csv file: admin inteface 2019-09-24 12:21:19 +02:00
Sylvain
7d26932f6c configure accounting codes & labels for wallet clients and other means clients 2019-09-19 11:51:14 +02:00
Sylvain
c76563f22f wallet label in accounting export 2019-09-19 11:25:12 +02:00
Sylvain
276a99c068 improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled 2019-09-18 13:28:53 +02:00
Sylvain
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +02:00
Sylvain
3348539fdf export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros) 2019-09-17 12:35:34 +02:00
Sylvain
f06bdaaf21 provide additional settings to export api 2019-09-16 16:31:16 +02:00
Sylvain
02d28e0b8c improved accounting codes settings page (1 click saves all) + improved export file name 2019-09-16 14:39:47 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +02:00
Sylvain
52afb6ef07 [bug] extend a current subscription for a member, does not reset his credits 2019-09-12 11:37:03 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
Sylvain
acacd9a19e fixed accounting codes interface + fixed csv generation 2019-08-01 10:24:34 +02:00
Sylvain
26c98394ac fixed export service 2019-08-01 09:49:09 +02:00
Sylvain
fa6a54a422 export notifications 2019-07-31 12:37:31 +02:00
Sylvain
a7f68b59dd connect the export modal to the api 2019-07-31 12:00:52 +02:00
Sylvain
a9ea4057f3 interface to customize accounting codes and labels 2019-07-30 16:06:35 +02:00
Sylvain
ab295f064d service to export invoices into a given period to CSV lines for an accounting sofware 2019-07-29 17:51:53 +02:00
Sylvain
f69703f0a0 allow user to change his choice about cookies 2019-06-13 12:52:56 +02:00
Sylvain
249e59bb2a get user consent about cookies 2019-06-13 11:28:55 +02:00
Sylvain
7fc03af6bc [ongoing] cookies consent modal 2019-06-12 16:53:37 +02:00
Sylvain
d0cd5a90d2 handle deleted users in notifications 2019-06-12 15:49:35 +02:00
Sylvain
ddce997e12 display data collection purpose on each input field + fix notifications on deleted user 2019-06-12 15:34:03 +02:00
Sylvain
0e18defe53 handle deleted user in statistics 2019-06-12 12:40:43 +02:00
Sylvain
a53c6e80e7 move invoice->operator to invoicing_profile + minor fixes to handle user deletion 2019-06-12 12:22:38 +02:00
Sylvain
86ded2b8d2 [ongoing] fixes for invoices pdf files 2019-06-11 16:56:11 +02:00
Sylvain
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
b423d9fce7 add link to interface in abuse report mail 2019-05-21 12:38:07 +02:00
Sylvain
9c2598d405 ability to delete processed reports 2019-05-21 12:24:45 +02:00
Sylvain
7bbea22e76 display reports in interface 2019-05-21 11:49:50 +02:00
Sylvain
630809b91f moved abuses panel to admin zone + fix loading template 2019-05-21 11:16:12 +02:00
Sylvain
dd4b6e2cb1 [ongoing] abuses management interface 2019-05-09 18:27:19 +02:00
Sylvain
10a87eb4cb refactored project list translations 2019-05-09 16:09:20 +02:00
Sylvain
21c7484396 notify admin about notifications sent 2019-04-25 12:04:16 +02:00
Sylvain
162a56250a notify users after privacy policy update + hide undefined content 2019-04-25 11:40:26 +02:00
Sylvain
c0c9b2a980 privacy policy: fixed admin view after update + display last update date 2019-04-23 12:58:01 +02:00
Sylvain
d0f0a293f3 save as draft or publish 2019-04-18 16:55:50 +02:00
Sylvain
7a2fc7c42e [ongoing] save as draft or publish 2019-04-18 15:57:56 +02:00
Sylvain
8fae8b104d admin interface to customize privacy policy page 2019-04-18 12:30:00 +02:00
Sylvain
5bdaebb2f2 privacy policy public page 2019-04-18 12:00:57 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
44479b5597 allow filtering coupons list 2019-04-04 18:00:19 +02:00
Sylvain
9f8d24ec4f paginate list of coupons 2019-04-04 17:28:29 +02:00
Sylvain
c786ba6edb notify user about archiving 2019-04-04 11:37:23 +02:00
Sylvain
8a6ff0c093 prevent closing a period not in the past 2019-04-03 17:27:25 +02:00
Sylvain
722d5d36e7 check server-side that periods match length requirements + explain requirements to user before closing 2019-04-03 13:04:19 +02:00
Sylvain
ea2a73cdc1 add asterisks on required fields 2019-03-26 17:20:10 +01:00
Sylvain
8530a6f655 superadmin + fixed free space notification 2019-03-20 16:49:38 +01:00
Sylvain
bf526458b4 add label to accounting period button 2019-03-20 11:56:03 +01:00
Sylvain
7b0824a4a3 notify admins when no accounting period closed for 1 year 2019-03-18 14:33:30 +01:00
Sylvain
857b1cebba fix accounting period checksum + improved period validation 2019-03-12 15:26:17 +01:00
Sylvain
b940ae0327 display complete info set on accounting archives 2019-03-11 16:11:49 +01:00
Sylvain
9854a4b965 prevent memory saturation with periodic checks 2019-02-26 15:18:19 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
0d0c378b33 missing translations in new authentication provider form 2019-02-14 10:00:19 +01:00
Sylvain
ffe5516d10 prevent closing an accounting period if any checksum error in period 2019-02-12 17:38:44 +01:00
Sylvain
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
d2c4773ac9 [bug] unable to delete an admin who has changed a setting 2019-01-16 17:09:27 +01:00
Sylvain
b9e7276394 fix missing translation 2019-01-16 12:08:27 +01:00
Sylvain
eb69822ce0 Merge branch 'dev' into host 2019-01-14 15:00:55 +01:00
Sylvain
77797db2f1 display VAT rates history 2019-01-14 15:00:33 +01:00
Sylvain
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
35638d611b validates invoice&avoir creation to prevent any creation in closed period 2019-01-09 16:54:09 +01:00
Sylvain
5bee554fa5 Merge branch 'dev' into us78 2019-01-09 10:55:22 +01:00
Sylvain
3536ae95b1 [bug] invalid rails DSB locale 2019-01-08 17:34:12 +01:00
Sylvain
9fac706da8 validates accounting periods on creation + prevent refunding on closed periods (client only) 2019-01-08 17:32:45 +01:00
Sylvain
84aa0c75ff fix date on period closing + improved confirmation msg 2019-01-08 11:58:37 +01:00
Sylvain
d8c8e4f72f set default dates in close modal pickers 2019-01-07 17:21:32 +01:00
Sylvain
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +01:00
Sylvain
d89f9e9301 close an accounting period from interface to db through api 2019-01-07 15:33:09 +01:00
Sylvain
0a59dc6b5d display previous closings in modal 2019-01-07 10:50:10 +01:00
Sylvain
c35029d205 i18n for close period modal 2019-01-03 17:51:24 +01:00
Sylvain
6637832d00 refactored frontend invoices translations 2019-01-03 17:39:50 +01:00
Sylvain
9fe828f51c improved translations 2019-01-02 17:11:18 +01:00
Sylvain
2126a199e0 Ability to set a neutral gender for the fablab's title (#108) 2018-09-18 16:40:50 +02:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Juan Pedro Torres
3a1dd822f5
Solved sign_up/sign_in error
Changed traduction on Sign_up and Sign_in.
2018-01-24 14:31:39 +01:00
jmrodriguesgoncalves
40f6796743 Missing translation fixed 2017-12-12 10:14:21 -05:00
jmrodriguesgoncalves
7e640b9508 Removed #translation_fixed comments 2017-12-12 09:57:13 -05:00
jmrodriguesgoncalves
0a1b64f1de Added missing translation bits 2017-12-11 18:56:38 -05:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
5438fa4b16 added newlines at end of files 2017-11-20 09:58:37 +01:00
Sylvain
aa2f45ee6e Merge branch 'clemclemmm-master' into dev 2017-11-20 09:52:36 +01:00
Sylvain
a8803cb7bc Merge branch 'master' of https://github.com/clemclemmm/fab-manager into clemclemmm-master 2017-11-20 09:52:17 +01:00
Sylvain
e043e76f47 add newline at end of file 2017-11-20 09:48:35 +01:00
Sylvain
06cf85d733 fix rails.fa-CM.yml syntax 2017-11-20 09:39:05 +01:00
Sylvain
8500bff648 Merge branch 'dev' of https://github.com/alexcvcoelho/fab-manager into alexcvcoelho-dev 2017-11-20 09:34:11 +01:00
Sylvain
c4e93eeb27 Merge branch 'master' of https://github.com/bmohamet/fab-manager into bmohamet-master 2017-11-20 09:29:33 +01:00