James Allen
|
43f6b9de7c
|
Inform other clients when we accept a change
|
2017-01-09 15:54:12 +01:00 |
|
Paulo Reis
|
5e483f2a97
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-09 14:31:31 +00:00 |
|
James Allen
|
7e33d1a24e
|
Fix generation of thread id
|
2017-01-09 15:30:48 +01:00 |
|
Paulo Reis
|
f0ab1fa2d4
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-09 14:30:40 +00:00 |
|
Paulo Reis
|
4871d56725
|
Isolate overview panel overrides.
|
2017-01-09 14:30:29 +00:00 |
|
James Allen
|
9379cff89d
|
Add end point for accepting change in doc updater
|
2017-01-09 15:25:27 +01:00 |
|
James Allen
|
be19532a1d
|
Add HTTP end point for accepting changes
|
2017-01-09 14:41:18 +01:00 |
|
James Allen
|
65f4360738
|
Consolidate HttpController tests into one file
|
2017-01-09 14:34:10 +01:00 |
|
James Allen
|
593e7260d4
|
Update RangesTracker
|
2017-01-09 10:52:06 +01:00 |
|
James Allen
|
a4097b4709
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-09 10:52:01 +01:00 |
|
James Allen
|
14c624614d
|
Update RangesTracker
|
2017-01-09 10:51:55 +01:00 |
|
James Allen
|
ae30f32481
|
Use deterministic ids based on a seed
|
2017-01-09 10:49:03 +01:00 |
|
James Allen
|
7cac2f7d76
|
Generate deterministic range ids based on seed
|
2017-01-09 10:46:58 +01:00 |
|
James Allen
|
2c7029cc50
|
Revert "Support a {dr:...} op for deleting ranges"
This reverts commit 24c58e5ad430e0240533cc1e5c21122859fe8dc9.
|
2017-01-09 09:24:19 +01:00 |
|
Paulo Reis
|
037b61cbba
|
Further styling.
|
2017-01-06 17:22:22 +00:00 |
|
Henry Oswald
|
af4703a2e2
|
remove proxy_set_header X-Forwarded-Proto $scheme for https
|
2017-01-06 16:02:27 +00:00 |
|
James Allen
|
0f13cb3aa7
|
Support a {dr:...} op for deleting ranges
|
2017-01-06 16:58:51 +01:00 |
|
Paulo Reis
|
0478fcd925
|
Add comment resolution info.
|
2017-01-06 15:24:33 +00:00 |
|
James Allen
|
cb24e9390a
|
Fix comments in overview panel
|
2017-01-06 14:17:57 +01:00 |
|
James Allen
|
0e928a9aeb
|
Don't fill user details
|
2017-01-06 14:14:47 +01:00 |
|
James Allen
|
beb94b0756
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-06 13:42:08 +01:00 |
|
James Allen
|
3a5d45fa32
|
Get user info via web, not chat
|
2017-01-06 13:41:58 +01:00 |
|
Paulo Reis
|
42585085c0
|
Integrate new directive, plumb data into it. More styling.
|
2017-01-06 12:00:17 +00:00 |
|
Paulo Reis
|
f2e6e69df6
|
Add an entry directive for resolved comments, with file and quoted text.
|
2017-01-06 11:59:49 +00:00 |
|
Henry Oswald
|
0b67265eb6
|
use admin email for closed site
|
2017-01-06 11:32:57 +00:00 |
|
Henry Oswald
|
b1e6b8a5e9
|
add option to set lang per domain
|
2017-01-06 11:28:32 +00:00 |
|
Henry Oswald
|
84ce2d0e14
|
change default nav to use translations for login and register
|
2017-01-06 11:00:21 +00:00 |
|
Paulo Reis
|
a1435d13a3
|
Basic structure for the resolved comments dropdown.
|
2017-01-05 17:15:27 +00:00 |
|
Henry Oswald
|
862e15b842
|
log out user id and anonymous when loading editor
|
2017-01-05 15:02:10 +00:00 |
|
Winston Li
|
f29c7395d2
|
Tests: fix config for git init and factor all git commands into method calls
|
2017-01-05 14:34:03 +00:00 |
|
Winston Li
|
034c064c25
|
Fix for zip unzip test
|
2017-01-05 13:21:15 +00:00 |
|
Paulo Reis
|
22db36d21b
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-05 11:51:00 +00:00 |
|
Paulo Reis
|
d13035a4f4
|
Simpler UI for comments; remove some unused code.
|
2017-01-05 11:50:43 +00:00 |
|
James Allen
|
5155ebaeec
|
Don't show resolved comments when loading editor
|
2017-01-05 10:55:16 +01:00 |
|
James Allen
|
898d20a6fc
|
Fix signature of call to unresolveComment
|
2017-01-05 10:34:28 +01:00 |
|
Winston Li
|
af49325b88
|
Make submodule test more verbose
|
2017-01-04 22:35:48 +00:00 |
|
Paulo Reis
|
1599c41670
|
Sizing adjustments.
|
2017-01-04 15:34:24 +00:00 |
|
James Allen
|
60152e219b
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-04 16:26:08 +01:00 |
|
James Allen
|
84d9b2aa49
|
Save resolve and reopened state
|
2017-01-04 16:26:02 +01:00 |
|
Paulo Reis
|
fdafcf9677
|
Restyle insertions and deletions - increasing info density.
|
2017-01-04 15:24:49 +00:00 |
|
James Allen
|
1ff920e1b5
|
Add endpoints for resolving and reopening threads
|
2017-01-04 14:58:08 +01:00 |
|
Henry Oswald
|
c6153c5b44
|
- added option to set lang code
- removed commeted out learn header code
- increased max pass length to 150
|
2017-01-04 11:41:38 +00:00 |
|
Winston Li
|
e498dd3a2a
|
Merge pull request #22 from overleaf/javadoc-merge-submodule
Javadoc Merge, Improved JavaDocs/logging, Basic Auth Fixes, Submodule
|
2016-12-22 13:42:30 +00:00 |
|
Winston Li
|
9c63f06d4e
|
Change InvalidGitRepository message
|
2016-12-22 13:40:12 +00:00 |
|
Shane Kilkelly
|
fa29f0f19d
|
Fix the header-nav links option
|
2016-12-21 14:57:47 +00:00 |
|
Shane Kilkelly
|
453311136f
|
Move the filtering-out of /register links to web
|
2016-12-21 13:51:05 +00:00 |
|
Shane Kilkelly
|
7bbbfe20b9
|
If external auth is used, remove /register items from header nav.
(logic moved from docker-image settings file)
|
2016-12-21 13:50:13 +00:00 |
|
Shane Kilkelly
|
64f69069b2
|
Experimental: upgrade to node 6.9.2 (latest LTS release)
|
2016-12-21 10:23:42 +00:00 |
|
Henry Oswald
|
bcf9a17fb3
|
Merge branch 'master' into node-4.2
|
2016-12-20 15:23:02 +00:00 |
|
Shane Kilkelly
|
4bf529ef9b
|
Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image
|
2016-12-20 10:29:06 +00:00 |
|