Brian Gough
3881eb1d78
check for duplicates on rename
2018-01-24 10:07:42 +00:00
Brian Gough
c6cca79737
check for duplicates in addFolder
2018-01-24 10:07:42 +00:00
Brian Gough
b537747ccd
check for duplicates in putElement
2018-01-24 10:07:42 +00:00
Brian Gough
77adb60a8a
fix typo in project getter exclusions
2018-01-24 10:06:53 +00:00
Alberto Fernández Capel
4ca71fb379
Do not track anonymous sessions
...
And DRY the controller a bit.
2018-01-23 15:51:10 +00:00
James Allen
d7706f642b
Show the creator as the owner if no owner present
2018-01-23 13:47:48 +00:00
Alberto Fernández Capel
8714909a9a
Build query string with style
2018-01-23 12:47:51 +00:00
James Allen
d5c5d9c204
Merge pull request #268 from sharelatex/as-unsupported-project-error
...
Adds UnsupportedBrandError & UnsupportedExportRecordsError types
2018-01-23 10:30:33 +00:00
Alberto Fernández Capel
0bef5531bb
Rename editSession -> editingSession
2018-01-23 10:29:11 +00:00
James Allen
d79d6b4ede
Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents
2018-01-22 16:25:11 +00:00
Alberto Fernández Capel
868e32c1bc
Send edit sessions heartbeat to the analytics service
2018-01-22 15:10:52 +00:00
Alberto Fernández Capel
1a1ccc9f46
Remove trailing whitespace
2018-01-22 15:00:56 +00:00
Alasdair Smith
89af8ba123
More renaming
2018-01-18 16:41:26 +00:00
Alasdair Smith
f8a068ee9e
Rename to be more explicit about the error
2018-01-18 15:42:32 +00:00
Alasdair Smith
649ca86a75
Add publisher exports error type
2018-01-18 15:41:14 +00:00
Alasdair Smith
f234e84c95
Export error
2018-01-18 12:09:33 +00:00
Alasdair Smith
950ef0cebb
Add unsupported project error
2018-01-17 17:50:09 +00:00
Alasdair Smith
4d29c4d769
Remove unused link sharing onboarding now at 100%
2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc
Remove unused autocompile rollout logic now that at 100%
2018-01-17 15:17:55 +00:00
James Allen
6d04eeaa03
Merge pull request #256 from sharelatex/ja-display-v2-history-users
...
Inject v2 user details into project-history updates and diffs
2018-01-15 14:21:14 +00:00
James Allen
67061154fe
Merge pull request #237 from sharelatex/hof-editor-controller-locking
...
Project Locking: EditorController
2018-01-15 14:21:03 +00:00
Timothée Alby
62bc3f947f
Merge pull request #257 from sharelatex/ta-remove-proxy-headers
...
Remove headers when proxying analytics request
2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24
use LockManager.runWithLock in EditorController
2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a
rename EditorController.replaceFile -> replaceFileWithoutLock
2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149
add locking for EditorController.renameEntity
2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6
remove all headers when proxying the analytics request
2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3
Merge pull request #251 from sharelatex/fix-group-member-subscription-page
...
Fix subscription page for members of a group
2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f
Merge pull request #242 from sharelatex/rename-entity-bugfix
...
Ensure the dirname is not affected when we rename an entity
2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d
Fix next -> callback
2018-01-11 14:11:44 +00:00
James Allen
17a5dfa5a5
Inject v2 user details into project-history updates and diffs
2018-01-11 11:32:16 +00:00
James Allen
945ef25ef5
Merge pull request #244 from sharelatex/hof-lock-file-upload
...
Project Locking: ProjectUploadController
2018-01-11 08:42:36 +00:00
Tim Alby
c1febbeb7c
run analytics proxy on public API router
2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d
Merge pull request #241 from sharelatex/ta-analytics-proxy
...
Proxy requests to analytics service
2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f
Merge pull request #234 from sharelatex/hof-remove-unused-method
...
remove unused EditorController.getListOfDocPaths
2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5
proxy requests to analytics service
2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
a81b56556f
Add test for SubscriptionViewModelBuilder
2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a
use LockManger.runWithLock
2018-01-09 16:37:34 +00:00
Alberto Fernández Capel
6d007bfe74
DRY logic to get subscription from Recurly
...
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736
Fix subscription page for members of a group
...
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.
SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
James Allen
bbfcff30fb
Enable project history for new projects if enabled in settings
2018-01-03 16:55:33 +00:00
James Allen
0f1b0be231
Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging
...
Change an erroneous `logger.error` to `logger.log`; Fixes #227
2018-01-03 11:30:46 +00:00
James Allen
7918232757
Merge pull request #240 from sharelatex/pr-v2-styling-fixes
...
v2 styling fixes
2018-01-03 11:30:39 +00:00
James Allen
ada76e820a
Merge pull request #238 from sharelatex/as-ol-emails
...
v2 themed emails
2018-01-03 11:30:28 +00:00
Alasdair Smith
b2d92ea482
Increase autocompile rollout to 100%
2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0
lock project when uploading a file
2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04
Ensure the dirname is not affected when we rename an entity
...
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
2017-12-22 14:24:00 +00:00
Paulo Reis
0484b46027
Redundancy.
2017-12-21 13:52:34 +00:00
Paulo Reis
484d34e296
Only render announcements in SL.
2017-12-21 12:57:07 +00:00
Alasdair Smith
0114ed362f
Swap out email templates based on brand prefix
2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48
Fix OL auto-linking styles
2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824
Change an erroneous logger.error to logger.log
2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146
Add OL themed email templates
2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1
Clean up whitespace
2017-12-20 17:52:49 +00:00
Hayden Faulds
8663dba37c
remove unused EditorController.getListOfDocPaths
2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e
Remove unnecessary & incorrect title
2017-12-20 14:10:05 +00:00
Shane Kilkelly
18ae27fd66
Merge branch 'sk-account-sync'
2017-12-20 14:02:45 +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
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
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
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
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
Henry Oswald
7aaf08da48
added no-cache endpoint
2017-12-15 13:38:34 +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
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
Henry Oswald
288af6772a
write hashes for all files we fingerprint
2017-12-14 10:59:46 +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
716b309208
remove todo statments
2017-12-13 16:50:18 +00:00
Alasdair Smith
4a9c9c563a
Merge branch 'master' into as-autocompile-rollout-60
2017-12-13 14:44:31 +00:00
Henry Oswald
dd6bd3b91e
Merge branch 'master' into ho-hash-static
2017-12-13 14:25:32 +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
Alasdair Smith
60b00d2b94
Merge pull request #196 from sharelatex/as-clean-up-failed-import
...
Add unsupported file type error
2017-12-13 10:31:02 +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
Alasdair Smith
5c62ac4f8a
Change error type for consistency
2017-12-12 12:59:10 +00:00
Paulo Reis
59e675797e
Merge branch 'master' into pr-style-v2-resizers
2017-12-11 15:55:50 +00:00
Paulo Reis
0652fc62a0
Configure resizer cursors for v2.
2017-12-11 15:33:00 +00:00
James Allen
53dc8cddfc
Refactor captcha into middleware and angular service
2017-12-11 12:58:55 +00:00
James Allen
83086e4a79
Add recaptch to share endpoint
2017-12-11 11:57:59 +00:00
Henry Oswald
314dcd1901
added null checks to mandrill
2017-12-11 11:48:31 +00:00
Alasdair Smith
89bdb6eff9
Increase autocompile rollout to 60%
2017-12-11 11:45:53 +00:00
Henry Oswald
bd7e2d956d
add mandrill as email option
2017-12-11 11:05:04 +00:00
