1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

1589 Commits

Author SHA1 Message Date
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
cyril
1099adb208 Merge branch 'tests' into dev 2016-04-20 11:58:09 +02:00
cyril
3ead00eabf Merge branch '2-0-rc1' into dev 2016-04-20 11:48:50 +02:00
cyril
bbe4cebbf5 Merge branch '2-0-rc1' 2016-04-20 11:48:19 +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
cyril
0f09795243 fix traduction trainings.completed 2016-04-19 16:47:43 +02:00
Sylvain
34648c7e9e event test 2016-04-13 18:33:43 +02:00
Sylvain
d880a8f0f4 fix unable to reserve Event 2016-04-13 18:21:01 +02:00
Sylvain
3016ac1e82 tests for availabilities 2016-04-13 17:26:17 +02:00
Sylvain
6f4e795d9f machine availabilities test 2016-04-13 15:19:57 +02:00
Sylvain
423431dc72 make availability fixtures dynamic 2016-04-13 15:08:49 +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
c0f57cc213 [ongoing] availability tests 2016-04-13 11:53:21 +02:00
Sylvain
02c72e55d9 test admins 2016-04-13 10:43:25 +02:00
Sylvain
cc8991f6bc fix test fixtures 2016-04-12 16:51:36 +02:00
Sylvain
7817e285f0 rake task to remove stripe secrets from VCR cassettes 2016-04-12 16:43:10 +02:00
Sylvain
745a89f18f [fixtures] make subscriptions dates dynamic 2016-04-12 15:41:22 +02:00
Sylvain
59153f4298 test admin renew subscription 2016-04-12 15:09:47 +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
cyril
4845c1cc91 update readme and docker readme 2016-04-11 20:24:09 +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
b8f45da268 Merge branch 'dev' 2016-04-11 17:17:56 +02:00
Sylvain
b9030d8f8d Merge branch '2-0-rc1' into dev 2016-04-11 17:17:47 +02:00
Sylvain
fb2aee7cc5 [bug] fix VAT row and HT total row on invoices 2016-04-11 17:17:33 +02:00
Sylvain
31ee151809 reproductible tests for invoice generation 2016-04-11 15:31:25 +02:00
Sylvain
01ca290582 Merge branch 'dev' 2016-04-11 11:41:46 +02:00
Sylvain
aa3b3dd631 Merge branch '2-0-rc1' into dev 2016-04-11 11:41:38 +02:00
Sylvain
1f8f54d64f mails translations in english 2016-04-11 11:32:32 +02:00