rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-10 21:24:20 +01:00
Code Issues Releases Activity
2,908 Commits 15 Branches 273 Tags 82 MiB
1ad0720711
Commit Graph

583 Commits

Author SHA1 Message Date
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
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
db29673a4c remove twitter api for get latest tweet 2020-01-15 12:34:51 +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
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
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
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
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
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
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
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +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
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +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
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
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
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
528e6f5e55 admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value 2019-10-21 15:24:27 +02:00
Sylvain
9e1e23f268 [bug] unauthorized user can see the edit project form 2019-10-16 15:21:50 +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
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
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
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
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +02:00
Sylvain
3348539fdf export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros) 2019-09-17 12:35:34 +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
53e02622b9 [bug] disabled groups still appears as available in sign-up modal 2019-09-12 11:14:04 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
ac0489a496 [bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca) 2019-09-10 17:57:46 +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
e32825675c [ongoing] fixing accounting export service 2019-07-31 16:52:11 +02:00
Sylvain
12d8c65fa2 async generation of export and download cached csv using hidden iframe 2019-07-31 15:47:02 +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
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
0714878bca [bug] unable to generate a refund 2019-07-29 12:07:22 +02:00
Sylvain
50373b6609 [bug] cookie consent modal is not shown 2019-06-17 14:57:11 +02:00
Sylvain
2d92df3ebb do not delete the user if superadmin + fix text alert 2019-06-17 11:12:05 +02:00
Sylvain
84c90cdef3 ignore cookies modal if GA is disabled 2019-06-13 14:00:43 +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
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
6f87873b2c fix init member group when created from signup modal 2019-06-05 16:09:11 +02:00
Sylvain
5c57bcc7c6 defer member search in admin panel to optimize requesting 2019-06-05 15:35:27 +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
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
21c7484396 notify admin about notifications sent 2019-04-25 12:04:16 +02:00
Sylvain
8369e2e78e fix: restore current policy on dropdown selection 2019-04-25 11:58:42 +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
caf6054e66 convert es6 to es5 in erb file 2019-04-18 16:01:58 +02:00
Sylvain
d9ce766f42 using ruby interpretation for SettingsController 2019-04-18 15:58:45 +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
79c3cfaa27 prevent the user to close the modal modal while closing a period 2019-04-03 14:31:39 +02:00
Sylvain
722d5d36e7 check server-side that periods match length requirements + explain requirements to user before closing 2019-04-03 13:04:19 +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
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
4f418cc3fb compute total without taxes + fix close period date pickers + improved archived % number format 2019-03-12 13:36:10 +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
279a958e46 download accounting period archive through interface 2019-02-25 17:22:54 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
9f765009a8 [bug] unable to create oauth2 sso 
[bug] application failed when sso activated
[bug] missing translations in oauth2 forms
 2019-02-14 12:25:37 +01:00
Sylvain
ffe5516d10 prevent closing an accounting period if any checksum error in period 2019-02-12 17:38:44 +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
1db5e76bc9 tests on accounting periods + force reload periods when opening periods/avoir modal 2019-01-10 15:12:22 +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
84aa0c75ff fix date on period closing + improved confirmation msg 2019-01-08 11:58:37 +01:00
Sylvain
ccff40b226 handle dates default values and limits in close period modal 2019-01-08 11:19:07 +01:00
Sylvain
12c25389fa Merge branch 'dev' into us78 2019-01-08 09:56:22 +01:00
Sylvain
859544565b [bug] first day of week is ignored in statistics custom filter 2019-01-08 09:38:35 +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
4af3e19cd0 accounting periods API 2019-01-07 12:47:53 +01:00
Sylvain
0a59dc6b5d display previous closings in modal 2019-01-07 10:50:10 +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
bd6584f529 code improvement 2019-01-03 16:50:50 +01:00
Sylvain
105bcf6236 [ongoing] interface to close an accounting period 2019-01-03 16:48:52 +01:00
Sylvain
ea0ec47268 [bug] error handling does not work in some cases 2019-01-03 12:22:34 +01:00
Sylvain
39ab5a7ba9 [bug] unable to fetch projects from OpenProjects (#126) 2019-01-02 13:53:27 +01:00