Alasdair Smith
|
1be9e29f35
|
Switch from button to link to fit better
|
2017-12-21 11:10:23 +00:00 |
|
Alasdair Smith
|
fb23b30c45
|
Merge branch 'master' into as-update-v2-copy
|
2017-12-21 10:57:16 +00:00 |
|
Shane Kilkelly
|
18ae27fd66
|
Merge branch 'sk-account-sync'
|
2017-12-20 14:02:45 +00:00 |
|
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
|
339b7ec14f
|
Merge branch 'ja-allow-importing-without-history'
|
2017-12-19 15:06:17 +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
|
0a4febfce6
|
Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only
only hash the static content when minified is on
|
2017-12-19 15:00:15 +00:00 |
|
James Allen
|
e18dc1e41d
|
Merge pull request #214 from sharelatex/hof-version-entity-deletion
version entity deletion
|
2017-12-19 14:59:37 +00:00 |
|
James Allen
|
731cd57250
|
Make intermediate argument signature clearer
|
2017-12-19 13:59:06 +00:00 |
|
James Allen
|
5463b608ad
|
Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history
|
2017-12-19 13:59:06 +00:00 |
|
James Allen
|
8311101ec0
|
Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps
|
2017-12-19 13:58:47 +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 |
|
Henry Oswald
|
70298ba65c
|
only hash the static content when minified is on
|
2017-12-19 13:13:31 +00:00 |
|
Paulo Reis
|
cb83e2c1b2
|
Tone down chat colors.
|
2017-12-19 10:52:23 +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 |
|
Hayden Faulds
|
ac36de9629
|
make ProjectEntityHandler._clean* argument signatures consistent
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
938caed4f7
|
set userId when deleting entities via the tpds
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
ca15fdb6eb
|
pass userId to EditorHttpController.deleteEntity
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
5f6686ed3b
|
pass userId to ProjectEntityHandler.deleteEntity
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
2ac74b9adc
|
pass userId into _clean methods in ProjectEntityHandler
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
475e84b039
|
version entity deletions in ProjectEntityHandler
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
81c061c6a7
|
acceptance test moving entities
|
2017-12-18 15:15:36 +00:00 |
|
Hayden Faulds
|
e5e75a8ccb
|
update DocumentUpdaterHandler.updateProjectStructure to support entity deletions
|
2017-12-18 15:15:36 +00:00 |
|
Shane Kilkelly
|
56ec81bb3e
|
Change 'oveleafPlanCode' to 'v1PlanCode'
|
2017-12-18 13:52:37 +00:00 |
|
Alasdair Smith
|
61900cc1ea
|
Restyle step 2 for side-by-side layout
|
2017-12-15 16:01:00 +00:00 |
|
Alasdair Smith
|
75a34024bc
|
Restyle step 1 for side-by-side layout
|
2017-12-15 13:48:53 +00:00 |
|
Henry Oswald
|
7aaf08da48
|
added no-cache endpoint
|
2017-12-15 13:38:34 +00:00 |
|
Alasdair Smith
|
8862ed383c
|
Fix project title & bold
|
2017-12-15 13:28:53 +00:00 |
|
Alasdair Smith
|
7130d0b270
|
Update v1 import modal with updated copy
|
2017-12-15 12:49:17 +00:00 |
|
Alasdair Smith
|
2b3b8b2c3b
|
Use hardcoded OL url instead of settings - no point in linking to staging faq
|
2017-12-15 12:29:39 +00:00 |
|
Alasdair Smith
|
96af59d6b5
|
Update v1 project/tag tooltips
|
2017-12-15 12:17:08 +00:00 |
|
Alasdair Smith
|
a6cd210ef6
|
Update v1 dash pane with new copy & restyle to fit correctly
|
2017-12-15 12:02:11 +00:00 |
|
Henry Oswald
|
7693d274b7
|
Merge pull request #209 from sharelatex/ho-hash-static
Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified
|
2017-12-15 09:52:23 +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
|
36c79979bd
|
More color adjustments.
|
2017-12-14 11:24:06 +00:00 |
|
Paulo Reis
|
c03ce6fdf7
|
Configure chat messages colors per brand.
|
2017-12-14 11:24:05 +00:00 |
|
Paulo Reis
|
e47b20390b
|
Add per brand UI specific chat message styles.
|
2017-12-14 11:24:05 +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
|
d947da26d7
|
Merge branch 'ho-hash-static' of https://github.com/sharelatex/web-sharelatex-internal into ho-hash-static
|
2017-12-14 11:03:20 +00:00 |
|
Henry Oswald
|
288af6772a
|
write hashes for all files we fingerprint
|
2017-12-14 10:59:46 +00:00 |
|