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 2bf5a60ab5
.
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
Sylvain
ff7e33e5e2
fix training description remain on screen after click
2016-03-29 16:54:51 +02:00
Sylvain
f1181f3994
Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1
2016-03-29 13:31:12 +02:00
Sylvain
6c32f7e54a
fixes in datepicker
...
- date displayed in inputs has the correct year
- date sent to server match the selected date in html forms
- datepicker date format is configurable for i18n
2016-03-29 13:31:02 +02:00
cyril
2f4951255b
Merge branch '2-0-rc1'
2016-03-24 23:03:01 +01:00
cyril
7f99a045c8
Merge branch '2-0-rc1' into dev
2016-03-24 23:02:42 +01:00
cyril
c77916b4af
remove newrelic gem
2016-03-24 23:01:40 +01:00
Sylvain
efe813945a
fixes
...
- english typo
- [bug] unable to send devise mail
2016-03-24 17:02:42 +01:00
Sylvain
0ea7e97bd7
[fix] fit plan price to bubble width
2016-03-24 16:23:10 +01:00
Sylvain
e81cc1597a
various fix
...
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
Sylvain
ac0712e5bb
i18n plan duration
2016-03-24 14:29:31 +01:00
Sylvain
64ab18bad7
fix typo
2016-03-24 12:06:07 +01:00
Sylvain
27af39ed5c
Gemfile.lock
2016-03-24 11:45:33 +01:00
Sylvain
abfa1924dc
Revert "fix readme TOC"
...
This reverts commit 32449306cc
.
2016-03-24 11:44:54 +01:00
Sylvain
32449306cc
fix readme TOC
2016-03-24 11:11:41 +01:00
Sylvain
3b874cc89b
fix readme TOC
2016-03-24 11:10:32 +01:00
Sylvain
b8459ef990
fix i18n libs load checkup + fix README
2016-03-24 11:03:26 +01:00
cyril
9c7302eb00
Merge branch '2-0-rc1'
2016-03-23 19:27:13 +01:00
cyril
2e8bfbd8ac
fix path files of angular bootstrap components
2016-03-23 18:49:08 +01:00
cyril
d1450f65f6
release 2.0 rc
2016-03-23 18:39:41 +01:00
Sylvain
5fff77d906
[bug] unable to edit event (possible fix for #17 )
2016-01-19 10:48:56 +01:00
Sylvain
0ae0544066
fix links in readme
2016-01-18 15:52:59 +01:00
Sylvain
06e6d965d5
updated readme about translations
2016-01-18 15:40:30 +01:00
Sylvain
7412bba7f2
add possible issue solution to readme + fix default db config
2015-11-10 11:08:01 +01:00
Sylvain
b267def130
[bug] #2
...
fixes the lack of user's menu on small devices (can't logout, etc)
2015-10-28 11:55:54 +01:00
Sylvain
15dac71137
Merge branch 'dev' of https://github.com/LaCasemate/fab-manager into dev
2015-10-07 16:31:01 +02:00