Sylvain
|
40e8b60a0a
|
add ach pluralization fonction for messageFormat
|
2019-12-23 10:28:12 +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
|
6aa3c0caeb
|
Notify all admins on the creation of a refund invoice
|
2019-12-09 11:55:31 +01:00 |
|
Sylvain
|
60755a2c2a
|
Merge remote-tracking branch 'origin/fix-time-now' into dev
|
2019-12-03 15:51:22 +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
|
cca6b14f58
|
import events asyncronously from icalendar
|
2019-12-02 15:53:24 +01:00 |
|
Nicolas Florentin
|
77cf8c8218
|
replaces almost all Time.now by DateTime.current
|
2019-12-02 11:57:25 +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
|
a9b1eabb2c
|
[poc] show google agenda events in the public calendar
|
2019-11-27 13:51:23 +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
|
68b17cbe9a
|
Ability to show the scheduled events in the admin calendar
|
2019-11-25 14:49:39 +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
|
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
|
cdc30e0da2
|
configure the slots duration with an environment variable
|
2019-10-29 16:52:52 +01:00 |
|
Sylvain
|
1ed3eba129
|
[feature] export last connection date to members.xlsx
|
2019-10-29 11:09:17 +01: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
|
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
|
0d3cc0fe40
|
[feature] Ability to disable invoices generation and interfaces
|
2019-09-30 15:29:20 +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
|
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
|
1fa36d4029
|
renamed avoir_mode to payment_method
|
2019-09-17 14:48:06 +02:00 |
|
Sylvain
|
aef4cc49f2
|
fixes accounting codes setting + improved error handling
|
2019-09-17 13:00:25 +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
|
539eb08b89
|
ability to disable the online payments through an env var
|
2019-09-11 17:08:00 +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
|
967f539ad9
|
[ongoing] update to stripe-js:v3 to use strong customer authentication
|
2019-09-04 17:20:18 +02:00 |
|
Sylvain
|
bebb3354fb
|
[bug] (#140) VAT rate is erronous in invoices
|
2019-08-14 10:56:30 +02:00 |
|
Sylvain
|
92d79bc9c7
|
[bug] (#140) VAT rate is erronous in invoices
|
2019-08-14 10:54:23 +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
|
3d3be70e29
|
[bug] newly generated refund is displayed as broken
|
2019-07-29 12:25:46 +02:00 |
|
Sylvain
|
a778b1063a
|
enhance ruby syntax
|
2019-07-29 12:17:57 +02:00 |
|
Sylvain
|
0714878bca
|
[bug] unable to generate a refund
|
2019-07-29 12:07:22 +02:00 |
|
Sylvain
|
38d3ddd48a
|
[bug] export members list to excel is broken
|
2019-07-10 11:27:45 +02:00 |
|
Sylvain
|
ddbb492ace
|
[bug] abuses reports are not notified to admins
|
2019-06-26 12:55:38 +02:00 |
|
Sylvain
|
85f4182b2f
|
[bug] projects RSS feed fails to render
|
2019-06-24 11:03:40 +02:00 |
|
Sylvain
|
5cd977b4dd
|
ruby syntax + may fix #132?
|
2019-06-13 16:53:36 +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
|
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
|
a53c6e80e7
|
move invoice->operator to invoicing_profile + minor fixes to handle user deletion
|
2019-06-12 12:22:38 +02:00 |
|
Sylvain
|
cfd33c3a52
|
migrate projects to statistic_profile
|
2019-06-06 16:34:53 +02:00 |
|
Sylvain
|
fe2a6f7120
|
migrate trainings to statistic_profile and adjust code
|
2019-06-06 12:00:21 +02:00 |
|
Sylvain
|
660a8abe8b
|
fix statistic_profile
|
2019-06-05 12:24:01 +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 |
|
Sylvain
|
4c033614ae
|
[ongoing] migrate subscriptions & reservations to statistic_profile
|
2019-06-04 16:50:23 +02:00 |
|
Sylvain
|
52992ac9d5
|
move gender & birthday to statistic_profile
|
2019-06-04 13:33:00 +02:00 |
|
Sylvain
|
9ef2f142bd
|
link HistoryValue to InvoicingProfile + improved invoices tests
|
2019-06-03 16:51:43 +02:00 |
|
Sylvain
|
7ed97ef35a
|
link wallet & its transactions to invoicingprofile
|
2019-06-03 16:00:09 +02:00 |
|
Sylvain
|
6011f27268
|
finish moving organization & address to invoiving profile: fix create & edit user
|
2019-06-03 12:06:01 +02:00 |
|
Sylvain
|
a211ad39ff
|
moving organization & address to invoicingProfile + refactored doc about postgre
|
2019-05-29 14:28:14 +02:00 |
|
Sylvain
|
142e07f3c9
|
update code to use invoicingprofile
|
2019-05-29 12:01:24 +02:00 |
|
Sylvain
|
ffbca98276
|
[ongoing] fix api to use the invoicing_profile
|
2019-05-28 16:49:36 +02:00 |
|
Sylvain
|
b423d9fce7
|
add link to interface in abuse report mail
|
2019-05-21 12:38:07 +02:00 |
|
Sylvain
|
7bbea22e76
|
display reports in interface
|
2019-05-21 11:49:50 +02:00 |
|
Sylvain
|
dd4b6e2cb1
|
[ongoing] abuses management interface
|
2019-05-09 18:27:19 +02:00 |
|
Sylvain
|
26b901ebb5
|
[bug#131] Availabilities export report an erroneous number of reservations for machine availabilities
|
2019-05-07 12:24:51 +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
|
7a2fc7c42e
|
[ongoing] save as draft or publish
|
2019-04-18 15:57:56 +02:00 |
|
Sylvain
|
43ff06c35d
|
fixed and improved translations
|
2019-04-18 11:35:09 +02:00 |
|
Sylvain
|
9f8d24ec4f
|
paginate list of coupons
|
2019-04-04 17:28:29 +02:00 |
|
Sylvain
|
c223bd99ea
|
add loader while archive is not ready
|
2019-04-04 12:55:21 +02:00 |
|
Sylvain
|
c786ba6edb
|
notify user about archiving
|
2019-04-04 11:37:23 +02:00 |
|
Sylvain
|
93ff761e64
|
[bug] Error :syntax when using quote in event category name
|
2019-04-02 16:19:23 +02:00 |
|
Sylvain
|
7a317b7e45
|
[bug] unable to add a file attachment to an event
|
2019-03-28 11:30:25 +01:00 |
|
Sylvain
|
75310d599f
|
Merge branch 'host' into dev
|
2019-03-26 14:33:30 +01:00 |
|
Sylvain
|
01ac73a1a1
|
removed capistrano & unicorn + cleaned lacasemate brading
|
2019-03-26 10:40:58 +01:00 |
|
Sylvain
|
2ac0336adb
|
Merge branch 'dev' into host
|
2019-03-25 16:17:23 +01:00 |
|
Sylvain
|
5cdaa014ef
|
[security] updated devise + updated rails
|
2019-03-25 14:57:48 +01:00 |
|
Sylvain
|
8530a6f655
|
superadmin + fixed free space notification
|
2019-03-20 16:49:38 +01:00 |
|
Sylvain
|
03c0c0d4fb
|
close periods at 1 year minus 1 day + fix alert reminder transalation
|
2019-03-18 14:45:21 +01:00 |
|
Sylvain
|
7b0824a4a3
|
notify admins when no accounting period closed for 1 year
|
2019-03-18 14:33:30 +01:00 |
|
Sylvain
|
4f418cc3fb
|
compute total without taxes + fix close period date pickers + improved archived % number format
|
2019-03-12 13:36:10 +01:00 |
|
Sylvain
|
b9e427a9fc
|
include VAT in archives
|
2019-03-12 12:15:14 +01:00 |
|
Sylvain
|
2a32bc4752
|
date the archives
|
2019-03-11 16:25:51 +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
|
f11f629bcf
|
compute, secure and archive period total and cumulative total of each accounting period
|
2019-02-25 14:51:19 +01:00 |
|
Sylvain
|
cf23fae73c
|
Merge branch 'dev' into host
|
2019-02-14 16:35:38 +01:00 |
|
Sylvain
|
7b573dd37f
|
restored deprecated notification
|
2019-02-14 13:05:09 +01:00 |
|
Sylvain
|
2ba3890325
|
display records integrity status
|
2019-02-12 16:00:36 +01:00 |
|
Sylvain
|
f9364b3872
|
chains invoice and invoiceItem records. save them in archives
|
2019-02-12 14:45:21 +01:00 |
|
Sylvain
|
6e274afe3b
|
accounting archive: insert code checksum and previous archive checksum
|
2019-01-31 12:19:50 +01:00 |
|
Sylvain
|
da672ea8b6
|
Merge branch 'dev' into host
|
2019-01-21 16:34:06 +01:00 |
|
Sylvain
|
75eaf4d4d0
|
improved member autocompletion with multiple words + refactored members controller
|
2019-01-21 15:17:56 +01:00 |
|
Sylvain
|
d2c4773ac9
|
[bug] unable to delete an admin who has changed a setting
|
2019-01-16 17:09: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
|
f6e236aeb5
|
refactored roles methods to match ruby conventions
|
2019-01-14 12:57:31 +01:00 |
|
Sylvain
|
a2eb10331e
|
[ongoing] remove invoicing disabled per user
|
2019-01-10 16:50:54 +01:00 |
|
Sylvain
|
4b5bd74188
|
add invoice_items in accounting archive
|
2019-01-10 13:05:57 +01:00 |
|
Sylvain
|
b42d1614fd
|
export to flat json files closed periods
|
2019-01-10 10:52:29 +01:00 |
|
Sylvain
|
5e8172af35
|
Merge branch 'dev' into us78
|
2019-01-09 16:28:36 +01:00 |
|
Sylvain
|
5ab0333176
|
rubocop invoice & avoir
|
2019-01-09 16:28:23 +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
|
f2eaf4e4e1
|
improved tests and bug fixes
|
2018-12-11 17:27:25 +01:00 |
|
Sylvain
|
6794b12555
|
force gawk during elastic upgrade & rubocop
|
2018-12-03 15:10:04 +01:00 |
|
Sylvain
|
9af1e5c658
|
fixed User.to_json
|
2018-07-24 11:13:05 +02:00 |
|
Sylvain
|
7afe62522f
|
refactor User.as_json to use jbuilder template
|
2018-07-04 14:05:44 +02:00 |
|
Sylvain
|
679ccfec99
|
ability to share trainings on social medias
|
2018-01-09 15:09:48 +01:00 |
|
Sylvain
|
290b2ad513
|
[bug] facebook sharing of event has HTML tags in description
|
2018-01-09 15:02:45 +01:00 |
|
Sylvain
|
12c6cd2a70
|
Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
|
2017-11-20 11:43:40 +01:00 |
|
Sylvain
|
639610dc7a
|
[bug] unable to display profiles of users whom any reservation is associated with a deleted object
|
2017-11-13 11:15:33 +01:00 |
|
Sylvain
|
f4fd919dde
|
display disabled status for machines & trainings in openAPI
|
2017-10-11 16:03:04 +02:00 |
|
Sylvain
|
1c8d362f11
|
ability to disable space
|
2017-10-11 14:58:38 +02:00 |
|
Sylvain
|
c67360771a
|
ability to disable machine
|
2017-10-11 12:10:05 +02:00 |
|
Sylvain
|
5ce6d4486e
|
fix profile complete mail template for non imported users
|
2017-10-11 11:56:43 +02:00 |
|
Sylvain
|
4752fce762
|
disable required training modal for machines associated with disabled trainings
|
2017-10-10 18:12:07 +02:00 |
|
Sylvain
|
05d9e62dd2
|
ability to disabled training
|
2017-10-10 17:16:43 +02:00 |
|
Sylvain
|
189665e53b
|
[ongoing] prevent disable group with users + [ongoing] hide disabled groups
|
2017-10-05 17:54:44 +02:00 |
|
Sylvain
|
c5f0501df2
|
enable/disable group
|
2017-10-05 16:48:18 +02:00 |
|
Sylvain
|
26d79e5b12
|
disable a plan
|
2017-10-04 18:56:39 +02:00 |
|
Sylvain
|
601ac177b6
|
[bug] rendering for social networks shares
|
2017-09-26 15:48:47 +02:00 |
|
siteswapjuggler
|
5fe1a53237
|
double slashes correction in open API event JSON
correction of the double slash as requested
|
2017-09-24 18:37:08 +02:00 |
|
siteswapjuggler
|
52071c7b83
|
Merge remote-tracking branch 'LaCasemate/master'
|
2017-09-10 12:01:59 +02:00 |
|
Sylvain
|
d092a1c5ea
|
admin can lock and unlock availbilities
|
2017-09-06 15:01:41 +02:00 |
|
siteswapjuggler
|
73c9e301fb
|
open api events improvement
new data available: start_at, end_at, event_image
new controllers: id, upcoming, limit
|
2017-09-03 13:55:38 +02:00 |
|
Sylvain
|
dcf55d8351
|
[bug] invalid notification text when sending amount coupon
|
2017-08-29 16:10:16 +02:00 |
|
Sylvain
|
295dc3749b
|
[bug] filename too long on events&prices API + updated axlsx
|
2017-08-16 12:05:04 +02:00 |
|
Sylvain
|
00d157dc3b
|
[bug] filename too long error on GET api/groups
|
2017-07-26 10:15:47 +02:00 |
|
Sylvain
|
3e44d62aac
|
[bug] filename too long error on GET api/trainings
|
2017-07-18 10:55:41 +02:00 |
|
Sylvain
|
8531168ba2
|
improve RSS with project author and image + event dates image and category
|
2017-05-17 12:18:20 +02:00 |
|
Sylvain
|
89e30980e0
|
[bug] unable to set locale other than fr or en
|
2017-04-27 18:35:00 +02:00 |
|
Peng DU
|
1d53e3b5b7
|
fix json template of training reservation
|
2017-03-28 19:53:48 +02:00 |
|
Sylvain
|
d8b8c39cb3
|
add day of week to availabilities export
|
2017-03-02 13:31:12 +01:00 |
|
Sylvain
|
c21f7ed5dc
|
export events availabilities
|
2017-03-02 13:05:29 +01:00 |
|
Sylvain
|
056060a88d
|
export spaces availabilities
|
2017-03-02 12:57:07 +01:00 |
|
Sylvain
|
d9b30fa2b0
|
export trainings availabilities
|
2017-03-02 12:44:59 +01:00 |
|
Sylvain
|
504fe49964
|
export machines availabilities
|
2017-03-02 12:34:28 +01:00 |
|
Sylvain
|
4d09ed37a3
|
export machines availabilities
|
2017-03-02 12:34:16 +01:00 |
|
Sylvain
|
13689fd707
|
set spaces disabled by default
|
2017-03-01 15:50:49 +01:00 |
|