Julian Lam 9987d52855 Merge remote-tracking branch 'origin/master' into develop

2017-01-09 16:18:15 -05:00

..

admin

Merge remote-tracking branch 'origin/master' into develop

2017-01-03 13:39:11 -05:00

client

Merge remote-tracking branch 'origin/master' into develop

2017-01-03 13:39:11 -05:00

installer

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

modules

Merge branch 'master' into develop

2017-01-08 16:26:00 -05:00

ajaxify.js

if require call on page script fails, remove from scripts array

2017-01-09 15:02:32 -05:00

app.js

Translation bootbox wrapper

2016-12-19 15:51:43 -05:00

overrides.js

allowing timeago timestamps to be in the future

2016-12-20 13:17:20 -05:00

require-config.js

closes #4978

2016-08-26 12:53:00 +03:00

sockets.js

closes #5132

2016-11-10 15:59:08 +03:00

utils.js

closes #5273

2016-12-09 18:53:08 +03:00

widgets.js

add cid to widgets.render

2016-12-13 14:11:56 +03:00