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
9e2134c9cf
ics sources configuration interface
2019-11-27 16:17:42 +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
5d358efb9f
correct conjugation for event canceled
2019-11-25 10:50:32 +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
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
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
e8930924e4
[bug] do not display each days in invoices for multiple days event reservation
2019-10-16 16:11:37 +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
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
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
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
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
7d26932f6c
configure accounting codes & labels for wallet clients and other means clients
2019-09-19 11:51:14 +02:00
Sylvain
c76563f22f
wallet label in accounting export
2019-09-19 11:25:12 +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
52afb6ef07
[bug] extend a current subscription for a member, does not reset his credits
2019-09-12 11:37:03 +02:00
Sylvain
539eb08b89
ability to disable the online payments through an env var
2019-09-11 17:08:00 +02:00
Sylvain
04f17d44d8
handle sca in js frontend
2019-09-10 12:46:02 +02:00
Sylvain
e9e27663cd
quick coding rules checking with rubocop
2019-09-09 18:04:31 +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
26c98394ac
fixed export service
2019-08-01 09:49:09 +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
a9ea4057f3
interface to customize accounting codes and labels
2019-07-30 16:06:35 +02:00
Sylvain
ab295f064d
service to export invoices into a given period to CSV lines for an accounting sofware
2019-07-29 17:51:53 +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
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
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
52992ac9d5
move gender & birthday to statistic_profile
2019-06-04 13:33:00 +02:00
Sylvain
b423d9fce7
add link to interface in abuse report mail
2019-05-21 12:38:07 +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
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
c786ba6edb
notify user about archiving
2019-04-04 11:37:23 +02:00
Sylvain
8a6ff0c093
prevent closing a period not in the past
2019-04-03 17:27:25 +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
ea2a73cdc1
add asterisks on required fields
2019-03-26 17:20:10 +01:00
Sylvain
8530a6f655
superadmin + fixed free space notification
2019-03-20 16:49:38 +01:00
Sylvain
bf526458b4
add label to accounting period button
2019-03-20 11:56:03 +01:00
Sylvain
7b0824a4a3
notify admins when no accounting period closed for 1 year
2019-03-18 14:33:30 +01:00
Sylvain
857b1cebba
fix accounting period checksum + improved period validation
2019-03-12 15:26:17 +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
cf23fae73c
Merge branch 'dev' into host
2019-02-14 16:35:38 +01:00
Sylvain
0d0c378b33
missing translations in new authentication provider form
2019-02-14 10:00:19 +01:00
Sylvain
ffe5516d10
prevent closing an accounting period if any checksum error in period
2019-02-12 17:38:44 +01:00
Sylvain
da672ea8b6
Merge branch 'dev' into host
2019-01-21 16:34:06 +01:00
Sylvain
d2c4773ac9
[bug] unable to delete an admin who has changed a setting
2019-01-16 17:09:27 +01:00
Sylvain
b9e7276394
fix missing translation
2019-01-16 12:08: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
35638d611b
validates invoice&avoir creation to prevent any creation in closed period
2019-01-09 16:54:09 +01:00
Sylvain
5bee554fa5
Merge branch 'dev' into us78
2019-01-09 10:55:22 +01:00
Sylvain
3536ae95b1
[bug] invalid rails DSB locale
2019-01-08 17:34:12 +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
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
6637832d00
refactored frontend invoices translations
2019-01-03 17:39:50 +01:00
Sylvain
9fe828f51c
improved translations
2019-01-02 17:11:18 +01: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
1b33f3c865
display the machine reservation user name to other members
2018-07-24 12:24:51 +02:00
Juan Pedro Torres
3a1dd822f5
Solved sign_up/sign_in error
...
Changed traduction on Sign_up and Sign_in.
2018-01-24 14:31:39 +01:00
jmrodriguesgoncalves
40f6796743
Missing translation fixed
2017-12-12 10:14:21 -05:00
jmrodriguesgoncalves
7e640b9508
Removed #translation_fixed comments
2017-12-12 09:57:13 -05:00
jmrodriguesgoncalves
0a1b64f1de
Added missing translation bits
2017-12-11 18:56:38 -05:00
Sylvain
12c6cd2a70
Merge branch 'siteswapjuggler-master' into dev
...
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
5438fa4b16
added newlines at end of files
2017-11-20 09:58:37 +01:00
Sylvain
aa2f45ee6e
Merge branch 'clemclemmm-master' into dev
2017-11-20 09:52:36 +01:00
Sylvain
a8803cb7bc
Merge branch 'master' of https://github.com/clemclemmm/fab-manager into clemclemmm-master
2017-11-20 09:52:17 +01:00
Sylvain
e043e76f47
add newline at end of file
2017-11-20 09:48:35 +01:00
Sylvain
06cf85d733
fix rails.fa-CM.yml syntax
2017-11-20 09:39:05 +01:00
Sylvain
8500bff648
Merge branch 'dev' of https://github.com/alexcvcoelho/fab-manager into alexcvcoelho-dev
2017-11-20 09:34:11 +01:00
Sylvain
c4e93eeb27
Merge branch 'master' of https://github.com/bmohamet/fab-manager into bmohamet-master
2017-11-20 09:29:33 +01:00
bmohamet
5809f9d6db
Create rails.fr-CM.yml
...
Adding FCA currency for Cameroon and Central Africa
2017-11-17 12:10:28 +01:00
Alex Coelho
1316550f40
Update Portuguese translations
2017-11-16 01:08:34 -02:00
Alex Coelho
5241801a3b
Merge branch 'dev' of github.com:alexcvcoelho/fab-manager
2017-11-15 23:36:43 -02:00
Clément CHADEYRON
4a3995604c
add spanish translation
...
translation made spain by :
Smart Open Lab
2017-11-06 14:15:22 +01: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
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
5ce6d4486e
fix profile complete mail template for non imported users
2017-10-11 11:56:43 +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
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
25eb24e516
Confirmation and error handling while deleting an event
2017-10-02 13:14:15 +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
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
03b5b8bfae
fix typo in FR
2017-09-18 11:00:42 +02:00
siteswapjuggler
52071c7b83
Merge remote-tracking branch 'LaCasemate/master'
2017-09-10 12:01:59 +02:00
Sylvain
404101ccd4
english and portuguese translations
2017-09-07 10:47:18 +02:00
Sylvain
273ec5317d
disallow locking availabilities if it has any non-cancelled reservations
2017-09-06 18:07:56 +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
dcf55d8351
[bug] invalid notification text when sending amount coupon
2017-08-29 16:10:16 +02:00
Sylvain
cf6afb817d
[feature] configuration of max visibility for reservations
2017-08-24 18:34:18 +02:00
Sylvain
2ccc9e9dbd
[bug] missing translation for EN and PT
2017-08-24 12:46:58 +02:00
Sylvain
6cbdbc932c
fix interpolation variable in portuguese
2017-06-07 17:20:57 +02:00
Sylvain
3ca6b9c9c1
fix about title concordance in portuguese
2017-06-07 16:51:11 +02:00
Sylvain
b4332c9bc7
fix html closing tags in portuguese translations
2017-06-07 16:46:42 +02:00
Sylvain
3bf91efe8f
fixed messageformat syntax in Portuguese
2017-06-07 16:26:39 +02:00
Sylvain
3a6af68b67
Merge branch 'dev' into alexcvcoelho-master
2017-06-07 16:03:31 +02:00
Alex Coelho
1ef80f8bd8
Prtuguese translations in app.*.pt.yml files
2017-06-01 14:33:16 -03:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
Alex Coelho
f3634e6891
Translate pt-BR
2017-05-11 14:15:23 -03:00
Alex Coelho
0ac53733c9
Translate pt-BR for version 2.5.4
2017-05-11 11:31:12 -03:00
Alex Coelho
e8cacb36a1
Update branch
2017-05-11 11:00:37 -03:00
Sylvain
ca012322fb
fixed rails locales files
2017-04-27 17:08:17 +02:00
Sylvain
1f7bf2a591
Rails l10n support for 115 new locations
2017-04-27 14:22:07 +02:00
Sylvain
5abc85ae0a
[feature] weekly plans
2017-03-21 13:06:02 +01:00
Sylvain
8e206cd3c5
[bug] subscription name is not shown in invoices
2017-03-15 16:31:51 +01:00
Sylvain
796f0a87ae
ability to remove an unused custom price for an event ( #61 )
2017-03-02 18:36:54 +01:00
Sylvain
853a3160d3
add notice about availabilities export
2017-03-02 13:39:49 +01: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
1503e9b83f
fix typo
2017-03-01 14:20:50 +01:00
Sylvain
cf9181770b
export space statistics
2017-03-01 12:56:11 +01:00
Sylvain
b48451f9f8
improved space reservation optional explication message
2017-03-01 11:47:20 +01:00
Sylvain
a0e7e7951f
[ongoing] display spaces in public calendar
2017-02-28 11:59:48 +01:00
Sylvain
b48557fd96
invoice generation for space reservation
2017-02-27 17:42:36 +01:00
Sylvain
8e86c4b212
[ongoing] spaces reservation calendar
2017-02-23 17:45:55 +01:00
Sylvain
32a2a220bf
clean trainings reservation locales
2017-02-23 12:52:54 +01:00
Sylvain
71a3c8b41f
pluralize selection helper in cart
2017-02-22 16:53:58 +01:00
Sylvain
c2c400107d
improved tag management in cart
2017-02-22 11:23:32 +01:00
Sylvain
ce087ae778
refacto wording to make cart reservableType agnostic
2017-02-22 10:51:07 +01:00
Sylvain
7a21a907a8
offer slot from cart + [ongoing] refacto cart translations
2017-02-22 09:44:15 +01:00
Sylvain
a463ad6a2a
[ongoing] refacto cart translations
2017-02-21 17:45:53 +01:00
Sylvain
d463d4dd5a
display spaces in admin calendar
2017-02-15 13:18:03 +01:00
Sylvain
1855935322
interface to create space availabilities
2017-02-15 11:32:29 +01:00
Sylvain
30454c4262
manage space info message + refactor settings translations mapping
2017-02-15 09:48:27 +01:00
Sylvain
36a0eafef3
interface to set credits for spaces
2017-02-14 17:29:52 +01:00
Sylvain
ec4a06a0e4
interface to configure space price per plan + refactored plans interface code
2017-02-14 17:06:42 +01:00
Sylvain
42819b18cb
refactor plan form translations mapping
2017-02-14 16:19:10 +01:00
Sylvain
1554cfe65d
refactor plan translations mapping
2017-02-14 16:09:07 +01:00
Sylvain
93bceb5517
define spaces prices for non-subscribers
2017-02-14 15:25:28 +01:00
Sylvain
334201e551
refactor admin pricing translations mapping
2017-02-14 14:58:16 +01:00
Sylvain
0adb9e29c6
space edition interface
2017-02-14 13:36:10 +01:00
Sylvain
73a5689140
inteface to display spaces
2017-02-14 12:41:51 +01:00
Sylvain
da95e6e0d8
space creation interface
2017-02-14 11:28:07 +01:00
Sylvain
9d367f95db
[ongoing] new space interface
2017-02-13 17:18:06 +01:00
Sylvain
40952600e7
basic interface structure for space management
2017-02-13 17:00:27 +01:00
Sylvain
560bb46383
space db model
2017-02-13 14:38:28 +01:00
Alex Coelho
09af61ab3f
Translate to portuguese-br rails
2017-02-03 15:28:14 -02:00
Alex Coelho
592d7be448
Translate to portuguese-br mails
2017-02-03 15:27:01 -02:00
Alex Coelho
9911566d51
Translate to portuguese-br pt-BR
2017-02-03 15:25:57 -02:00
Alex Coelho
8f40eee51a
Translate to portuguese-br devise
2017-02-03 15:25:25 -02:00
Alex Coelho
d613ab7fb2
Translate to portuguese-br app.shared
2017-02-03 15:24:04 -02:00
Alex Coelho
6b2b15b4c3
Translate to portuguese-br app.public
2017-02-03 15:23:03 -02:00
Alex Coelho
91d5b23dad
Translate to portuguese-br app.logged
2017-02-03 15:22:11 -02:00
Alex Coelho
e558fb4106
Translate to portuguese-br app.admin
2017-02-03 15:20:47 -02:00
Sylvain
c479502dd0
[bug] too many unread notifications cause system memory overflow
2017-01-05 15:06:54 +01:00
Sylvain
9bfaaaccd9
improved numerous notifications display
2016-12-19 17:08:11 +01:00
Sylvain
12aaa7007c
fix a bug about notification email for refunf invoices
2016-12-15 14:27:58 +01:00
Sylvain
102eecdc8a
ability to send again auth migration code
2016-12-15 14:16:24 +01:00
Sylvain
5e1b85832c
[ongoing] resend sso fusion token
2016-12-14 17:14:53 +01:00
Sylvain
d8b6848b1b
sso wording
2016-12-14 15:14:33 +01:00
Sylvain
76c1412177
Merge branch 'wallet_avoir' into dev
2016-12-13 15:33:56 +01:00
Sylvain
ecbe8a58a2
coupon edition: display internationalized errors
2016-12-13 12:46:00 +01:00
Sylvain
9190e61f5f
basic avoir invoice for wallet credit
2016-12-12 15:32:01 +01:00
Sylvain
b44089a33d
interface & api to build avoir for a wallet credit
2016-12-12 14:20:26 +01:00
Sylvain
c2f638934e
added info notice about operation's time of admin delete
2016-12-12 11:18:24 +01:00
Sylvain
10fc7b69e9
Ability to display optional information message on event reservation page
2016-11-29 16:46:19 +01:00
Sylvain
f0e11cf718
fix pdf invoice generation with cash coupon
2016-11-28 09:57:09 +01:00
Sylvain
3ce41f0c5c
[to test] send cash coupon to user by mail
2016-11-24 18:17:49 +01:00
Sylvain
ce6877b484
success message when applying cash coupon
2016-11-24 18:05:16 +01:00
Sylvain
0a08c4c32d
check cash coupons does not exceed cart amount for subscriptions
2016-11-24 16:38:22 +01:00
Sylvain
04e10c8bb6
check cash coupons does not exceed cart amount for trainings & machines
2016-11-24 13:58:41 +01:00
Sylvain
21d887945e
improve translation to make it sex-agnostic
2016-11-23 14:31:58 +01:00
Sylvain
51faeedfa8
fix translation name in plan form
2016-11-23 12:57:33 +01:00
Sylvain
ad2911529c
db model, api and interface for cash coupons
2016-11-23 12:43:42 +01:00
Sylvain
d46e6cf9c9
[members excel export] invoicing disabled
2016-11-16 15:08:24 +01:00
Sylvain
73e4439036
front-end modifications to cancel a booked event
2016-11-09 17:07:48 +01:00
Sylvain
da71ba783c
[bug] exports for events reservation always have seats=1 ( fixes #54 )
2016-11-09 15:01:58 +01:00
Sylvain
c04ed51f85
[bug] translation conflict
2016-11-09 14:35:02 +01:00
Peng DU
99cca406d5
fix bug: event date period dant show correct in invoice
2016-11-03 12:17:19 +01:00
Kenneth Lim
18bc37749b
locale: informations --> information
...
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
2016-10-07 17:11:58 +08:00
Sylvain
fc747c55c7
wallet credit confirmation
2016-09-29 13:02:24 +02:00
Sylvain
b715078e83
[admin] button to delete training from view + confirmation on machine/training deletion from view
2016-09-27 15:32:49 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
6401b321ef
[feature] display fab-manager's version, when logged as admin
2016-09-22 16:46:14 +02:00
Sylvain
13f416a101
[sso] save and restore field data mapping
2016-09-15 15:58:21 +02:00
Sylvain
ee333df53f
improved transformation interface
2016-09-14 18:54:53 +02:00
Sylvain
77626aa674
[SSO] interface for transforming boolean and dates datatypes
2016-09-14 18:52:18 +02:00
Sylvain
50543b8d09
[sso] give informations about the expected data in sso mapping
2016-09-14 16:41:45 +02:00
Sylvain
ec0f597067
[sso] display strategy name in providers list
2016-09-13 12:06:25 +02:00
Sylvain
b7c41e89c4
fix locale of notify_auth_changed mails
2016-09-13 10:48:07 +02:00
Sylvain
2607836203
fix message in case of wrong mime type
2016-09-07 15:56:41 +02:00
Sylvain
19e89cce3d
[feature] validate project attachement by mime type
2016-09-07 15:44:19 +02:00
Sylvain
c2533c0590
add custom aggs for machine & trainings stats: available bookings
2016-09-06 17:17:15 +02:00
Sylvain
71a111d8ba
improved reservations settings validation (delays)
2016-09-01 16:15:41 +02:00
Sylvain
9aef331596
add textual indications about empty fields in coupon form
2016-09-01 14:54:24 +02:00
Sylvain
0ffe5733d6
fix typo & completed deployment process in changelog
2016-08-31 15:44:23 +02:00
Sylvain
e281a20ada
database migration to event price category
2016-08-30 18:30:21 +02:00
Sylvain
4f41aa6554
event custom prices: various fixes and removed artifacts
2016-08-30 13:07:47 +02:00
Sylvain
60a8f60be8
display custom prices in events index
2016-08-29 17:33:21 +02:00
Sylvain
7bc19f540d
show custom price event bookings in dashboard
2016-08-29 17:21:20 +02:00
Sylvain
3d1c852576
show custom prices bookings in admin/editMember
2016-08-29 16:54:10 +02:00
Sylvain
d47a5aea5f
statistics generation for event with custom prices
2016-08-29 16:44:07 +02:00
Sylvain
d86cccf98c
custom prices in invoice generation
2016-08-29 16:37:51 +02:00
Sylvain
bca77559ed
ability to delete a price category
2016-08-24 17:09:00 +02:00
Sylvain
77db2b2326
ability to edit price category
2016-08-24 16:52:37 +02:00
Sylvain
500a466371
full ability to create price categories
2016-08-24 16:21:43 +02:00
Sylvain
6c3dfab0a9
API for price categories management
2016-08-24 12:30:48 +02:00
Sylvain
9748ea596f
interface structure refactoring for fares' categories
2016-08-23 17:49:43 +02:00
Sylvain
cc1d6e4f21
[not tested] send reminder notification every hours for upcoming reservations
2016-08-17 17:39:12 +02:00
Sylvain
26aed7a1b5
ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message
2016-08-17 12:49:52 +02:00
Sylvain
8aa5d5e4f5
allow dashes in coupon codes
2016-08-17 09:53:58 +02:00
Sylvain
428b2db0ea
send a coupon to a user
2016-08-16 18:12:13 +02:00
Sylvain
3253290860
[ongoing] send a coupon to a user
2016-08-16 11:33:10 +02:00
Sylvain
6e1dfda8f5
show coupon details in invoice
2016-08-10 16:33:26 +02:00
Sylvain
def5384a38
validation of validity_per_user on coupon usage
2016-08-10 11:08:01 +02:00
Sylvain
2f2099b723
fix EN translations
2016-08-09 11:41:40 +02:00
Sylvain
d1c1a614a9
i18n coupon directive
2016-08-09 10:22:01 +02:00
Sylvain
e2ea64cf9c
coupon edition + refactored coupon status
2016-08-08 15:21:33 +02:00
Sylvain
a6ded12ee9
create/delete coupons on stripe + adjust schema to match stripe requirements
2016-08-08 14:42:17 +02:00
Sylvain
35b324e108
coupon safe destroy
2016-08-08 12:25:27 +02:00
Sylvain
13e84f434d
i18n english
2016-08-08 12:14:10 +02:00
Sylvain
23320104c5
ability to edit coupons
2016-08-08 12:08:09 +02:00
Sylvain
7c434db09a
interface to create new coupons
2016-08-04 18:13:19 +02:00
Sylvain
ee03f1a79c
admin interface to list coupons
2016-08-04 14:26:07 +02:00
Sylvain
0eaa81b0ba
extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list
2016-08-04 12:08:33 +02:00
Sylvain
c9a7c599c0
notify admin about organization registration & organization server validation
2016-08-02 18:06:07 +02:00
Sylvain
af94b62ff1
add organization infos to members xlsx export
2016-08-02 15:28:24 +02:00
Sylvain
33358c2fb5
ability to edit organization in profile & ablity to link its params from an sso
2016-08-02 15:11:26 +02:00
Sylvain
2afd6ade8a
allow user to set his organization on registration
2016-08-02 12:27:45 +02:00
Sylvain
bd54ad8158
ability to share events on social networks twitter & fb
2016-08-01 16:19:50 +02:00
Sylvain
26d5e5e42c
allow social share of projects on twitter & facebook
2016-08-01 15:45:56 +02:00
Sylvain
5f96c9916d
[feature] newsletter : ask conscent + export in xlsx
2016-07-28 12:20:51 +02:00
Sylvain
5cacb1d34a
notify admin when users exports are running
2016-07-28 10:28:43 +02:00
Sylvain
a2066d8c09
[feature]async generation of users exports
2016-07-27 17:00:06 +02:00
Sylvain
b3f56cefd4
alert user about ongoing running export
2016-07-27 15:42:29 +02:00
Sylvain
4d2f46ca95
[feature] Async statistics export to XLSX
...
- fix tests due to removal of event_categories
- rake task for generating statistics
2016-07-27 11:28:54 +02:00
Sylvain
74154cf1f3
Merge branch 'xls' into dev
...
Conflicts:
CHANGELOG.md
app/helpers/application_helper.rb
config/locales/en.yml
config/locales/fr.yml
2016-07-25 16:56:22 +02:00
Sylvain
3b9d1b398b
Fix i18n for payment dialog
2016-07-25 12:10:10 +02:00
Sylvain
0e1546ee68
fix typo
2016-07-25 10:06:49 +02:00
Peng DU
bf731d293d
update locale
2016-07-21 16:32:58 +02:00
Peng DU
c220678ea5
change some texts in reservation on site
2016-07-21 16:32:58 +02:00
Peng DU
5d84dcb666
update locale
2016-07-21 16:32:57 +02:00
Peng DU
f2010e752d
show pay by wallet in invoice
2016-07-21 16:32:56 +02:00
Peng DU
773c1adf4a
edit invoice reference
2016-07-21 16:32:56 +02:00
Peng DU
2c49285740
avoir by wallet
2016-07-21 16:32:56 +02:00
Peng DU
4f42253d3d
wallet transaction list operation locale
2016-07-21 16:32:55 +02:00
Peng DU
2dbc026db1
pay subscription by wallet
2016-07-21 16:32:55 +02:00
Peng DU
fc7eaaab94
add notification and alert when user wallet credit
2016-07-21 16:32:54 +02:00
Peng DU
d0956bb0aa
show wallet transactions of user
2016-07-21 16:32:54 +02:00
Peng DU
db8a6e8a32
application can show user wallet
2016-07-21 16:32:53 +02:00
Peng DU
e504f035d3
fix orthographie
2016-07-18 17:52:03 +02:00
Peng DU
120df2e716
add an aside for filter caldendar in mobile
2016-07-18 16:31:14 +02:00
Peng DU
70d623f65a
filter calendar by machine/formation/event or disponible
2016-07-14 18:36:52 +02:00
Peng DU
f26e211acb
update locale
2016-07-14 12:20:03 +02:00
Peng DU
fb26a2e358
add public calendar menu, view, controller, routes and refactoring calldendar config
2016-07-14 12:20:02 +02:00
Peng DU
1529e4b14e
allow active/disactive a training to show in training lists
2016-07-14 12:18:24 +02:00
Sylvain
6839e8db38
Merge branch 'events' into dev
...
Conflicts:
CHANGELOG.md
config/locales/app.shared.en.yml
config/locales/app.shared.fr.yml
2016-07-13 18:32:30 +02:00
Sylvain
90142ae3bb
Merge branch 'training' into dev
2016-07-13 18:15:14 +02:00
Sylvain
68f9324725
Merge branch 'steps' into dev
...
Conflicts:
app/assets/javascripts/controllers/projects.coffee.erb
db/schema.rb
2016-07-13 16:10:18 +02:00
Sylvain
2c8001f38f
Merge branch 'projects' into dev
...
Conflicts:
app/views/api/members/show.json.jbuilder
2016-07-13 15:57:45 +02:00
Sylvain
3413c3040b
[ongoing] members export full infos
2016-07-12 17:46:19 +02:00
Sylvain
827b3334e1
migrate export subscriptions to axlsx
2016-07-12 13:10:06 +02:00
Sylvain
85912603a2
migrate export reservations to axlsx
2016-07-12 13:00:56 +02:00
Sylvain
d72e39f716
migrate export members to axlsx
2016-07-12 12:48:26 +02:00
Sylvain
022db4e486
export all stats indices to excel
2016-07-07 16:26:25 +02:00
Sylvain
8e8bd3f9eb
full subscriptions export
2016-07-07 15:31:22 +02:00
Sylvain
38c00391fc
basic UI and API for exporting stats to excel
2016-07-04 17:15:37 +02:00
Sylvain
fda619e422
add info message on categories management + fix existing categories slugs
2016-06-30 16:12:24 +02:00
Sylvain
471fe971bc
remove course & workshop from seeds file
2016-06-30 15:13:58 +02:00
Sylvain
e930e04ed6
add age&theme filters to statistics
2016-06-30 12:48:46 +02:00
Sylvain
e36df94f0f
server-side protection against deleting used filters
2016-06-30 11:39:56 +02:00
Sylvain
c8b42f1b7f
add slugs to event filters + add categories into statistics + prevent remove linked elements in front
2016-06-30 11:24:57 +02:00
Sylvain
bb6295c487
prevent from removing the last category
2016-06-30 09:51:06 +02:00
Sylvain
859960ce3e
confirmation on event filter deletion
2016-06-30 09:34:26 +02:00
Sylvain
e13870555b
ability to link filters to events
2016-06-29 17:05:42 +02:00
Sylvain
bdda4cd7b0
[feature] ability to filter events by category, theme and age
2016-06-29 16:09:27 +02:00
Sylvain
79b97eb113
[feature] manage event's age range
2016-06-29 11:21:21 +02:00
Sylvain
51cce7bbc3
[feature] manage event themes
2016-06-29 10:38:04 +02:00
Sylvain
9adc219edb
[feature] manage events categories
2016-06-28 17:06:33 +02:00
Sylvain
4d4248bcca
Merge branch 'dev' into events
...
Conflicts:
db/seeds.rb
2016-06-28 14:18:15 +02:00
Sylvain
99aa8120fc
i18n statistics
2016-06-28 14:07:59 +02:00
Sylvain
9000305a11
fix missing translation in API doc
2016-06-28 11:57:04 +02:00
Sylvain
7d02fa9d9a
rename Courses/Workshops to Events
2016-06-28 11:42:20 +02:00
Sylvain
d5b06d08ad
[feature] confirmation on project deletion
2016-06-28 10:02:36 +02:00
Sylvain
f6f539d2fc
link to openAPI documentation in front interface
2016-06-27 17:23:05 +02:00
Sylvain
875e513f1c
Merge remote-tracking branch 'origin/open-api' into dev
2016-06-27 16:31:50 +02:00
Sylvain
4639a15e2f
[feature] paginate statistics
2016-06-21 13:16:42 +02:00
Sylvain
f7d8d18bc8
[feature] paginate public list of members
2016-06-16 16:09:22 +02:00
Sylvain
08244d53dc
improve trainings load times
...
- do not eager load trainings availabilities in INDEX action if not requsted
- in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities
2016-06-15 12:01:09 +02:00
Sylvain
f924144fda
[feature] member select with lazy loading
2016-06-14 09:57:39 +02:00
Sylvain
48a90bb7b4
advanced project step modulation with automatic re-ordering
2016-06-02 16:02:08 +02:00
Sylvain
1bc9db2a65
[feature] 'new project' button in dashboard/my projects
2016-06-01 11:15:01 +02:00
Sylvain
3593f293ce
[feature] partial load of invoices list
2016-05-31 10:02:27 +02:00
Sylvain
c8e9c6dae5
[feature] partial load of users list
2016-05-30 15:39:19 +02:00
Sylvain
0be0935474
[feature] add user's job to profile
2016-05-26 12:34:30 +02:00
Sylvain
b19765ad4a
change placeholders for social networks + remove contributor status label top margin
2016-05-18 17:21:10 +02:00
Sylvain
a66b314e7b
[feature] background picture of profile banner customization
2016-05-18 16:15:54 +02:00
Sylvain
1869dd0bcf
[bug] project gain collaborator i18n key FR
...
[UI] project display in profile
2016-05-18 10:54:50 +02:00
Sylvain
284879e0d4
private profile
2016-05-17 17:43:29 +02:00
Sylvain
88de9c3c75
[feature] profile website + edition of is_allow_contact
2016-05-16 14:46:57 +02:00
Sylvain
ca3cd278a4
i18n social networks
2016-05-16 11:30:03 +02:00
Sylvain
a5dd2153d6
move i18n public profile
2016-05-12 15:46:18 +02:00
Sylvain
c499771433
migrate profile edit to 'my parameters' tab and add public profile in dashboard
2016-05-12 13:53:59 +02:00
Nicolas Florentin
761d243631
adds translations for admin/open_api_clients angularside
2016-05-10 09:31:24 +02:00
Nicolas Florentin
2c70903dfd
admin open_api_client managing
2016-05-09 18:15:04 +02:00
cyril
65c19b3462
fix translate
2016-05-02 17:14:01 +02:00
cyril
7288834417
ui projects list
2016-05-02 16:10:48 +02:00
cyril
79b69f21ba
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
2016-05-02 11:55:15 +02:00
Sylvain
33f83180fa
fix typo and css
2016-04-25 14:34:09 +02:00
Sylvain
b4ad735d7f
change interface for SSO/email already used
2016-04-25 14:30:03 +02:00
Nicolas Florentin
542efe363b
projects#index adds tooltip to explain what search over the whole network means
2016-04-25 12:57:35 +02:00
Nicolas Florentin
960f312dc9
projects search params are saved in url query params and remain in browser history
2016-04-25 12:46:30 +02:00
Sylvain
0ee36ca022
refactor interface for SSO profile completion
2016-04-25 12:35:43 +02:00
Nicolas Florentin
5403386c75
fallback and message if openlab server not available
2016-04-25 10:06:35 +02:00
Nicolas Florentin
1a446bf646
frontend openlab search view, ctrl, services
2016-04-22 18:17:55 +02:00
cyril
0f09795243
fix traduction trainings.completed
2016-04-19 16:47:43 +02:00
Sylvain
1f8f54d64f
mails translations in english
2016-04-11 11:32:32 +02:00
Sylvain
66a37dc692
fix french typo
2016-03-31 14:08:33 +02:00
Sylvain
0273783b91
fix missing translation
2016-03-31 13:13:31 +02:00
Sylvain
9bf6025b53
Revert "ask for user agreement to CGV on signup"
...
This reverts commit 2bf5a60ab5
.
2016-03-31 13:00:54 +02:00
Sylvain
2587eaf3cc
[feature] link to CGV in about page
2016-03-31 12:59:29 +02:00
Sylvain
2bf5a60ab5
ask for user agreement to CGV on signup
2016-03-31 12:18:07 +02:00
Sylvain
d97c336512
[ #16 ] add email field to reservations export
2016-03-31 11:52:49 +02:00
Sylvain
fe9fea2748
fix typo + remove wrong todo
2016-03-30 17:31:12 +02:00
Sylvain
d83e44d26f
i18n authentication provider type
2016-03-30 10:05:50 +02:00
Sylvain
305e887112
fix CAD files title translation in projects
2016-03-30 09:46:20 +02:00
Sylvain
6f50d59054
fix english typo
2016-03-29 17:06:30 +02:00
Sylvain
efe813945a
fixes
...
- english typo
- [bug] unable to send devise mail
2016-03-24 17:02:42 +01:00
cyril
d1450f65f6
release 2.0 rc
2016-03-23 18:39:41 +01:00
cyril
68eab24fa1
init depot fabmanager
2015-05-05 03:10:25 +02:00