rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-11 00:52:29 +01:00
Code Issues Releases Activity
98 Commits 15 Branches 274 Tags
Commit Graph

98 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril
bbe4cebbf5 Merge branch '2-0-rc1' 2.0.0 2016-04-20 11:48:19 +02:00
cyril
0f09795243 fix traduction trainings.completed 2016-04-19 16:47:43 +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
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
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
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
Sylvain
5f2d134a17 mails translations in english 2016-04-11 11:32:26 +02:00
Sylvain
f003c0fb22 mails translations in english 2016-04-11 11:32:05 +02:00
cyril
fe9847a518 update Dockerfile + env.example 2016-04-08 06:02:09 +02:00
Sylvain
456e2c42b4 Merge branch 'hotfix' into 2-0-rc1 2016-04-06 17:46:57 +02:00
Sylvain
929e756b10 [bug] fix incorrect VAT rate on invoices 2016-04-06 17:46:24 +02:00
Nicolas Florentin
5358cdc19e Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1 2016-04-05 12:37:20 +02:00
Nicolas Florentin
1ec12ff595 update database name in database.yml.default 2016-04-05 12:36:55 +02:00
cyril
35467173b0 add enable starttls auto for env prod 2016-04-05 11:38:28 +02:00
Sylvain
bc051cfd14 fix typos in README 2016-04-05 11:11:14 +02:00
Sylvain
2166157724 fix link in readme 2016-03-31 21:25:23 +02:00
Sylvain
5553c33565 clarified doc about setup of database.yml 2016-03-31 21:16:11 +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
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 2bf5a60ab586f3c7a54268dc9f1d4c8cffe01a17.
 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
0897fe1e63 update readme 2016-03-31 11:56:58 +02:00
Sylvain
54be4f9e45 update ruby to 2.3 
Thix fixes an issue with the PG gem, see https://bitbucket.org/ged/ruby-pg/issues/233/ruby-223-incompatible-library-version
 2016-03-31 11:55:13 +02:00
Sylvain
d97c336512 [#16] add email field to reservations export 2016-03-31 11:52:49 +02:00
Sylvain
bd4ce58c64 fix gemset 2016-03-31 10:06:07 +02:00
Sylvain
be37f3fc8a Merge branch 'dev' 2016-03-30 17:33:20 +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
b5dfcdb3b5 Merge branch 'dev' 2016-03-30 09:20:11 +02:00
Sylvain
5b35cf20ac Merge branch '2-0-rc1' into dev 2016-03-30 09:20:00 +02:00
Sylvain
8a53ae2d2c fix invoice attachement name 2016-03-29 18:02:40 +02:00
Sylvain
6f50d59054 fix english typo 2016-03-29 17:06:30 +02:00
Sylvain
712d809cc2 Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1 2016-03-29 17:01:42 +02:00
Sylvain
d14edbdcfa [bug] unable to edit machine without updating image 2016-03-29 17:01:09 +02:00
Sylvain
2560c8496d [bug] unable to edit without updating image 2016-03-29 17:00:56 +02:00