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

1724 Commits

Author SHA1 Message Date
Sylvain
3135abcee6 retrieve phone_required directly from the api 2020-05-25 16:02:40 +02:00
Sylvain
ed287884de retrieve book_overlapping_slots directly from the api 2020-05-25 15:28:06 +02:00
Sylvain
54d9b348e0 retrieve slot_duration directly from the api, in the front-end 2020-05-25 15:16:40 +02:00
Sylvain
ba4c39ca99 use slot duration from the db setting 2020-05-25 12:55:01 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
1ad0720711 number-setting directive + refactored admin/settings to use new directive 2020-05-25 12:55:01 +02:00
Sylvain
cb2ad950b5 update setting in memory after save 2020-05-25 12:55:01 +02:00
Sylvain
af45f5bbcd refactored settings to use boolean-setting directive 2020-05-25 12:55:01 +02:00
Sylvain
906564e5e5 boolean-setting directive + eslint on .js.erb + refactored book_overlapping_slots using the new directive 2020-05-25 12:55:01 +02:00
Sylvain
e625f8c7f7 reorganized home directives 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
701d18d501 Improved display of the icons alerting about an outdated version 2020-05-25 12:54:58 +02:00
Sylvain
13bcd9a1f8 use phoneRequired from settings instead of env 2020-05-25 12:54:19 +02:00
Sylvain
f80eb230ca refactored code to use Setting.get 2020-05-25 12:54:19 +02:00
Sylvain
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
bf57587301 [bug] recurrent availabilities do not keep the custom duration 2020-05-25 11:03:31 +02:00
Sylvain
18e2b032ae fix import users from csv 2020-05-19 11:45:51 +02:00
Sylvain
c9670c9d1d [bug] openAPI clients interface has a bugged behavior when creating/editing a client 2020-05-18 18:09:13 +02:00
Sylvain
2b95c043e3 Removed dependency to has_secure_token to fix warnings about already initialized constant 2020-05-18 17:45:01 +02:00
Sylvain
6c1a500ffa add the url of our website into the endpoint 2020-05-18 17:10:04 +02:00
Sylvain
fdc2f60ff5 [bug] when a new account is created through the sign-up modal, the role is not reported in the StatisticProfile (#196)
Also: if a member was deleted the /api/members/mapping will raise an error
2020-05-18 16:23:53 +02:00
Joel Shprentz
dc2ae51b07
Add missing ? to create? method name. 2020-05-15 17:36:43 -04:00
Sylvain
ca7a50bacc [bug] admin's members list shows the same members multiple times 2020-05-13 10:59:16 +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
22e936dda5 refactored notification_mailer for possible bug
undefined method _t for Class:0x...
2020-05-12 20:30:30 +02:00
Sylvain
c5bbcf9381 [bug] prevent VersionCheckWorker from polluting the sidekiq stack in development 2020-05-12 16:21:06 +02:00
Sylvain
37901e4153 [bug] users promoted to the administrator role are not in the admin group 2020-05-12 15:30:57 +02:00
Sylvain
8ea36b8a89 [bug] the subscription page is not available 2020-05-12 15:16:26 +02:00
Sylvain
14c8cbbf57 typos 2020-05-11 17:17:37 +02:00
Sylvain
9f8fb1a95c fix tests + fix price.compute flor slots 2020-05-11 13:52:27 +02:00
Sylvain
1fdea63828 correct some errors due to Price.compute refactoring 2020-05-11 10:56:23 +02:00
Sylvain
06502cde33 [bug] accounting periods totals are wrong for periods closed after 2019-08-01 2020-05-11 10:10:52 +02:00
Sylvain
4f43dc1407 [bug] do not show disabled groups and plans during availability creation 2020-05-06 17:38:10 +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
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
7ec7fd0d0d fix notify_user_role_update 2020-05-05 11:59:52 +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
Sylvain
2592844ad0 allow manager to create projects 2020-04-29 18:21:06 +02:00
Sylvain
b97ff2ec5b improved feature tour for managers 2020-04-29 16:30:39 +02:00
Sylvain
6aa7ba89e8 manager's notifications 2020-04-29 15:34:30 +02:00
Sylvain
ff9636e12f help tour for managers 2020-04-29 15:20:39 +02:00
Sylvain
59a20d71bd corrected the documentation about BOOK_SLOT_AT_SAME_TIME
Also: [ongoing] help for managers
2020-04-29 12:57:17 +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
81a18704ed [bug] plan edition does not show the associated group 2020-04-28 18:10:12 +02:00
Sylvain
abcf17d1e6 invoices interface for managers 2020-04-28 16:49:05 +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
e4f5a0f833 restricted manager view on users 2020-04-28 13:20:12 +02:00
Sylvain
3e177b5177 managers events views 2020-04-28 12:48:03 +02:00
Sylvain
e56fba1c03 [bug] Free entry label for events without reservation 2020-04-28 11:21:04 +02:00
Sylvain
2da644ecd5 [bug] unable to delete an unreserved event 2020-04-28 10:05:28 +02:00
Sylvain
3624bee057 {bug] unable to create events or trainings that are not multiples of SLOT_DURATION 2020-04-28 09:45:12 +02:00
Sylvain
570672c5db [bug] unable to change group if the previous was deactivated 2020-04-28 09:21:33 +02:00
Sylvain
102709246f basic access to members management for managers 2020-04-27 17:48:13 +02:00
Sylvain
8c610ea336 [managers] trainings management 2020-04-27 17:28:11 +02:00
Sylvain
d376aa400c book slot at same time for managers 2020-04-27 16:44:56 +02:00
Sylvain
69c8d7c678 manager can change existing reservations 2020-04-27 12:58:55 +02:00
Sylvain
5312c13d3f [manager] manage agenda + book machines for himself&others 2020-04-27 12:12:29 +02:00
Sylvain
c45c92e86a basic manager menu 2020-04-22 12:31:44 +02:00
Sylvain
c30ae8179e fix groups and tags in manager creation + helpers to get users w/ role partner|manager 2020-04-22 10:46:46 +02:00
Sylvain
e1a8646e5f inteface to add/remove/edit managers 2020-04-22 10:09:16 +02:00
Sylvain
2ca5c8c50f managers interface 2020-04-21 17:24:22 +02:00
Sylvain
f88472eeb3 Interface to manage partners 2020-04-21 16:47:35 +02:00
Sylvain
d717ed704c adjust nb of slots per availability 2020-04-21 15:20:33 +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
ac1fa424b5 move version API to POST 2020-04-14 11:39:26 +02:00
Sylvain
92398c6d8d Allow removing contacts from the about page + defaut locales 2020-04-08 16:32:22 +02:00
Sylvain
5f6c293046 fixes in-context translation + fixes migration 20160704095606 2020-04-08 15:55:08 +02:00
Sylvain
de9c224a92 improved version check
- use referer from client when available
- save uuid returned by hub
- send uuid to hub on version check
- check the version on each startup to prevent wrong sync
- also: do not save a setting on API update if it has not changed
2020-04-07 17:53:19 +02:00
Sylvain
a4cd6e4dc7 [bug] unable to access health endpoint 2020-04-07 15:19:41 +02:00
Sylvain
6f4052f295 [bug] invalid link to upgrade procedure 2020-04-07 15:02:14 +02:00
Sylvain
1a20f8b41b typo 2020-04-07 14:52:13 +02:00
Sylvain
44e726bc54 [bug] in-context translation is loading invalid locale for MessageFormat 2020-04-07 14:39:31 +02:00
Sylvain
f24d94b979 set correct invoicing_profile_id for refund invoice during wallet credit 2020-04-01 17:58:32 +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
0b81f957ef fix testing assets with rails 5 2020-04-01 12:51:46 +02:00
Sylvain
705bedc25c [bug] crediting a wallet w/ refund invoice prevent statistics generation (#196) 2020-04-01 12:51:18 +02:00
Sylvain
34a59eabe6 upgrade to new assets pipeline api 2020-03-31 17:36:00 +02:00
Sylvain
570f61c5df [bug] report error on invalid encoding in members import 2020-03-31 16:53:30 +02:00
Sylvain
6dc7a7edd9 [bug] unable to export accounting data to ACD 2020-03-31 15:39:05 +02:00
Sylvain
f9e18ca580 removed dependency to discoutinued protected_attributes + fixed auth_provider 2020-03-30 16:17:32 +02:00
Sylvain
3dc8d66c63 remove dead code of WebhooksController 2020-03-30 15:29:48 +02:00
Sylvain
02c1014412 class documentation 2020-03-30 11:33:12 +02:00
Sylvain
d33c6c0d30 documented all models until StatisticField + fixes halting callback chains via returning false + improved some code 2020-03-25 17:45:53 +01:00
Sylvain
68b8827499 removed unused PlanImage 2020-03-25 16:49:13 +01:00
Sylvain
3d34fd7261 Removed MESSAGEFORMAT_LOCALE as it is now handled by make-plural 2020-03-25 12:35:09 +01:00
Sylvain
6b66d601e1 inherit models from ApplicationRecord 2020-03-25 12:35:09 +01:00
Sylvain
467c6351b1 fix deprecated sass extend 2020-03-25 12:35:08 +01:00
Sylvain
2bbce711d9 fix stylesheet view 2020-03-25 12:35:08 +01:00
Sylvain
9069139bc4 fix accounting archive generation 2020-03-25 12:35:08 +01:00
Sylvain
36adddad53 Syntax improvements in scss files 2020-03-25 12:35:08 +01:00
Sylvain
df8ff77597 fix migrations for rails 5 + use maildev instead of mailcatcher + fix tests script 2020-03-25 12:35:08 +01:00
Du Peng
b3313d3e75 update rails to 5.1.7 2020-03-25 12:35:07 +01:00
Du Peng
9ca9425ef4 update to rails 5.0.7.2 2020-03-25 12:35:07 +01:00
Sylvain
85ab715b89 [bug] invalid translation keys in closing accounting period interface 2020-03-24 16:59:36 +01:00
Sylvain
a1af1a78b0 do not embed dev deps in docker build + updated eslint 2020-03-23 16:15:06 +01:00
Sylvain
0b341af1ed [bug] unable to create new availabilities if SLOT_DURATION is not defined 2020-03-11 11:31:06 +01:00
Sylvain
9e7822f34a Improved contextual help with a modal dialog 2020-03-11 10:26:53 +01:00
Sylvain
e44499d7ee fixed some translations 2020-03-11 10:04:32 +01:00
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
86ae46e4c3 Display user's manual when help is asked, if no tour is available 2020-03-04 17:53:43 +01:00
Sylvain
21c3084bb8 [bug] spaces item is not at the correct position in the admin navigation menu 2020-03-04 14:44:19 +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
f058947c42 [bug] in the user's menu, two links to the personal wallet 2020-03-04 14:33:19 +01:00
Sylvain
0fdce5d1f2 [bug] in feature tours, next and previous arrows may be broken on some systems 2020-03-04 14:29:11 +01:00
Sylvain
978c44f55f fix an issue: shift in subscription end date when over DST 2020-03-04 11:43:12 +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
d0be17073b [bug#169] first day of week is ignored in agendas 2020-03-02 17:22:15 +01:00
Sylvain
b645e5efe5 fixed: remove restrincting plan message 2020-03-02 16:59:04 +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
4ad8a836f9 removed unneeded returns 2020-03-02 16:20:50 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
11ccaa73b6 Merge remote-tracking branch 'origin/disable_wallet_option' into dev 2020-03-02 15:47:14 +01:00
Sylvain
147a78de96 Merge branch 'tour' into dev 2020-03-02 15:39:45 +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
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
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
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
42e2c8bafa do not display spaces tab help if space module is disabled 2020-02-24 15:04:17 +01:00
Sylvain
f8f1dde14a pricing tour 2020-02-24 15:02:45 +01:00
Sylvain
a1a96b9c03 fix handle invoices tour with F1 2020-02-24 11:56:13 +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
32d5af9b87 fix tours collision on F1 2020-02-24 10:05:03 +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
3d788579f1 set active tab depending on tour step 2020-02-19 12:21:24 +01:00
Sylvain
fd62062533 Updated angular-ui-bootstrap from v1.1 to v1.2 2020-02-19 12:07:42 +01:00
Sylvain
0948ef4381 Updated angular-ui-bootstrap from v0.14 to v1.1 2020-02-19 11:34:38 +01:00
Sylvain
05a29a54b3 trainings tour 2020-02-19 10:22:32 +01:00
Sylvain
0d9f79976d [ongoing] trainings tour 2020-02-18 17:53:53 +01:00
Sylvain
16ed2fa73a isolate welcome tour 2020-02-18 17:39:47 +01:00
Sylvain
5b46edd748 welcome tour + save completed tours in database 2020-02-18 17:36:45 +01:00
Sylvain
d869948cd0 fix translations mapping 2020-02-18 15:52:37 +01:00
Sylvain
40f41aeef5 fix translations mapping 2020-02-18 15:52:28 +01:00
Sylvain
4c919824ba fix unmapped translations in signup modal 2020-02-18 10:17:07 +01:00
Sylvain
11a2dde776 fix notifications over tour 2020-02-17 18:57:05 +01:00
Du Peng
908275d171 add disable wallet option 2020-02-12 18:15:44 +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
7242eb32f8 allow admin reserve a slot at the same time 2020-02-12 14:54:06 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
71290420bb ui-tour 3 steps 2020-02-11 15:49:43 +01:00
Sylvain
528877bc76 poc features-tour 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
Du Peng
870a092a81 Merge branch 'slot_is_only_subscriptions' of git.sleede.com:projets/fab-manager into slot_is_only_subscriptions 2020-02-11 13:22:28 +01:00
Du Peng
096a658bac add a validator to check reservation's slot is or not restrict for subscriptions 2020-02-11 13:22:20 +01:00
Du Peng
760109de05 fix bug: cant reserve formation slot 2020-02-11 13:21:25 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
54bcc392f3 typo and syntax 2020-02-11 10:48:29 +01:00
Du Peng
d9676b604c remove debug info 2020-02-10 11:53:20 +01:00
Du Peng
427725f927 fix bug: select plans error 2020-02-10 11:52:57 +01:00
Sylvain
ea9607521b translation issue on event reservation 2020-02-10 11:09:54 +01:00
Sylvain
aecbaa7f04 translation issue on event reservation 2020-02-10 11:09:22 +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
Du Peng
c3965b28cf remove rebocop disable 2020-02-03 10:53:54 +01:00
Du Peng
05073d5a28 fix bug for update event recurrent 2020-01-30 12:03:50 +01:00
Sylvain
fd0f49f132 rubocop: ruby syntax 2020-01-29 17:50:06 +01:00
Sylvain
5b97ef03a9 rubocop: ruby syntax 2020-01-29 17:49:05 +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
Du Peng
de02bb1c72 update all attributes of event 2020-01-28 18:34:32 +01:00
Sylvain
81a42e5935 customize home page : full texts 2020-01-28 10:12:29 +01:00
Sylvain
8d8c9a8af5 fix double insertion of widgets button in home page editor 2020-01-28 09:24:55 +01:00
Sylvain
49b3a54afb allow display widgets multiple times on home page 2020-01-28 09:21:39 +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
37c90b1d54 ruby syntax 2020-01-22 14:34:45 +01:00
Sylvain
34a3286870 fix homepage layout 2020-01-22 14:16:35 +01:00
Sylvain
898a18ed46 display customized home page html 2020-01-22 13:25:22 +01:00
Sylvain
75c49c06f2 move homepage components to standalone directives
- events
2020-01-22 12:52:51 +01:00
Sylvain
89e146d419 [ongoing] move homepage components to standalone directives
- twitter
- members
2020-01-22 12:43:08 +01:00
Sylvain
fd1778b465 renamed twitter template file 2020-01-22 12:24:45 +01:00
Sylvain
1968ba601d [ongoing] move homepage components to standalone directives 2020-01-22 12:23:51 +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
b1e6154cc9 POC for custom home page 2020-01-21 18:03:15 +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
Sylvain
146ba97766 Merge remote-tracking branch 'origin/reserve_slots_passed' into dev 2020-01-21 11:01:48 +01:00
Sylvain
57e5da61de remove unused helper 2020-01-21 11:01:23 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Du Peng
0143c3d495 allow admin reserve machine/space in the past time 2020-01-20 16:17:10 +01:00
Sylvain
c214ae3beb Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2020-01-15 12:49:07 +01:00
Sylvain
7929d3b198 detailled view of collected data in fabanalytics 2020-01-15 12:48:55 +01:00
Du Peng
fe387cbe3c Merge branch 'twitter' into dev 2020-01-15 12:40:01 +01:00
Du Peng
db29673a4c remove twitter api for get latest tweet 2020-01-15 12:34:51 +01:00
Du Peng
900d84f3c6 get latest twitter by twitter search without twitter api 2020-01-15 12:04:07 +01:00
Sylvain
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
a67b2ff29c do not show version modal if system if up-to-date 2020-01-14 18:03:57 +01:00
Sylvain
774060d9ab FORCE_VERSION_CHECK for dev env + do not save hub public key if duplicate 2020-01-14 17:59:30 +01:00
Sylvain
19502c8231 fix display version on home page 2020-01-14 17:39:13 +01:00
Sylvain
1f3d9cf88d display upgrade infos directly on the interface 2020-01-14 17:12:36 +01:00
Sylvain
a564ec62b5 updated version check worker 2020-01-14 16:16:31 +01:00
Sylvain
bb48a13f83 health endpoint & automated version check 2020-01-14 14:33:00 +01:00
Sylvain
64764e5498 check version on hub & [ongoing] health endpoint 2020-01-13 17:05:53 +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
b6ee4e92a4 change falsy value + updated changelog 2020-01-07 10:34:12 +01:00
Sylvain
6d0cc201c4 remove: send abuse with ENTER 2020-01-06 17:08:50 +01:00
Nicolas Florentin
9cc090e4bc typo 2019-12-30 13:48:40 +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
6550428f72 fix AUthService factory, isAuthenticated was called from scope and not from the factory itself 2019-12-30 13:44:24 +01:00
Nicolas Florentin
0b899fe183 Merge branch 'dev' into user-confirmation 2019-12-30 09:36:43 +01:00
Sylvain
3412d9e35c fix checking enable_in_context_translation 2019-12-23 13:49:46 +01:00
Sylvain
f05547e46e change ach pluralization location 2019-12-23 11:29:02 +01:00
Sylvain
40e8b60a0a add ach pluralization fonction for messageFormat 2019-12-23 10:28:12 +01:00
Nicolas Florentin
62c979cfc0 members filters, translations for other languages are still needed 2019-12-20 15:47:42 +01:00
Nicolas Florentin
518511ab3b Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2019-12-19 12:06:54 +01:00
Nicolas Florentin
7ea3e5ce32 fix translation key path app.public.projects_list.the_fablab_projects 2019-12-19 12:06:45 +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
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
a8e8ffa1d4 refactoring i18n keys: export stats 2019-12-17 18:09:36 +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
f50e45d2de rake task to sync users with stripe 2019-12-03 16:32:59 +01:00
Sylvain
60755a2c2a Merge remote-tracking branch 'origin/fix-time-now' into dev 2019-12-03 15:51:22 +01:00
Sylvain
11e74c6859 Merge branch 'ics' into dev 2019-12-03 15:30:28 +01:00
Sylvain
64fe68b2b0 icalendar source sync: create/update/delete ical events 2019-12-03 12:16:07 +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
d93ce15a47 external calendars legend 2019-12-03 10:23:19 +01:00
Sylvain
122ff54cd8 fix colors in ics imports 2019-12-03 10:17:29 +01:00
Sylvain
5215d0643d Merge branch 'ics' of git.sleede.com:projets/fab-manager into ics 2019-12-03 09:56:37 +01:00
Sylvain
22be9f6a08 display external calendars list in public calendar + pull availabilities 2019-12-02 16:49:20 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Nicolas Florentin
db41e846dd uses DateTime#current instead of Time.now in tests 2019-12-02 15:29:05 +01:00
Nicolas Florentin
b17bcfde86 comment model slot.rb 2019-12-02 12:39:20 +01:00
Nicolas Florentin
6ff6c71060 rm dead code Slot#can_be_modified? 2019-12-02 12:32:52 +01:00
Sylvain
55d2c88134 delete & sync ical sources 2019-12-02 12:19:30 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +01:00
Sylvain
f72ae98109 do not show title if calendar is configured to hide them 2019-11-27 17:50:38 +01:00
Sylvain
85d17d62f3 fix events endpoint 2019-11-27 17:44:01 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
9e2134c9cf ics sources configuration interface 2019-11-27 16:17:42 +01:00
Sylvain
bb777227d6 display events of external ics in calendar 2019-11-27 13:59:56 +01:00
Sylvain
a9b1eabb2c [poc] show google agenda events in the public calendar 2019-11-27 13:51:23 +01:00
Sylvain
90b3564138 admin calendar: surround select item by shadow-box 2019-11-27 12:31:32 +01:00
Sylvain
91008b3df1 improved calendar legend 2019-11-27 11:52:37 +01:00
Sylvain
eb3c78a61d [poc] show google agenda events in the public calendar 2019-11-26 13:44:43 +01:00
Sylvain
48b811d2b5 Added freeCAD files as default allowed extensions
also: refactored some ruby code
2019-11-25 16:12:23 +01:00
Sylvain
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +01:00
Sylvain
563de29b9d Calendar management: improved legend style 2019-11-25 11:59:34 +01:00
Sylvain
1182822d8b show correct seats nb in canceled reservation 2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5 compute right nb of free seats for event reservation
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
2019-11-25 10:30:12 +01:00
Sylvain
ce366beaa2 display that an event reservation was canceled
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
cabe2e5604 update free places after cancel event reservation 2019-11-20 17:06:42 +01:00
Sylvain
b725a5a071 Merge branch 'cancel' into dev 2019-11-20 10:27:56 +01:00
Sylvain
37d6c84cc6 [bug] unable to remove training picture
also: removed some invalid href=# in the templates
2019-11-19 15:18:00 +01:00
Sylvain
ad928bd4e6 ability to set phone number optional or required
also: show stars on required fields in new admin form
2019-11-19 11:44:32 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
26738563bd create reccursive events 2019-11-18 11:50:20 +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
96a2f6e426 create availablities with slots duration ne 60 2019-10-30 15:09:44 +01:00
Sylvain
cdc30e0da2 configure the slots duration with an environment variable 2019-10-29 16:52:52 +01:00
Nicolas Florentin
12b9155b43 try to fix edge cases of VatHistoryService, related to issue #156 2019-10-29 15:20:25 +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
58821555fe Ability to set the default view in project gallery: openLab or local 2019-10-22 14:42:45 +02:00
Sylvain
d48e5602ce [bug] admins can't edit members projects 2019-10-22 14:42:35 +02:00
Sylvain
fdcec06345 CVE-2019-16892 + #49
- updated rubyzip to fix a security issue
- updated axlsx and file writing method as a possible fix for #49
2019-10-21 16:11:49 +02:00
Sylvain
528e6f5e55 admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value 2019-10-21 15:24:27 +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
9e1e23f268 [bug] unauthorized user can see the edit project form 2019-10-16 15:21:50 +02:00
Sylvain
ab5ee0f2d8 [bug] invoices list is not shown by default in 'manage invoices' section 2019-10-14 10:59:56 +02:00
Sylvain
bc36b78719 [bug] public calendar won't show anything if the current date range include a reserved space availability (#151) 2019-10-14 10:38:13 +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
38847844fb display label on all rows in accounting export 2019-10-07 14:02:47 +02:00
Sylvain
19a125bd67 [bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice 2019-10-07 12:08:08 +02:00
Sylvain
86f4c132b0 Merge branch 'cve-2015-9284' into dev 2019-10-02 16:08:40 +02:00
Sylvain
5fcf9968cb Updated Omniauth & Omniauth-oauth2 + fixed oauth2 callback url 2019-10-02 16:06:27 +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
2cc7fb0e44 accounting export: display lable on all lignes 2019-10-02 10:25:06 +02:00
Sylvain
35b069a4db added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST 2019-10-01 17:14:16 +02:00
Sylvain
877506b26a [bug] unable to dissociate the last machine from a formation 2019-10-01 15:27:59 +02:00
Sylvain
29d6a1daa4 Merge branch 'uvsq' into dev 2019-10-01 14:32:58 +02:00
Sylvain
a7a929ddbc integration unit test for imports + fixed import result colors in UI + fixed test fixtures 2019-10-01 14:32:30 +02:00
Sylvain
193e81e711 Merge branch 'uvsq' into dev 2019-09-30 15:34:21 +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
ba3161589c update users through CSV import 2019-09-30 12:19:33 +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