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

1512 Commits

Author SHA1 Message Date
Nicolas Florentin
77c7a41761 removes ADMIN_EMAIL and ADMIN_PASSWORD from docker/env.example 2017-07-13 11:15:13 +02:00
Nicolas Florentin
739d9562fd removes ADMIN_EMAIL and ADMIN_PASSWORD from Rails env because they are only used once when seeding the db 2017-07-13 11:07:09 +02:00
Nicolas Florentin
dc0b70425a Merge branch 'dev' for release 2.5.9 2017-07-13 10:11:47 +02:00
Nicolas Florentin
1ac8092ba4 Version 2.5.9 2017-07-13 10:11:19 +02:00
Nicolas Florentin
decb7e8159 improves test if there is already an admin, not failing anymore if role doesnt exist 2017-07-13 09:25:32 +02:00
Sylvain
65a56ac2f4 updated version 2017-07-12 15:56:12 +02:00
Sylvain
a32a5e99ff fix invalid default configuration file 2017-07-12 15:52:59 +02:00
Sylvain
1806fca2eb Merge branch 'dev' for release 2.5.8 2017-07-12 11:47:47 +02:00
Sylvain
2a588937ee Version 2.5.8 2017-07-12 11:47:24 +02:00
Sylvain
17544225b5 [bug] invoices generation failed for subscription days offered 2017-07-12 11:38:51 +02:00
Sylvain
0d82186a78 [bug] db:seed throw an error about admin creation 2017-06-14 17:28:36 +02:00
Sylvain
42d2c2ee31 [bug] hide spaces in public calendar when disabled 2017-06-13 19:31:48 +02:00
Sylvain
7ff46db808 [bug] confirmation message after admin creation 2017-06-13 19:26:32 +02:00
Peng DU
2ff47f3204 add task Id: 3713, reference: 1706002/VL, stripe id: in_1ASRQy2sOmf47Nz9Xpxtw46A, invoice total: 30.0, stripe invoice total: 80.0, date: 2017-06-08 16:16:26 +0200
Id: 3716, reference: 1706005/VL, stripe id: in_1ASRye2sOmf47Nz9utkjPDve, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:51:15 +0200
Id: 3717, reference: 1706006/VL, stripe id: in_1ASS1X2sOmf47Nz93Xn2UxVh, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:54:14 +0200
Id: 3718, reference: 1706007/VL, stripe id: in_1ASSBI2sOmf47Nz9Ol0gEEfC, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 17:04:19 +0200 allow find the invoices incoherent
2017-06-09 11:08:08 +02:00
cyril
8e9608916e Merge branch 'dev' 2017-06-08 22:14:55 +02:00
cyril
511bd320f5 upgrade rdoc to 4.3.0 2017-06-08 21:56:46 +02:00
cyril
36a86576f7 Merge branch 'dev' for release 2.5.7 2017-06-08 20:20:00 +02:00
cyril
6d05765880 Version 2.5.7 2017-06-08 20:19:32 +02:00
Peng DU
c6fedf3f20 Merge branch 'fix_issus_77' into dev 2017-06-08 19:40:30 +02:00
Peng DU
eca141f902 fix bug #77: reservation amount total isnt equal stripe invoice amount that be paid by client 2017-06-08 19:38:19 +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
5fbe22ef63 updated dev version 2017-06-07 16:39:24 +02:00
Sylvain
59b2ca009f Merge branch 'alexcvcoelho-master' into dev 2017-06-07 16:27:32 +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
b8729f2e82 Modified translate for messageformat 2017-06-01 14:38:56 -03:00
Alex Coelho
1ef80f8bd8 Prtuguese translations in app.*.pt.yml files 2017-06-01 14:33:16 -03:00
Alex Coelho
4bae8e4bb6 Files conf 2017-06-01 12:41:10 -03:00
Alex Coelho
ffa4cbd4e4 Files conf 2017-06-01 12:38:18 -03:00
Alex Coelho
3358ea227e Portuguese adapted in app.*.pt.yml files 2017-06-01 12:33:52 -03:00
Sylvain
0a76aec194 Merge branch 'dev' for release 2.5.6 2017-05-18 10:38:23 +02:00
Sylvain
9297376ad3 Version 2.5.6 2017-05-18 10:37:41 +02:00
Sylvain
8531168ba2 improve RSS with project author and image + event dates image and category 2017-05-17 12:18:20 +02:00
Sylvain
7960964aed set organization name in invoice object, if any (#64) 2017-05-16 10:44:52 +02:00
Sylvain
54154b1713 [feature] ability for admins to create users or organizations 2017-05-16 10:23:25 +02:00
Sylvain
c9b3dd0144 Merge branch 'dev' of github.com:LaCasemate/fab-manager into dev 2017-05-15 16:50:18 +02:00
Sylvain
23c0a4db46 Merge branch 'dev' for release 2.5.5 2017-05-15 16:47:38 +02:00
Sylvain
e17c715249 Version 2.5.5 2017-05-15 16:46:58 +02:00
Sylvain
b403f86187 [bug] price init for new groups & delete group 2017-05-15 15:25:27 +02:00
Alex Coelho
f3634e6891 Translate pt-BR 2017-05-11 14:15:23 -03:00
Alex Coelho
71b3b2e279 Translate pt-BR 2017-05-11 14:13:57 -03:00
Sylvain
f8bb809eee Merge pull request #65 from matbgn/dev
Avec l'introduction du $PWD le chemin relatif /config/env est plus court. Raison de cette PR
2017-05-11 17:18:56 +02: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
5fcc36e959 next release 2017-05-09 09:30:16 +02:00
Sylvain
090e445695 Merge branch 'dev' for release 2.5.4 2017-05-04 13:00:12 +02:00
Sylvain
565aafb455 Version 2.5.4 2017-05-04 12:59:04 +02:00
Sylvain
89e30980e0 [bug] unable to set locale other than fr or en 2017-04-27 18:35:00 +02:00