Henrique Dias
b5c59a9ce5
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
Gruntfile.coffee
2016-06-22 16:50:53 -03:00
Henry Oswald
ba493c7322
remove debugging line
2016-06-22 11:56:29 +01:00
Henry Oswald
3061c5d41a
parse ca paths as json
2016-06-22 11:47:17 +01:00
Shane Kilkelly
cbdcc874e3
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-22 11:03:32 +01:00
Henry Oswald
50352c94f6
re minify aloglia and moment
2016-06-22 10:16:47 +01:00
James Allen
594ec9cbdd
Revert "minify algolia and moment.js"
...
This reverts commit f32a92b3c2b6c321ea7e7339110c644f9caa790c.
2016-06-22 08:00:25 +01:00
Paulo Reis
d6c966934d
Set the key binding which is reported on Windows.
2016-06-21 16:53:50 +01:00
James Allen
27a74d6b71
Improve consistency of stress test script
2016-06-21 14:31:20 +01:00
James Allen
b693ced843
Merge pull request #263 from sharelatex/pr-human-readable-logs
...
Human readable logs
2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973
Minor UI improvements.
2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e
Remove DataJoy link from the project page.
2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80
Merge branch 'ha_custom_image_logo'
2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91
Safety checks for non-existing values; avoid rendering the hint template when there is no hint.
2016-06-21 12:07:47 +01:00
Paulo Reis
1aa7d9c6b3
Explicitly set link color according to log entry type.
2016-06-21 10:49:24 +01:00
Paulo Reis
d8e0026bc6
Add class to enable per-hint feedback tracking.
2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd
Show thank you note after receiving feedback.
2016-06-20 15:04:47 +01:00
James Allen
392beac57b
Improve error reporting and retry ops in stress test script
2016-06-20 15:01:39 +01:00
Paulo Reis
baea017adb
Better mark-up for analytics tracking.
2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc
Use plain links instead of buttons.
2016-06-20 14:42:36 +01:00
James Allen
7915c2ab6c
Tweak stress test to work on server
2016-06-20 13:56:46 +01:00
Paulo Reis
ada018263a
Merge branch 'master' into pr-human-readable-logs
2016-06-20 11:54:56 +01:00
Paulo Reis
1893ae68a9
Add feedback widget for log hints.
2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3
Hint card styling.
2016-06-20 09:45:14 +01:00
Shane Kilkelly
6314dda836
Upgrade to node 4.2
2016-06-20 09:31:30 +01:00
Henry Oswald
d35a48e683
minfiy css as well
2016-06-18 21:49:32 +01:00
Henry Oswald
ec727b70a5
reduced some other images
2016-06-18 19:59:39 +01:00
Henry Oswald
4fc9c9a263
compress to 7 levels and only watch public files
2016-06-18 19:16:45 +01:00
Henry Oswald
b1e4af098d
compress images using grunt imagemin
2016-06-18 16:52:38 +01:00
Henry Oswald
1d26be30a9
added grunt imagemin used to compress images
2016-06-18 16:50:56 +01:00
Henry Oswald
fed71ea0bd
minify algolia and moment.js
2016-06-18 16:43:10 +01:00
Henry Oswald
fe11a4d835
include sentry below the fold
2016-06-18 12:29:52 +01:00
Henry Oswald
d2e4e22511
health checks should be on api router with no sessions
2016-06-18 11:58:26 +01:00
Henry Oswald
acdb7f0d5c
Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo
2016-06-17 14:55:41 +01:00
Paulo Reis
7316a429c0
Increase maximum brand image height.
2016-06-17 14:55:04 +01:00
Henry Oswald
9cd3698b0e
Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo
2016-06-17 14:41:35 +01:00
Shane Kilkelly
638ac52e40
Move the latexmk timing command into a configurable latexmkCommandPrefix
.
...
By default, no timing information will be taken.
On Linux with GNU user land, this value should be configured to `["/usr/bin/time", "-v"]`.
On Mac, gnu-time should be installed and configured to `["/usr/local/bin/gtime", "-v"]`.
2016-06-17 14:38:08 +01:00
Paulo Reis
732a0fdca0
Fit brand image into container.
2016-06-17 14:37:39 +01:00
Henry Oswald
8b79587c9b
add settings as a value to reference in defaults file
2016-06-17 14:22:20 +01:00
Henry Oswald
d27d19e02a
added override for navbar background image
2016-06-17 14:18:52 +01:00
Paulo Reis
2bfe0d0ba9
Basic mark-up for hint card.
2016-06-17 14:16:38 +01:00
James Allen
39d920682a
Only pass through keys to redis that are explicitly set in the config
2016-06-17 14:11:22 +01:00
James Allen
40b7da8edb
Support endpoints and masterName in redis config
2016-06-17 14:05:54 +01:00
Brian Gough
0906bef5f9
change default bcrypt rounds to 12, to match default in AuthenticationManager
2016-06-17 13:50:32 +01:00
Henry Oswald
19179086f0
parse left and right footers as json
2016-06-17 13:05:03 +01:00
Henry Oswald
ce9659a43b
settings.header ! settingsheader
2016-06-17 12:34:38 +01:00
Brian Gough
98a0c54004
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-17 12:22:03 +01:00
James Allen
e5cf856ddf
Add in stress test script
2016-06-17 12:17:43 +01:00
James Allen
bc00aab7b1
Explicitly separate calls to web and docupdater redis instances
2016-06-17 12:17:22 +01:00
Paulo Reis
54d48ce0ea
Support extra info URL in human readable hints.
2016-06-17 11:42:32 +01:00
Paulo Reis
40fda6e361
Support HTML in human readable log messages.
2016-06-16 16:29:19 +01:00