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

1124 Commits

Author SHA1 Message Date
siteswapjuggler
e13817176f event monitor improvement
Many imrovement for the event monitoring admin module.
2017-09-04 00:09:08 +02:00
siteswapjuggler
73c9e301fb open api events improvement
new data available: start_at, end_at, event_image
new controllers: id, upcoming, limit
2017-09-03 13:55:38 +02:00
Sylvain
8a4d9dd45b Merge branch 'dev' for release 2.5.10 2017-08-16 12:07:33 +02:00
Sylvain
fe58409326 Version 2.5.10 2017-08-16 12:07:08 +02:00
Sylvain
295dc3749b [bug] filename too long on events&prices API + updated axlsx 2017-08-16 12:05:04 +02:00
Sylvain
36dfbe9159 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-07-26 10:16:45 +02:00
Sylvain
00d157dc3b [bug] filename too long error on GET api/groups 2017-07-26 10:15:47 +02:00
Nicolas Florentin
999865ba85 docker/README env variable missing in seeding database command 2017-07-24 12:26:50 +02:00
Nicolas Florentin
2b4864af74 updates CHANGELOG.md, adding the docker/README.md update 2017-07-21 14:22:28 +02:00
Nicolas Florentin
6ac1d4d48e Merge branch 'docker-readme' into dev 2017-07-21 14:21:22 +02:00
Nicolas Florentin
c6d4a6c735 rm old docker README 2017-07-21 14:19:59 +02:00
Nicolas Florentin
fa0c2f7dee fix br 2017-07-21 09:27:29 +02:00
Cyril
6ba880275f Update README.md 2017-07-20 19:54:37 +02:00
Nicolas Florentin
3e68e7d817 modifs and try fix steps of update part 2017-07-20 17:50:37 +02:00
Nicolas Florentin
5cddf8d16d modifs and try fix steps of update part 2017-07-20 17:49:18 +02:00
Nicolas Florentin
cba2751a8a fix link generate ssl certif 2017-07-20 17:43:59 +02:00
Nicolas Florentin
48a5b45e06 struggling with links 2017-07-20 17:42:55 +02:00
Nicolas Florentin
aa4ef99d02 work in progress 2017-07-20 17:37:03 +02:00
Nicolas Florentin
1833ac2890 arg 2017-07-20 17:18:19 +02:00
Nicolas Florentin
7722b55a64 fix table of contents 2017-07-20 17:17:43 +02:00
Nicolas Florentin
5305ff4c8f fix table of contents 2017-07-20 17:15:20 +02:00
Nicolas Florentin
e855fb18e5 README table of contents 2017-07-20 17:14:02 +02:00
Nicolas Florentin
0301b2959c working on docker readme 2017-07-20 16:48:34 +02:00
Sylvain
3e44d62aac [bug] filename too long error on GET api/trainings 2017-07-18 10:55:41 +02:00
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