Sylvain
fc5b935495
helpers between reservables screens
2020-02-26 17:30:27 +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
222590ae5e
tour step modal: increase width + align buttons
2020-02-26 09:37:21 +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
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
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
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
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
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
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
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
35d9bec8a5
update event recurrent
2020-01-29 17:20:19 +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
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
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
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
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
3c3e806a29
Merge branch 'user-confirmation' into dev
2020-01-07 10:34:25 +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
62c979cfc0
members filters, translations for other languages are still needed
2019-12-20 15:47:42 +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
510c802ab1
messages variations depending on slot duration
2019-12-09 10:27:50 +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
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
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
bb777227d6
display events of external ics in calendar
2019-11-27 13:59:56 +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
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
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
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
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
f94d8feba6
[feature] admin can delete an user
2019-10-29 09:59:21 +01:00
Sylvain
528e6f5e55
admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value
2019-10-21 15:24:27 +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
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
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
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
a7a929ddbc
integration unit test for imports + fixed import result colors in UI + fixed test fixtures
2019-10-01 14:32:30 +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
Sylvain
a532efd198
upload csv file to the server through the API and save it on the disk
2019-09-24 17:42:50 +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
588010ac0b
[feature] Optional reCaptcha checkbox in sign-up form
2019-09-23 17:46:46 +02:00
Sylvain
de1cc2013a
[bug] after disabling a group, its associated plans are hidden from the interface
...
+ validate server-side that there's no more user in the group to disable
2019-09-19 15:34:21 +02:00
Sylvain
7d26932f6c
configure accounting codes & labels for wallet clients and other means clients
2019-09-19 11:51:14 +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
1fa36d4029
renamed avoir_mode to payment_method
2019-09-17 14:48:06 +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
9d2e17d5d6
[bug] once a reservation was made, the reminder of the paid price is always 0 if a coupon was used
2019-09-12 12:25:13 +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
53e02622b9
[bug] disabled groups still appears as available in sign-up modal
2019-09-12 11:14:04 +02:00
Sylvain
9fc3c7f61c
[bug] Wallet credit inputs does not allow to put zeros at the end of the decimal part of the amount
2019-09-11 13:05:10 +02:00
Sylvain
4d0ac9b3ca
using stp_payment_intent_id instead of stp_invoice_id on new invoices
2019-09-10 16:45:45 +02:00
Sylvain
04f17d44d8
handle sca in js frontend
2019-09-10 12:46:02 +02:00
Nicolas Florentin
e94cf46fa4
ongoing work on sca stripe
2019-09-09 17:37:54 +02:00
Sylvain
510533e080
handle 2nd confirmation on server + display confirmation modal on the client
2019-09-05 17:17:51 +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
12d8c65fa2
async generation of export and download cached csv using hidden iframe
2019-07-31 15:47:02 +02:00
Sylvain
a7f68b59dd
connect the export modal to the api
2019-07-31 12:00:52 +02:00
Sylvain
22d84e86f5
export modal
2019-07-31 11:10:10 +02:00
Sylvain
a9ea4057f3
interface to customize accounting codes and labels
2019-07-30 16:06:35 +02:00
Sylvain
ddbb492ace
[bug] abuses reports are not notified to admins
2019-06-26 12:55:38 +02:00
Sylvain
2d92df3ebb
do not delete the user if superadmin + fix text alert
2019-06-17 11:12:05 +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
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
17fbd6b465
multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription
2019-06-05 12:11:51 +02:00