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
Sylvain
52992ac9d5
move gender & birthday to statistic_profile
2019-06-04 13:33:00 +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
9c2598d405
ability to delete processed reports
2019-05-21 12:24:45 +02:00
Sylvain
dfb0ea12f0
style component
2019-05-21 11:57:44 +02:00
Sylvain
7bbea22e76
display reports in interface
2019-05-21 11:49:50 +02:00
Sylvain
630809b91f
moved abuses panel to admin zone + fix loading template
2019-05-21 11:16:12 +02:00
Sylvain
dd4b6e2cb1
[ongoing] abuses management interface
2019-05-09 18:27:19 +02:00
Sylvain
10a87eb4cb
refactored project list translations
2019-05-09 16:09:20 +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
d0f0a293f3
save as draft or publish
2019-04-18 16:55:50 +02:00
Sylvain
7a2fc7c42e
[ongoing] save as draft or publish
2019-04-18 15:57:56 +02:00
Sylvain
8fae8b104d
admin interface to customize privacy policy page
2019-04-18 12:30:00 +02:00
Sylvain
5bdaebb2f2
privacy policy public page
2019-04-18 12:00:57 +02:00
Sylvain
43ff06c35d
fixed and improved translations
2019-04-18 11:35:09 +02:00
Sylvain
44479b5597
allow filtering coupons list
2019-04-04 18:00:19 +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
8e895e6b6a
force user to use datepicker in close period modal
2019-04-03 14:47:39 +02:00
Sylvain
93ff761e64
[bug] Error :syntax when using quote in event category name
2019-04-02 16:19:23 +02:00
Sylvain
a50bb63b64
prevent double validation while closing period
2019-03-27 17:37:36 +01:00
Sylvain
fc04886e89
prevent generate refund before first accounting period
2019-03-27 16:46:08 +01:00
Sylvain
be6b82fda1
improved VAT history + updated changelog + added instruction on watermark localisation
2019-03-27 15:50:38 +01:00
Sylvain
ea2a73cdc1
add asterisks on required fields
2019-03-26 17:20:10 +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
fd55c8d315
use SHA-3 (256 bits) to compute checksums + simplify accounting period integrity check UI
2019-03-21 17:15:41 +01:00
Sylvain
bf526458b4
add label to accounting period button
2019-03-20 11:56:03 +01:00
Sylvain
4e7a62bc2b
[ongoing] close period for max 1 year + force contiguous periods + fix totals
2019-03-12 09:14:20 +01:00
Sylvain
b940ae0327
display complete info set on accounting archives
2019-03-11 16:11:49 +01:00
Sylvain
279a958e46
download accounting period archive through interface
2019-02-25 17:22:54 +01:00
Sylvain
ffe5516d10
prevent closing an accounting period if any checksum error in period
2019-02-12 17:38:44 +01:00
Sylvain
2ba3890325
display records integrity status
2019-02-12 16:00:36 +01:00
Sylvain
da672ea8b6
Merge branch 'dev' into host
2019-01-21 16:34:06 +01:00
Sylvain
da4c9cf26f
[bug] invalid translation of title in new partner modal + refactored plans controller
2019-01-21 16:27:59 +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
a2eb10331e
[ongoing] remove invoicing disabled per user
2019-01-10 16:50:54 +01:00
Sylvain
2f17d90054
remove button 'generate refund' for invoices within closed periods
2019-01-09 17:07:15 +01:00
Sylvain
9fac706da8
validates accounting periods on creation + prevent refunding on closed periods (client only)
2019-01-08 17:32:45 +01:00
Sylvain
ccff40b226
handle dates default values and limits in close period modal
2019-01-08 11:19:07 +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
0a59dc6b5d
display previous closings in modal
2019-01-07 10:50:10 +01:00
Sylvain
c35029d205
i18n for close period modal
2019-01-03 17:51:24 +01:00
Sylvain
3fda7562d4
Merge branch 'dev' into us78
2019-01-03 17:40:04 +01:00
Sylvain
6637832d00
refactored frontend invoices translations
2019-01-03 17:39:50 +01:00
Sylvain
105bcf6236
[ongoing] interface to close an accounting period
2019-01-03 16:48:52 +01:00
Sylvain
93dd1491cd
[bug] unable to create or edit a plan
2019-01-02 16:49:09 +01:00
Sylvain
8d4b354199
[bug] change group button overflow
2018-10-15 16:51:44 +02:00
Sylvain
2126a199e0
Ability to set a neutral gender for the fablab's title ( #108 )
2018-09-18 16:40:50 +02:00
Sylvain
1e3066f6f4
Ability to parametrize machines order on the booking page
2018-09-18 15:30:54 +02:00
Sylvain
a26e8edf19
fix rendering issues in settings
2018-09-18 14:38:43 +02:00
Sylvain
1b33f3c865
display the machine reservation user name to other members
2018-07-24 12:24:51 +02:00
Nicolas Florentin
a29ba926c0
fix events/index order, frontend js code was conflicting with server-side behaviour
2017-12-18 16:15:38 +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
497ad71591
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2017-11-02 15:34:09 +01:00
Sylvain
73a62bd9a0
[feature] allow setting decimal prices
2017-11-02 15:33:56 +01:00
Sylvain
90fe4e313b
hide reserve button on machine details page is machine is disabled
2017-10-16 14:04:55 +02:00
Sylvain
cc94a19ba6
hide disabled spaces in admin pricing area
2017-10-11 15:50:18 +02:00
Sylvain
f8f45bcb69
filter and hide disabled spaces in list
2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11
ability to disable space
2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e
hide disabled machine in admin pricing zone + prevent creating negative credits
2017-10-11 14:48:03 +02:00
Sylvain
45465e8b59
prevent associate disabled machines w/ training
2017-10-11 13:00:46 +02:00
Sylvain
c9c7fe00c5
filter disabled machines in list + improve responsiveness
2017-10-11 12:54:13 +02:00
Sylvain
c67360771a
ability to disable machine
2017-10-11 12:10:05 +02:00
Sylvain
41eef71ead
fix c/p issue + prevent link disabled training to user
2017-10-11 11:40:21 +02:00
Sylvain
4090fe2119
filter trainings list by status
2017-10-10 17:38:01 +02:00
Sylvain
05d9e62dd2
ability to disabled training
2017-10-10 17:16:43 +02:00
Sylvain
33b146d243
hide disabled groups
2017-10-10 15:44:17 +02:00
Sylvain
189665e53b
[ongoing] prevent disable group with users + [ongoing] hide disabled groups
2017-10-05 17:54:44 +02:00
Sylvain
fb092afc8c
filter enabled/disabled groups
2017-10-05 17:12:22 +02:00
Sylvain
c5f0501df2
enable/disable group
2017-10-05 16:48:18 +02:00
Sylvain
40bf22279e
add warning on plan disabling
2017-10-05 15:44:06 +02:00
Sylvain
a9cce55855
plan disabling: hide everywhere + filter in admin filter
2017-10-05 15:32:20 +02:00
Sylvain
26d79e5b12
disable a plan
2017-10-04 18:56:39 +02:00
Sylvain
dbff2d1745
events list: change buttons to anchors to allow opening in background tab
2017-09-26 09:44:55 +02:00
Sylvain
f874748f74
[bug] fix events monitoring pagination
2017-09-25 15:48:21 +02:00
siteswapjuggler
70cf6ebfa8
cancel and sold out badge in event list
...
Public event list prompte cancelled and sold out badge for more clarity
to the public users.
Correction for « sold_out » test in home, show and public list. 0
subscriber with 0 free_place should be a free entry case and it appears
to be sold out.
Another error occurs (negative free place) if an admin change the
number of free places or decide to go free entry with an event.
Home and public list better display with access and price separate.
2017-09-24 21:51:58 +02:00
siteswapjuggler
22982a2356
Merge remote-tracking branch 'LaCasemate/master'
2017-09-24 18:17:58 +02:00
siteswapjuggler
37bdfcb96f
pull request modification
...
Modification as requested for the pull request.
2017-09-24 15:12:46 +02:00
Sylvain
8d92f8492a
removed full-calendar hack, improved remove slot precess
2017-09-18 12:42:45 +02:00
Sylvain
54d686f1ac
[bug] home events overflow
2017-09-11 14:10:52 +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
e13817176f
event monitor improvement
...
Many imrovement for the event monitoring admin module.
2017-09-04 00:09:08 +02:00
Nicolas Florentin
d602055e67
In login modal, displays an alert if Caps lock key is pressed
2017-08-31 17:11:46 +02:00
Sylvain
3d4260a3f7
[bug] unable to delete standard group
2017-08-30 14:57:06 +02:00
Sylvain
9c6143bd5e
tooltip about images insertion in medium editor
2017-08-29 17:50:57 +02:00
Sylvain
cf6afb817d
[feature] configuration of max visibility for reservations
2017-08-24 18:34:18 +02:00
Sylvain
42d2c2ee31
[bug] hide spaces in public calendar when disabled
2017-06-13 19:31:48 +02:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
cyril
d1a1b63db5
Project view: added responsive support on external images
2017-04-13 14:26:29 +02:00
cyril
3fcf61de24
hide spaces in admin's credit management if spaces are disabled
2017-03-28 20:13:18 +02:00
Sylvain
5abc85ae0a
[feature] weekly plans
2017-03-21 13:06:02 +01:00
Sylvain
21560dd5d9
show space details on image-click
2017-03-21 12:06:58 +01:00