Nicolas Florentin
4afb968750
fix select option for machines themes and materials when you get back to page and want your history back
2016-05-02 12:48:26 +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
Nicolas Florentin
faf78b7f82
fix bug custom asset favicon-file favicon file is not set
2016-04-25 17:55:37 +02:00
Sylvain
b483b76042
fix arrows in SSO completion
2016-04-25 15:20:00 +02:00
Sylvain
8b8ed342c1
improve responsivness of SSO completion form
2016-04-25 15:14:12 +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
4cfcbb47aa
openlab_projects ctrl, rescue all standard error
2016-04-25 10:07:54 +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
Nicolas Florentin
5ee27da51e
index updated_at, created_at, published_at datetimes
2016-04-21 18:19:55 +02:00
Nicolas Florentin
ec203a8ef8
adds minimal validation to projects
2016-04-21 17:10:50 +02:00
Nicolas Florentin
f65bb95575
almost finishes synchro with openlab system
2016-04-21 11:42:43 +02:00
Nicolas Florentin
711b18f6cd
initial commit
2016-04-20 18:13:36 +02:00
Nicolas Florentin
ed478f95c7
UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox
2016-04-20 11:24:28 +02:00
Sylvain
d880a8f0f4
fix unable to reserve Event
2016-04-13 18:21:01 +02:00
Sylvain
eb2bc54cec
Merge branch '2-0-rc1' into tests
2016-04-13 14:03:28 +02:00
Sylvain
a0397a2c15
[bug taiga#25] allow event update if changing ng_places
2016-04-13 13:37:05 +02:00
Sylvain
e1567ba7c5
[bug taiga#25] allow event update if removing nb places
2016-04-13 13:05:16 +02:00
Sylvain
11b43afc9a
[bug taiga#25] allow event update if no places nb was set
2016-04-13 12:09:00 +02:00
Sylvain
ef72d07a9e
[bug taiga#21] undefined method[] on notify_admin_profile_complete
2016-04-12 14:18:07 +02:00
Sylvain
d1a9a69d14
[bug taiga#20] group change not propagated
2016-04-12 10:10:16 +02:00
Sylvain
563266f160
[bug taiga#20] group change not propagated (partial fix)
2016-04-11 19:26:40 +02:00
Sylvain
4b6f3c5ea7
[bug taiga#22] display problem in stats for gender=woman
2016-04-11 18:47:16 +02:00
Sylvain
f9628b4989
prevent subscription creation/modification if card_token is invalid
2016-04-11 18:37:15 +02:00
Sylvain
fb2aee7cc5
[bug] fix VAT row and HT total row on invoices
2016-04-11 17:17:33 +02:00
Nicolas Florentin
1344e09f96
adds comments to model reservation
2016-04-08 16:59:09 +02:00
Nicolas Florentin
fa64fd7a2e
remove useless method
2016-04-08 16:58:46 +02:00
Nicolas Florentin
b46ee9177c
adds comments to service UsersCredits::Manager
2016-04-08 11:26:31 +02:00
Nicolas Florentin
d104403af0
little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine
2016-04-08 11:17:52 +02:00
Nicolas Florentin
c78e010888
refacto method generate_invoice_items using UsersCredits::Manager service
2016-04-08 11:12:03 +02:00
Nicolas Florentin
d22574dae4
UsersCredits::Manager is more strict about arguments that have to be passed
2016-04-08 11:11:42 +02:00
Nicolas Florentin
aee8146040
users_credits/manager service: initializing service, you can pass a plan to simulate that user have that plan
2016-04-08 10:33:50 +02:00
Nicolas Florentin
7649e953e4
refacto subscription extension with first training using a service
2016-04-07 17:57:48 +02:00
Nicolas Florentin
8c3f2d2862
implements a service to handle subscription extension after reservation, comes with tests
2016-04-07 17:55:36 +02:00
Nicolas Florentin
7748d601f8
uses users_credits/manager service in models reservation and subscription, and adds integration tests
2016-04-07 16:02:09 +02:00
Nicolas Florentin
02b56ed6a7
users_credits/manager service, handle the case if user does not have a plan
2016-04-07 16:01:31 +02:00
Nicolas Florentin
2ab8d04a68
adds comment to model invoice_item
2016-04-07 16:00:12 +02:00
Nicolas Florentin
6004dd409c
Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests
2016-04-07 12:57:15 +02:00
Nicolas Florentin
823b4c5e1d
updates users_credits module and manager and adds tests
2016-04-07 12:57:08 +02:00
Sylvain
b72609c072
test and validation from plan group
2016-04-07 12:28:25 +02:00
Nicolas Florentin
28fcd121b4
renames service of users credits manager
2016-04-06 18:26:02 +02:00
Nicolas Florentin
752f40a951
Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests
2016-04-06 18:24:51 +02:00
Nicolas Florentin
44fcb2e089
draft a service to handle users credits
2016-04-06 18:24:26 +02:00
Nicolas Florentin
f12646aaf9
adds integration tests for reservation
2016-04-06 18:23:32 +02:00
Sylvain
6027fb5f38
Merge branch 'hotfix' into tests
2016-04-06 17:47:10 +02:00
Sylvain
929e756b10
[bug] fix incorrect VAT rate on invoices
2016-04-06 17:46:24 +02:00
Sylvain
150e58d47f
test invalid abuse
2016-04-06 14:58:53 +02:00
Sylvain
773e87ecd4
abuses test
2016-04-06 14:45:39 +02:00
Nicolas Florentin
3e112c13eb
removes model and migrations relative to old model machines_pricings
2016-04-05 10:52:29 +02:00
Nicolas Florentin
5d38f1e3a5
does not validate length of availability if start_at or end_at are blank and already missing
2016-04-05 09:57:09 +02:00
Nicolas Florentin
fafec2153c
setup test environment and add the first test
2016-04-04 17:42:45 +02:00
Sylvain
66a37dc692
fix french typo
2016-03-31 14:08:33 +02:00
Sylvain
32d5184164
[fix taiga#15] empty workshop attachment not added
2016-03-31 14:02:16 +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
9a4eff08d0
[bug] invalid link in migration email
2016-03-30 16:48:47 +02:00
Sylvain
232bdbd102
bug fixes
...
- [bug] credits not reset on new plan subscription
- [bug] admin notification (user merged his account) never sent
2016-03-30 15:37:33 +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
8a53ae2d2c
fix invoice attachement name
2016-03-29 18:02:40 +02:00
Sylvain
d14edbdcfa
[bug] unable to edit machine without updating image
2016-03-29 17:01:09 +02:00
Sylvain
ff7e33e5e2
fix training description remain on screen after click
2016-03-29 16:54:51 +02:00
Sylvain
6c32f7e54a
fixes in datepicker
...
- date displayed in inputs has the correct year
- date sent to server match the selected date in html forms
- datepicker date format is configurable for i18n
2016-03-29 13:31:02 +02:00
Sylvain
0ea7e97bd7
[fix] fit plan price to bubble width
2016-03-24 16:23:10 +01:00
Sylvain
e81cc1597a
various fix
...
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
Sylvain
ac0712e5bb
i18n plan duration
2016-03-24 14:29:31 +01:00
Sylvain
b8459ef990
fix i18n libs load checkup + fix README
2016-03-24 11:03:26 +01:00
cyril
d1450f65f6
release 2.0 rc
2016-03-23 18:39:41 +01:00
Sylvain
5fff77d906
[bug] unable to edit event (possible fix for #17 )
2016-01-19 10:48:56 +01:00
Sylvain
b267def130
[bug] #2
...
fixes the lack of user's menu on small devices (can't logout, etc)
2015-10-28 11:55:54 +01:00
Sylvain
15dac71137
Merge branch 'dev' of https://github.com/LaCasemate/fab-manager into dev
2015-10-07 16:31:01 +02:00
Sylvain
097d4d81dc
fix: user without allow_contact get 403 forbidden when accessing api/member/self_id
2015-10-07 16:30:38 +02:00
cyril
a01d54e10f
Merge branch 'master' into dev
2015-10-07 14:07:46 +02:00
Sylvain
9c8f35bd1f
fix UI : dashbord button overflow on SM devices
2015-10-06 12:03:46 +02:00
cyril
e8037beaca
update fonts
2015-09-18 10:32:25 +02:00
cyril
1dc86f1827
remove env DISQUS_SHORTNAME
2015-05-18 22:08:06 +02:00
cyril
0678c2d582
summernote: add default height to config js
2015-05-18 21:48:10 +02:00
cyril
0f13d1ce42
summernote : add white background css
2015-05-18 21:47:13 +02:00
Nicolas Florentin
e0c721cff7
adds licence in projects/show
2015-05-18 10:23:50 +02:00
Nicolas Florentin
4686a8c843
rejects project cao file if all blank
2015-05-18 10:16:21 +02:00
Nicolas Florentin
0561cd81ef
fix step title was missing in project/form
2015-05-18 10:15:36 +02:00
Nicolas Florentin
4ba033d2b1
improves wysiwyg editor projects
2015-05-13 18:30:35 +02:00
cyril
d6652bd39d
fixed label demo above nav
2015-05-08 13:33:24 +02:00
cyril
369be9dd63
fixed delete machine error
2015-05-08 13:31:58 +02:00
cyril
68eab24fa1
init depot fabmanager
2015-05-05 03:10:25 +02:00
