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 |
|
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 |
|