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

1480 Commits

Author SHA1 Message Date
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
Sylvain
ca012322fb fixed rails locales files 2017-04-27 17:08:17 +02:00
Sylvain
186b1eedb5 Merge branch 'dev' for release 2.5.3 2017-04-27 14:24:07 +02:00
Sylvain
5981aa342d Version 2.5.3 2017-04-27 14:23:06 +02:00
Sylvain
1f7bf2a591 Rails l10n support for 115 new locations 2017-04-27 14:22:07 +02:00
cyril
d63969daea update changelog 2017-04-13 14:27:11 +02:00
cyril
d1a1b63db5 Project view: added responsive support on external images 2017-04-13 14:26:29 +02:00
cyril
61278127d5 Merge branch 'dev' 2017-04-12 20:34:35 +02:00
cyril
2971fd25b8 release 2.5.2 2017-04-12 20:31:52 +02:00
matbgn
816f4b8877 Merge branch 'fix_display_CL_docker-compose' into dev 2017-04-12 16:53:01 +02:00
matbgn
36d7cfe701 Fix the way CL are displayed (inline instead of l/l) for db creation 2017-04-12 16:52:41 +02:00
matbgn
a52e0e4371 Merge branch 'fix_docker-compose_env_file' into dev 2017-04-12 16:27:06 +02:00
matbgn
457dd8e201 Modified the docker-compose.yml position due to insertion $PWD/config 2017-04-12 16:26:34 +02:00
cyril
a4721b9656 update changelog 2017-04-03 17:08:47 +02:00
Nicolas Florentin
004e74e13e extracts first admin created email and password into environment variables 2017-04-03 15:48:32 +02:00
Nicolas Florentin
77a24f14c6 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-04-03 15:34:45 +02:00
cyril
f3392e391c Merge branch 'dev' for release 2.5.1 2017-03-28 20:28:36 +02:00
cyril
4245bda9fd Version 2.5.1 2017-03-28 20:26:32 +02:00
cyril
3fcf61de24 hide spaces in admin's credit management if spaces are disabled 2017-03-28 20:13:18 +02:00
Peng DU
1d53e3b5b7 fix json template of training reservation 2017-03-28 19:53:48 +02:00
Peng DU
2cc8096236 fix bug: cant get list of training reservation 2017-03-28 19:45:36 +02:00
Sylvain
c9beb3110f Merge branch 'dev' for release 2.5.0 2017-03-28 13:45:23 +02:00
Sylvain
966ada599d Version 2.5.0 2017-03-28 13:44:02 +02:00
Sylvain
0c733479a5 Merge branch 'FabLab61-master' into dev 2017-03-28 13:30:50 +02:00
Sylvain
69fe609288 Merge branch 'master' of git://github.com/FabLab61/fab-manager into FabLab61-master 2017-03-28 13:30:31 +02:00
Sylvain
57ad5ca50e updated schema 2017-03-28 13:30:10 +02:00
Sylvain
c65525de60 updated changelog 2017-03-21 15:55:41 +01:00
Sylvain
ff8e804750 Merge branch 'week' into dev 2017-03-21 15:51:52 +01:00
Sylvain
1c483944b9 updated changelog 2017-03-21 15:48:13 +01:00
Sylvain
f4187d0b4b [bug] news plans statistics are not shown 2017-03-21 15:47:25 +01:00
Sylvain
5abc85ae0a [feature] weekly plans 2017-03-21 13:06:02 +01:00
Sylvain
21560dd5d9 show space details on image-click 2017-03-21 12:06:58 +01:00
Sylvain
8e206cd3c5 [bug] subscription name is not shown in invoices 2017-03-15 16:31:51 +01:00