Henry Oswald
ec41f984e6
Merge branch 'ho-remove-groove'
2017-12-20 13:37:15 +00:00
Paulo Reis
0a0c6c6c0c
Merge branch 'master' into pr-style-v2-chatpane
2017-12-20 09:50:49 +00:00
James Allen
1d89a535a1
Merge pull request #208 from sharelatex/ja-front-end-history
...
Add in web front end that supports v2 history; Fixes #168
2017-12-19 15:00:34 +00:00
James Allen
d84580f12d
Label actions with text rather than icons
2017-12-19 13:58:47 +00:00
James Allen
8a3fadbfc1
Style the edit/add/rename options
2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2
Add HistoryV2Manager alongside existing HistoryManager
2017-12-19 13:58:47 +00:00
James Allen
4691a6e85c
Get diffs showing in client
2017-12-19 13:58:47 +00:00
James Allen
a1615e6d84
Prototype of requesting history information by doc path, while tracking renames
2017-12-19 13:58:47 +00:00
Shane Kilkelly
529d35936d
Merge pull request #203 from sharelatex/sk-prevent-archived-deletion
...
Prevent user from trying to delete archived project they don't own
2017-12-19 13:36:26 +00:00
Alasdair Smith
f3342f327d
Merge pull request #202 from sharelatex/as-v2-upgrade-redirect
...
Use V1 trial page on V2 instead of legacy SL
2017-12-19 10:07:08 +00:00
Alasdair Smith
dc2ddf7e09
Check for OL free trial instead of host as it may be fragile indicator
2017-12-18 16:53:58 +00:00
Alasdair Smith
da2c0b3fea
Switch redirectToOLFreeTrialUrl to calculate trial url
...
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
2017-12-14 17:09:11 +00:00
Alasdair Smith
7322522323
Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl
2017-12-14 17:05:12 +00:00
Henry Oswald
bf276b0814
ripped file fingerprinting out
2017-12-14 12:11:13 +00:00
Henry Oswald
cbf656518f
remove versioned files from fingerprinting
2017-12-14 11:24:47 +00:00
Paulo Reis
ca68f01a9d
Build chat message styles on the controller side (allowing for extra parameters).
2017-12-14 11:23:22 +00:00
Henry Oswald
bbbba701b0
Update editor.pug
2017-12-14 10:21:53 +00:00
Henry Oswald
490c56c692
libs -> libraries
...
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald
f021f21f11
only hash when minified
2017-12-13 16:37:51 +00:00
Henry Oswald
ccbb15c82e
remove fingerprint from ide
2017-12-13 14:54:08 +00:00
Alasdair Smith
e7992e65e4
Merge branch 'master' into as-v2-upgrade-redirect
2017-12-13 14:45:51 +00:00
Henry Oswald
dd6bd3b91e
Merge branch 'master' into ho-hash-static
2017-12-13 14:25:32 +00:00
Henry Oswald
357617d952
works with libs compiled into it
2017-12-13 14:19:19 +00:00
Henry Oswald
88334959d7
added remove extension
2017-12-13 14:13:45 +00:00
Henry Oswald
65efbbce53
seems to work now.
2017-12-13 13:06:38 +00:00
Henry Oswald
80e6a660be
wip, this does not work minified yet
...
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
Shane Kilkelly
603252f3b4
Prevent user from trying to delete archived project they don't own
...
This change disables the select-project checkbox if the user
is on the 'archived' project pane and they don't own the project.
The request to delete would fail anyway, but this prevents UI confusion
2017-12-12 16:23:24 +00:00
Alasdair Smith
4126e9bd31
Merge branch 'master' into as-v1-dash-link
2017-12-12 09:55:48 +00:00
Alasdair Smith
f5c914ed6c
When upgrading track changes on V2, redirect to V1 trial page
2017-12-11 18:03:09 +00:00
Paulo Reis
edfc259c53
Fix missing border on SL.
2017-12-11 16:55:50 +00:00
Paulo Reis
59e675797e
Merge branch 'master' into pr-style-v2-resizers
2017-12-11 15:55:50 +00:00
James Allen
69499847e4
Refactor front end code into validateCaptcha service
2017-12-11 12:32:43 +00:00
James Allen
0b03bbc7c3
Don't inject recaptcha element if recaptcha is not enabled
2017-12-11 12:04:33 +00:00
James Allen
83086e4a79
Add recaptch to share endpoint
2017-12-11 11:57:59 +00:00
Paulo Reis
7c5a7880b0
Merge branch 'master' into pr-style-v2-resizers
2017-12-06 15:49:18 +00:00
Alasdair Smith
48cd048e5c
Merge branch 'master' into as-v1-dash-link
2017-12-06 15:12:29 +00:00
Paulo Jorge Reis
a5f99ccce3
Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling
...
V2 editor styling
2017-12-06 11:22:28 +00:00
Alasdair Smith
2d66fd7280
Merge pull request #169 from sharelatex/as-import-v1
...
V1 Import Modal
2017-12-05 13:19:49 +00:00
Paulo Reis
5dffdf3efc
Add a small a11y fix.
2017-12-05 10:23:28 +00:00
Paulo Reis
a88538c3fd
Make the back to projects button closer to current SL.
2017-12-05 10:20:25 +00:00
Alasdair Smith
c84c00d56d
Change query param for nicer api on OL side
2017-12-04 15:19:03 +00:00
Paulo Reis
0bad7d8549
Adjustments to synctex controls.
2017-12-04 15:12:13 +00:00
Alasdair Smith
77dc7adf1f
Revert "Move to sidebar template"
...
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
2017-12-04 14:53:18 +00:00
Paulo Reis
9fda8e62fa
Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers
2017-12-04 13:48:52 +00:00
Paulo Reis
fd852004fe
Refactor synctex controls z-index handling.
2017-12-04 12:25:40 +00:00
Alasdair Smith
ab78cea48d
Move to sidebar template
2017-12-04 12:24:21 +00:00
Alasdair Smith
1fd518ec58
Add query param to mark as explicitly using V1 dash
2017-12-04 12:22:27 +00:00
Alasdair Smith
a25464d925
Add check for OL host
2017-12-04 11:34:00 +00:00
Alasdair Smith
f595009911
Switch to existing v1 dash flag
2017-12-04 11:23:09 +00:00
James Allen
52b414498c
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:03:38 +00:00