Sylvain
|
f7d2d8a878
|
Merge pull request #51 from kennethlimcp/fix/locale/en
fixing documentation typo
|
2016-10-07 11:50:17 +02:00 |
|
Kenneth Lim
|
18bc37749b
|
locale: informations --> information
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
|
2016-10-07 17:11:58 +08:00 |
|
Sylvain
|
dff155831a
|
Merge branch 'dev'
|
2016-10-04 16:58:48 +02:00 |
|
Sylvain
|
977f3dac91
|
Version 2.4.0
|
2016-10-04 16:39:10 +02:00 |
|
Sylvain
|
1e81de40ed
|
Merge pull request #47 from phd0/patch-1
add some log text on bulk_export rake function
|
2016-09-29 21:29:13 +02:00 |
|
Sylvain
|
d0ffd602a3
|
Fix typo
|
2016-09-29 21:28:51 +02:00 |
|
DULAC Philippe
|
7e16dd2a0a
|
add some log text on bulk_export rake function
ajout d'une description pour faire apparaitre cette fonction dans la liste
|
2016-09-29 20:50:27 +02:00 |
|
Sylvain
|
fc747c55c7
|
wallet credit confirmation
|
2016-09-29 13:02:24 +02:00 |
|
Sylvain
|
9791c7e0fe
|
updated changelog
|
2016-09-29 12:07:18 +02:00 |
|
Sylvain
|
8dbbbfad9e
|
Merge branch 'Vincent14-rss_feeds' into dev
|
2016-09-29 11:55:12 +02:00 |
|
Sylvain
|
1ef2c11355
|
add links to RSS feeds into application header
|
2016-09-29 11:54:08 +02:00 |
|
Sylvain
|
34ad1c9056
|
move RSS code into separate folders
|
2016-09-29 10:53:20 +02:00 |
|
Sylvain
|
376cb6dbe9
|
Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds
|
2016-09-29 10:09:15 +02:00 |
|
Sylvain
|
c6cf40f7cc
|
updated changelog
|
2016-09-29 10:04:37 +02:00 |
|
Sylvain
|
c2d2786515
|
fix default_host for dev and test environments
|
2016-09-29 10:02:31 +02:00 |
|
cyril
|
57cb6c4fbe
|
fix default level_log config
|
2016-09-28 18:55:40 +02:00 |
|
cyril
|
a0fef8d046
|
bug fix: not to force https in env production for root_url helper
|
2016-09-28 13:58:22 +02:00 |
|
Sylvain
|
99801bb02a
|
improved explanation about rebuild assets
|
2016-09-28 12:14:21 +02:00 |
|
Sylvain
|
cd6b279af4
|
fix typo + updated docker ENV example
|
2016-09-28 12:00:53 +02:00 |
|
Sylvain
|
5211880ed5
|
updated CHANGELOG
|
2016-09-28 11:37:36 +02:00 |
|
Peng DU
|
acd6bdad34
|
update gem coffee-rails
|
2016-09-28 11:11:13 +02:00 |
|
Sylvain
|
785e9a42f8
|
test fix asset:precompile
|
2016-09-28 10:52:25 +02:00 |
|
Sylvain
|
60d60fdd65
|
use slugs in projects URL opened from notifications
|
2016-09-27 16:58:57 +02:00 |
|
Sylvain
|
e48bb88f1f
|
use slug in traning show url
|
2016-09-27 16:00:22 +02:00 |
|
Sylvain
|
c27c4372b0
|
updated CHANGELOG
|
2016-09-27 15:34:30 +02:00 |
|
Sylvain
|
b715078e83
|
[admin] button to delete training from view + confirmation on machine/training deletion from view
|
2016-09-27 15:32:49 +02:00 |
|
Sylvain
|
9a71dc5ea2
|
trainings monitoring: open current year/month by default on training selection
|
2016-09-27 14:56:57 +02:00 |
|
Sylvain
|
d45ca7213f
|
updated changelog
|
2016-09-27 14:10:00 +02:00 |
|
Sylvain
|
36524d4cd9
|
display list of allowed extensions in project's CAD attachments
|
2016-09-27 14:08:04 +02:00 |
|
Sylvain
|
bf9ea40648
|
[feature #40] project images will show in full-size on a click
|
2016-09-27 11:50:05 +02:00 |
|
Sylvain
|
6e94850522
|
prevent project step reordering to trigger unsaved-changes dialog
|
2016-09-27 11:31:20 +02:00 |
|
Sylvain
|
d793af5012
|
updated changelog
|
2016-09-27 10:45:53 +02:00 |
|
Sylvain
|
1195451863
|
[bug] embedded video not working in tranings/machines descriptions
|
2016-09-27 10:45:07 +02:00 |
|
Sylvain
|
24a0f5533c
|
fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views
|
2016-09-27 09:55:24 +02:00 |
|
Sylvain
|
30c52dfe95
|
share on twitter with title
|
2016-09-26 16:44:45 +02:00 |
|
Sylvain
|
a1fd69f309
|
auth provider safe destroy
|
2016-09-26 12:41:59 +02:00 |
|
Sylvain
|
2f315febd3
|
Merge branch 'master' of github.com:LaCasemate/fab-manager
|
2016-09-26 11:24:19 +02:00 |
|
Sylvain
|
838d9b9542
|
Release 2.3.1
|
2016-09-26 11:21:25 +02:00 |
|
Peng DU
|
1a0e5519f6
|
change groups cache key name
|
2016-09-26 11:20:28 +02:00 |
|
Peng DU
|
82838ceb6e
|
update CHANELOG
|
2016-09-26 10:39:14 +02:00 |
|
cyril
|
b2b66e7910
|
display the edit button for admin
|
2016-09-23 14:43:34 +02:00 |
|
cyril
|
c14a4d03c5
|
ui: machines and trainings list : remove the description
|
2016-09-23 14:42:53 +02:00 |
|
cyril
|
70a95ffcd7
|
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
|
2016-09-23 14:40:47 +02:00 |
|
cyril
|
eed8f6519e
|
display caret icon for small screen in profil nav
|
2016-09-23 14:40:41 +02:00 |
|
cyril
|
8a68609b4b
|
update docker/env.example
|
2016-09-23 14:39:10 +02:00 |
|
Peng DU
|
fc9aeb00a2
|
remove edit wallet reference from facture
|
2016-09-23 12:52:43 +02:00 |
|
Peng DU
|
0f7238bbba
|
fix wallet amount display error
|
2016-09-23 11:46:58 +02:00 |
|
Peng DU
|
972a5e0a89
|
fix bug: admin cant pay a plan with code promo by wallet
|
2016-09-22 18:04:13 +02:00 |
|
Sylvain
|
81a6b996ee
|
fix sso data mmaing: if no mapping were defined for an integer value, set the raw value
|
2016-09-22 17:32:25 +02:00 |
|
Sylvain
|
205c45060a
|
update version on user login according to their role
|
2016-09-22 17:01:40 +02:00 |
|