1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-11 22:24:21 +01:00
Commit Graph

3076 Commits

Author SHA1 Message Date
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
47a0fca481 show all availabilities to managers 2020-05-06 12:56:12 +02:00
Sylvain
be23cf27c3 use Price.compute to generate invoice items 2020-05-06 12:43:47 +02:00
Sylvain
19de8ca319 fix: manager can offer slot to other users 2020-05-06 09:58:15 +02:00
Sylvain
e6f8a34aa4 [ongoing] compute per based on a hourly rate 2020-05-05 17:56:47 +02:00
Sylvain
34935cbc35 decrease higher limit for black text on primary color 2020-05-05 16:20:44 +02:00
Sylvain
6d0ed0bfb5 info box for current availabity in admin calendar 2020-05-05 16:19:46 +02:00
Sylvain
ee3dea3f55 fix if logger is not debug 2020-05-05 12:39:42 +02:00
Sylvain
0609f444b0 corrected ProjectIndexerWorker 2020-05-05 12:37:13 +02:00
Sylvain
b204b1fbaf [security] updated jquery to fix CVE-2020-11023 2020-05-05 12:10:15 +02:00
Sylvain
7ec7fd0d0d fix notify_user_role_update 2020-05-05 11:59:52 +02:00
Sylvain
0643bb0aa3
Merge pull request #203 from sleede/dependabot/npm_and_yarn/jquery-3.5.0
Bump jquery from 3.4.1 to 3.5.0
2020-05-05 11:50:34 +02:00
Sylvain
d906d57440
Merge pull request #206 from sleede/l10n_dev
New Crowdin translations
2020-05-05 11:50:16 +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
53aff97328 Merge branch 'role' into dev 2020-05-05 11:36:43 +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
d8a289e825 fixes change role API 2020-05-04 18:34:26 +02:00
Sylvain
06a5bff084 [ongoing] change user role 2020-05-04 18:32:25 +02:00
Sylvain
3319e68526 Auto-adjusts text colors based on the selected theme colors 2020-05-04 13:20:57 +02:00
Sylvain
29e7ac2f08 [bug] background image of the profile is not shown and wrong menu hover color 2020-05-04 12:10:13 +02:00
Sylvain
7640704568 fix payment method on invoices operated by a manager 2020-05-04 11:36:06 +02:00
Sylvain
881cc97e8d The invoices list displays the operator in case of offline payment 2020-05-04 10:56:27 +02:00
dependabot[bot]
5d9ec3284e
Bump jquery from 3.4.1 to 3.5.0
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-30 04:45:51 +00:00
Sylvain
2592844ad0 allow manager to create projects 2020-04-29 18:21:06 +02:00
Sylvain
4298b74b7c fixes development readme to use .env instead of application.yml
Also:
- Updated links in Vagrantfile
- Applied some basic rubocop rules to the Vagrantfile
2020-04-29 17:41:11 +02:00
Sylvain
8e4396c37a
Merge pull request #202 from sleede/l10n_dev
New Crowdin translations
2020-04-29 17:13:14 +02:00
Sylvain
ad52f825fa
Merge branch 'dev' into l10n_dev 2020-04-29 17:12:51 +02:00