Shane Kilkelly
e4e8520f27
Merge branch 'node-6.9'
2017-04-13 10:10:43 +01:00
Henry Oswald
65b83f2c67
added space before email for closed site
2017-04-12 17:04:12 +01:00
Shane Kilkelly
a9b8b864df
Move content-disposition setting into a method on res
2017-04-12 16:00:02 +01:00
Shane Kilkelly
02d75deaa0
when setting content-disposition, uri-encode names
2017-04-12 09:31:59 +01:00
Henry Oswald
0961a034ea
added rate limit to compile endpoint
2017-04-11 16:08:38 +01:00
James Allen
6d2f18016f
Move tpds worker error ignoring logic into tpdsUpdateSender
2017-04-11 15:41:17 +01:00
James Allen
7c8f228f48
Continuing flushing document on tpds worker error
2017-04-11 14:02:08 +01:00
Shane Kilkelly
f398e87e6f
Merge branch 'master' into node-6.9
2017-04-11 11:34:53 +01:00
James Allen
f6bd949f01
Error if no project returned from joinProject
...
socket.io seems to choke on the unicode project name and just return
undefined when it fails to parse the JSON. I've improved the escaping
of the user data on HTML load, but reporting an error is the best we
can easily do on joinProject via websockets.
2017-04-10 12:03:39 +01:00
Paulo Reis
332e4a80b2
Also fix iOS icon path.
2017-04-07 14:43:07 +01:00
Paulo Reis
a7d3721882
Fetch favicon and related assets from root.
2017-04-07 14:31:21 +01:00
James Allen
477278eea5
Merge pull request #476 from sharelatex/ja-use-new-comment-button
...
Fix on the new comment button variation
2017-04-05 11:08:59 +01:00
James Allen
ce59307c91
Merge pull request #475 from sharelatex/ja-scroll-overflow-in-review-panel
...
Allow scrolling in the review panel to extend outside of top of text …
2017-04-05 11:08:49 +01:00
James Allen
7d24fbc225
Merge pull request #477 from sharelatex/ja-encode-project-names
...
Properly pass project data as JSON and then parse it
2017-04-05 11:08:37 +01:00
James Allen
6e7b2aaacb
Merge pull request #478 from sharelatex/pr-fix-safari-accent-handling
...
Fix safari accent handling
2017-04-05 11:08:24 +01:00
Shane Kilkelly
061d2e604f
re-add npm-shrinkwrap.json
2017-04-05 10:17:32 +01:00
Shane Kilkelly
bb65da88fe
Merge branch 'master' into node-6.9
2017-04-05 10:15:51 +01:00
Paulo Reis
2ac6b70a1c
Use workaround from Ace's commits.
2017-04-04 17:08:23 +01:00
Shane Kilkelly
0555154a24
Merge branch 'sk-fix-folder-creation'
2017-04-04 11:01:07 +01:00
Paulo Reis
7855afa0cd
Remove unused scope binding.
2017-04-04 10:48:31 +01:00
James Allen
8d0186532f
Properly pass project data as JSON and then parse it
2017-04-04 10:46:46 +01:00
Paulo Reis
15de552c2c
Make new add comment button styles as the default; removed old add comment button code.
2017-04-04 10:40:53 +01:00
Shane Kilkelly
fc9bf838fc
Merge branch 'sk-upgrade-metrics'
2017-04-04 10:28:58 +01:00
James Allen
567edbfb31
Fix on the new comment button variation
2017-04-03 17:11:33 +01:00
James Allen
2fa909c707
Allow scrolling in the review panel to extend outside of top of text like Ace
2017-04-03 16:46:36 +01:00
Paulo Reis
c2df5dc01c
Apply Chrome's accent input workaround in Safari version 10.1.
2017-04-03 16:26:20 +01:00
Paulo Reis
20732ed571
Add Safari user-agent detection in Ace useragent lib.
2017-04-03 16:24:19 +01:00
Shane Kilkelly
043520fc28
Remove the Metrics module, use metrics-sharelatex
2017-04-03 16:18:30 +01:00
James Allen
335f8f78f0
Merge pull request #445 from sharelatex/pr-new-logo
...
PR New logo
2017-04-03 14:05:51 +01:00
James Allen
6b03e4b2a1
Merge pull request #470 from sharelatex/pr-fix-high-cpu-firefox
...
Set video source only when the onboarding prompt is shown.
2017-04-03 14:04:27 +01:00
James Allen
efac6b70f4
Merge pull request #468 from sharelatex/ja-allow-overlapping-comments
...
Allo overlapping comments
2017-04-03 14:04:14 +01:00
James Allen
1675185f37
Merge pull request #474 from sharelatex/pr-project-name-tooltip
...
Project name tooltip
2017-04-03 14:04:02 +01:00
James Allen
8161b0ff1e
Merge pull request #472 from sharelatex/pr-fix-resolved-comments-order
...
Use ISO strings instead of of date type in locally resolved comments.
2017-04-03 14:03:25 +01:00
Paulo Reis
4a86ff4b44
Merge branch 'master' into pr-new-logo
2017-04-03 11:17:39 +01:00
Paulo Reis
6b9b8480a8
Only show the tooltip if the project name is truncated.
2017-03-31 16:36:58 +01:00
Paulo Reis
5b8c36dfc0
Add a project name tooltip.
2017-03-31 16:13:23 +01:00
Shane Kilkelly
49de7bf315
mock out metrics in test
2017-03-31 14:54:20 +01:00
Shane Kilkelly
60b298d9ee
upgrade to latest metrics
2017-03-31 14:43:19 +01:00
Paulo Reis
855d37289b
Use ISO strings instead of of date type in locally resolved comments.
2017-03-31 14:29:28 +01:00
Shane Kilkelly
bee62400a6
Merge branch 'master' into sk-upgrade-metrics
2017-03-31 14:08:12 +01:00
Shane Kilkelly
cc81eca902
Account for error being null
2017-03-31 10:46:13 +01:00
Shane Kilkelly
2c62acee0b
Cleaner error reporting for addFolder
endpoint
2017-03-31 10:31:03 +01:00
Shane Kilkelly
15d0a40f85
When error occurs, unset state.inflight
2017-03-31 10:30:28 +01:00
Shane Kilkelly
49446afb82
Remove duplicate line
2017-03-31 10:30:10 +01:00
Paulo Reis
e9a5c37fb6
Adjust grey tone in error pages.
2017-03-30 16:46:04 +01:00
Paulo Reis
5ae7baccf5
New logo with better spacing.
2017-03-30 16:39:44 +01:00
Paulo Reis
250d19163b
Set video source only when the onboarding prompt is shown.
2017-03-30 10:35:16 +01:00
Brian Gough
42009093ef
Merge pull request #469 from sharelatex/bg-fix-tikzfeynman-code-check
...
handle the \feynmandiagram command in code check
2017-03-29 15:57:34 +01:00
Brian Gough
13492c7fc4
handle the \feynmandiagram command in code check
...
pulled from our ace repository https://github.com/sharelatex/ace
commit baeb9aff561d048b8a839683261ffdf149ecd4ef
2017-03-29 15:27:10 +01:00
Paulo Reis
f298fac638
Improve wording on error pages.
2017-03-28 16:57:08 +01:00