rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity
2,351 Commits 15 Branches 273 Tags 83 MiB
a44bf85014
Commit Graph

2351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sylvain
097d4d81dc fix: user without allow_contact get 403 forbidden when accessing api/member/self_id 2015-10-07 16:30:38 +02:00
cyril
a01d54e10f Merge branch 'master' into dev 2015-10-07 14:07:46 +02:00
Cyril Farré
2f9760f340 Merge pull request #9 from david-guenault/dev 
First work about fabmanager docker container (Env dev, test)
 2015-10-07 14:02:58 +02:00
Sylvain
9c8f35bd1f fix UI : dashbord button overflow on SM devices 2015-10-06 12:03:46 +02:00
David GUENAULT
d810e7d018 First work about fabmanager docker container 2015-10-05 20:00:37 +02:00
cyril
e8037beaca update fonts 2015-09-18 10:32:25 +02:00
cyril
1e5b5ae0d4 Merge branch 'dev' 2015-05-18 22:09:04 +02:00
cyril
1dc86f1827 remove env DISQUS_SHORTNAME 2015-05-18 22:08:06 +02:00
cyril
0678c2d582 summernote: add default height to config js 2015-05-18 21:48:10 +02:00
cyril
0f13d1ce42 summernote : add white background css 2015-05-18 21:47:13 +02:00
cyril
437977e8ae delete css redactor 2015-05-18 21:46:44 +02:00
Nicolas Florentin
e0c721cff7 adds licence in projects/show 2015-05-18 10:23:50 +02:00
Nicolas Florentin
4686a8c843 rejects project cao file if all blank 2015-05-18 10:16:21 +02:00
Nicolas Florentin
0561cd81ef fix step title was missing in project/form 2015-05-18 10:15:36 +02:00
Nicolas Florentin
ebd70351b4 Merge branch 'master' into dev 2015-05-13 18:33:10 +02:00
Nicolas Florentin
4ba033d2b1 improves wysiwyg editor projects 2015-05-13 18:30:35 +02:00
cyril
6c7af081aa Merge branch 'dev' 2015-05-08 13:57:18 +02:00
cyril
d5e72c65da add DISQUS_SHORTNAME env 2015-05-08 13:57:04 +02:00
cyril
d6652bd39d fixed label demo above nav 2015-05-08 13:33:24 +02:00
cyril
369be9dd63 fixed delete machine error 2015-05-08 13:31:58 +02:00
cyril
485447f4da Merge branch 'dev' 2015-05-05 03:16:10 +02:00
cyril
68eab24fa1 init depot fabmanager 2015-05-05 03:10:25 +02:00