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

2351 Commits

Author SHA1 Message Date
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
4ad8a836f9 removed unneeded returns 2020-03-02 16:20:50 +01:00
Sylvain
c5923638f4 updated puma to fix xsrf issue 2020-03-02 16:20:20 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
8ab192b02e fix documentation and setup script for wallet variable 2020-03-02 15:47:43 +01:00
Sylvain
11ccaa73b6 Merge remote-tracking branch 'origin/disable_wallet_option' into dev 2020-03-02 15:47:14 +01:00
Sylvain
c5cfd3d75c typo 2020-03-02 15:43:04 +01:00
Sylvain
147a78de96 Merge branch 'tour' into dev 2020-03-02 15:39:45 +01:00
Sylvain
f34b87c597 harmonized translations 2020-03-02 15:29:19 +01:00
Sylvain
6748a1aca1 [bug] with Firefox browser, the texts in date inputs are shifted to the bottom 2020-03-02 11:46:56 +01:00
Sylvain
f1928c0d4c refactor the home tour to start after the render 2020-03-02 11:40:00 +01:00
Sylvain
5186d6b22c behavior of FEATURE_TOUR_DISPLAY 2020-03-02 11:17:28 +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
29eb248029 [bug] unable to select a group in profile completion screen 2020-03-02 09:59:35 +01:00
Sylvain
63bdd85657 [bug] datepicker does not work in profile completion screen 2020-03-02 09:49:16 +01:00
Sylvain
02aafcb78b fix missing translations 2020-03-02 09:43:42 +01:00
Sylvain
676da06ef1 left menu spacers style 2020-03-02 09:13:00 +01:00
Sylvain
4e72cd16a1 harmonized Fab-manager typo 2020-03-02 08:59:43 +01:00
Sylvain
22df5d7177 updated changelog 2020-03-02 08:53:44 +01:00
Sylvain
ce3e89c49c Merge branch 'dev' of github.com:sleede/fab-manager into dev 2020-03-02 08:42:58 +01:00
Sylvain
efce185ac8 restore gemset 2020-03-02 08:42:26 +01:00
Sylvain
abb0c799be
Merge pull request #172 from sleede/dependabot/bundler/puma-3.12.3
Bump puma from 3.10.0 to 3.12.3
2020-03-02 08:33:56 +01:00
Sylvain
cd61826b6a
Merge branch 'dev' into dependabot/bundler/puma-3.12.3 2020-03-02 08:33:42 +01:00
dependabot[bot]
8c47a14115
Bump puma from 3.10.0 to 3.12.3
Bumps [puma](https://github.com/puma/puma) from 3.10.0 to 3.12.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.10.0...v3.12.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-02-28 18:53:21 +00: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
6835d71197 fix missing translation 2020-02-26 16:07:01 +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
6b63483fcc fix an issue with the health endpoint 2020-02-26 12:00:51 +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
222590ae5e tour step modal: increase width + align buttons 2020-02-26 09:37:21 +01:00
Sylvain
4db219b204 [ongoing] FEATURE_TOUR_DISPLAY 2020-02-25 18:02:41 +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
9589efa312 fix scroll issues on tours 2020-02-25 10:11:18 +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
a52861ef57 Merge branch 'dev' of github.com:sleede/fab-manager into dev 2020-02-25 09:28:13 +01:00
Sylvain
adca28eaa3
Merge pull request #170 from sleede/dependabot/bundler/nokogiri-1.10.8
Bump nokogiri from 1.10.4 to 1.10.8
2020-02-25 09:21:43 +01:00
Sylvain
9a9f08a1f0
Merge branch 'dev' into dependabot/bundler/nokogiri-1.10.8 2020-02-25 09:21:29 +01:00
dependabot[bot]
f2300c114c
Bump nokogiri from 1.10.4 to 1.10.8
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-02-25 01:57:36 +00:00
Sylvain
7dd5979d64 texts for projects elements and statistics tours 2020-02-24 17:17:51 +01:00