Commit graph

5934 commits

Author SHA1 Message Date
Hayden Faulds
d924dbd1ed improve metrics 2018-02-20 13:58:09 +00:00
Shane Kilkelly
05faf06f59 Revert "Add template id fields to project model" 2018-02-20 13:51:30 +00:00
Shane Kilkelly
57d50a68f8 Merge pull request #324 from sharelatex/hob-add-template-fields-to-project
Add template id fields to project model
2018-02-20 13:40:11 +00:00
Alasdair Smith
ff88b0adaf Merge pull request #346 from sharelatex/as-fix-cursor
Fix bug where cursor position wouldn't be saved when switching documents
2018-02-20 12:01:58 +00:00
Hayden Faulds
d750f942de fix: stop pass milis not seconds into setTimeout 2018-02-20 10:26:24 +00:00
Hayden Faulds
e50c3837bc add extra metrics around locking 2018-02-19 12:15:02 +00:00
Alasdair Smith
fafbbfef87 Fix bug where cursor position wouldn't be saved when switching documents
This was caused by an underlying bug/poor optimisation where the aceEditor
directive would be reconstructed every time when switching between documents.
This wiped instances like CursorPositionManager which relies on keeping state
between doc changes.

Now the directive is only removed when switching between Ace and CM. This
prevents other potential bugs and improves performance.
2018-02-19 11:45:00 +00:00
Hayden Faulds
23c7ab0529 add locking tests 2018-02-16 16:57:12 +00:00
Hayden Faulds
dd582d1b2e type-check ProjectGetter.getProject and getProjectWithoutLock arguments 2018-02-16 14:44:21 +00:00
Hayden Faulds
693c8e8c60 move where lock keys are defined 2018-02-16 14:44:21 +00:00
Hayden Faulds
a05d172052 clean up variable names in ProjectGetter.getProject 2018-02-16 14:44:21 +00:00
Hayden Faulds
66cd5cd24b use ProjectGetter.getProject in other ProjectGetter methods 2018-02-16 14:44:21 +00:00
Hayden Faulds
95b82a3c9d use ProjectGetter in ProjectLocator.findElementByPath 2018-02-16 14:44:21 +00:00
Hayden Faulds
cbc6fb232d add mongo transaction lock when getting or updating projects 2018-02-16 14:44:21 +00:00
Brian Gough
fc1e94b14a Merge pull request #343 from sharelatex/bg-block-javascript-property-names
block javascript property names being used as file names
2018-02-16 14:07:12 +00:00
Brian Gough
2ba7db603f Merge pull request #337 from sharelatex/ja-allow-javascript-property-names
Use bare objects without prototypes for tracking filenames
2018-02-16 14:05:21 +00:00
Hayden Faulds
eb198cd8c3 make getSafePathname a method in CompileController rather than Project 2018-02-16 13:10:48 +00:00
Hayden Faulds
5456f4224c Merge pull request #339 from sharelatex/hof-project-getter
use ProjectGetter rather than Project directly
2018-02-16 11:34:21 +00:00
Brian Gough
8a10e98b56 block javascript property names being used as file names 2018-02-16 10:31:47 +00:00
Paulo Reis
3f14a727e3 Make sure the hamburger menu plays well with the brand. 2018-02-16 10:26:26 +00:00
Hayden Faulds
304a6bc332 use ProjectGetter rather than Project directly 2018-02-16 08:55:09 +00:00
James Allen
20347da44d Ignore public/brand 2018-02-15 14:54:58 +00:00
James Allen
6f143603a3 Remove unused brand folder 2018-02-15 14:54:34 +00:00
Paulo Reis
51b14e412f Increase hamburguer menu max-height; 340px was less than SL menu fully expanded. 2018-02-15 11:51:45 +00:00
Paulo Reis
e2874998b3 Improve hamburguer menu in v2, still not perfect. 2018-02-15 11:46:40 +00:00
Paulo Reis
f01b027da0 Make sure the menu behaviour does not change in desktop resolutions. 2018-02-15 11:29:29 +00:00
Paulo Reis
058a58d099 Only apply horizontal paddings (to align with the header). 2018-02-15 11:12:32 +00:00
Paulo Reis
ebad9091c7 Create class to scope main header changes (avoids overriding too much Bootstrap stuff); apply styles. 2018-02-15 11:08:12 +00:00
James Allen
4754f1e78a Use bare objects without prototypes for tracking filenames 2018-02-15 11:06:40 +00:00
Paulo Reis
f1717bfa1f Allow header content to be on top of main content. 2018-02-15 10:58:36 +00:00
Hayden Faulds
aa89b7e70b Merge pull request #327 from sharelatex/hof-entity-refactoring
Refactor ProjectEntityHandler
2018-02-14 13:28:41 +00:00
hugh-obrien
5d1c2a9cf6 rename v1 template fields on project module 2018-02-14 11:07:38 +00:00
James Allen
a7fabb8e43 Merge pull request #321 from sharelatex/ja-recompile-tweaks
Animate toolbar for auto-compile and consolidate trigger logic
2018-02-14 09:34:16 +00:00
Hayden Faulds
9ed2d7f971 fix excess argument pass into UpdateMerger.p.processFile 2018-02-13 14:39:38 +00:00
Hayden Faulds
e9b218fe5f allow the updating of doc lines for deleted docs 2018-02-13 14:39:38 +00:00
James Allen
a427414920 Merge pull request #331 from sharelatex/ja-autocomplete-fix
Potential fix for the auto-complete bug
2018-02-13 09:41:00 +00:00
Shane Kilkelly
9c83ff5353 Merge pull request #316 from sharelatex/afc-fix-typo-in-path
Update analytics manager to use new path
2018-02-13 09:39:09 +00:00
Shane Kilkelly
9a7b3c2b23 Merge pull request #320 from sharelatex/sk-retry-analytics-requests
Add a retry to analytics requests
2018-02-13 09:38:56 +00:00
James Allen
29d2b408ad Don't error when detaching from history with no sharejsDoc 2018-02-13 08:43:00 +00:00
James Allen
5d3ecdb924 Add explicit editor init event 2018-02-13 08:27:48 +00:00
James Allen
3802df5cfa Use popup instance variable like Ace autocompleter does 2018-02-13 08:27:41 +00:00
Hayden Faulds
2f9f26eae2 fix logging 2018-02-12 16:05:34 +00:00
Shane Kilkelly
0efc8136cb Use requestretry node package 2018-02-12 15:16:21 +00:00
Hayden Faulds
29018d5af6 run make clean before compile_full on CI 2018-02-12 13:34:00 +00:00
Hayden Faulds
458bbc7cfd refactor ProjectEntityHandler
- moves project locking into ProjectEntityHandler
- splits ProjectEntityHandler into ProjectEntityHandler,
  ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler
- adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to
  EditorController and ProjectEntiyUpdateHandler
2018-02-12 13:33:59 +00:00
James Allen
5d6925921c Fix read only links 2018-02-12 10:42:57 +00:00
Brian Gough
5fef846a6c Merge pull request #323 from sharelatex/bg-translate-error-message-for-duplicate-names
add translation for new doc/folder  "already exists" error
2018-02-12 10:08:46 +00:00
Brian Gough
3c9eb07848 Merge pull request #322 from sharelatex/bg-validate-filename-length-client
validate filename length client
2018-02-12 10:08:03 +00:00
hugh-obrien
ea736390a1 add template id fields to project model 2018-02-11 16:58:45 +00:00
James Allen
92e59f7008 Remove unneeded apply 2018-02-09 17:58:19 +00:00
James Allen
ab940fb462 Fix typo in comment 2018-02-09 17:54:58 +00:00
James Allen
9e86abbb04 Remove unneeded webkit prefix in css 2018-02-09 17:54:42 +00:00
Brian Gough
8e048bcf67 add translation for new doc/folder "already exists" error 2018-02-09 16:37:38 +00:00
Brian Gough
ecea3dd1be add an extra test for invalid element names 2018-02-09 15:13:58 +00:00
Brian Gough
2c2b6e5f36 fix filename length check 2018-02-09 15:05:52 +00:00
Alasdair Smith
6088fcf82b Merge pull request #310 from sharelatex/ja-link-sharing-tweaks
Link sharing UX improvments
2018-02-09 11:23:28 +00:00
Alasdair Smith
f109d5a56c Merge pull request #311 from sharelatex/ja-fix-template
Fix typo and file extension in example tex template
2018-02-09 11:23:20 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm
CodeMirror
2018-02-09 11:23:11 +00:00
Alasdair Smith
b7200066e9 Inject rich text variable to conditionally show rich text styles 2018-02-09 10:42:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Alasdair Smith
4c23a3c8f0 Fix bug where spell check cache would error when toggling between ace & cm 2018-02-09 10:42:11 +00:00
Alasdair Smith
d15efc6fb6 Create cmEditor directive to connect to ShareJS 2018-02-09 10:42:11 +00:00
Alasdair Smith
b9327cb2d4 Add toolbar with button to toggle rich text 2018-02-09 10:42:00 +00:00
Alasdair Smith
7783e18a50 Allow Documents to be attached to CM 2018-02-09 10:38:51 +00:00
Alasdair Smith
09fbafa1f6 Include ShareJS CM adapter in compiled lib and fix bug with CM adapter
Because the CM & Ace scripts are naively concat-ed together, the Ace
applyToShareJS function would be overwritten by the CM version.

Also fixes bugs where adapter was calling old version of ShareJS api
and the old CM api
2018-02-09 10:38:51 +00:00
Alasdair Smith
f5b6d3ff3e Load basic CM instance with dummy content 2018-02-09 10:38:51 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message
improved recaptcha error message
2018-02-09 10:26:33 +00:00
Alasdair Smith
d8e87997c1 Install codemirror 2018-02-09 10:02:36 +00:00
Henry Oswald
ccffdc3265 added blog url to config 2018-02-08 14:47:54 +00:00
James Allen
bd9f30d858 Adjust icon spacing in PDF toolbar 2018-02-08 14:41:39 +00:00
James Allen
7866a91d21 Refactor auto-compile trigger logic 2018-02-08 13:39:59 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Shane Kilkelly
8117061674 Make the retry-on-fail behaviour optional 2018-02-08 13:04:47 +00:00
Shane Kilkelly
1c15e0966c Add a retry to analytics requests 2018-02-08 11:42:48 +00:00
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +00:00
Brian Gough
14ef9a2c49 comment out broken length check 2018-02-08 10:08:22 +00:00
Brian Gough
cba4a391a9 Merge pull request #314 from sharelatex/bg-validate-filenames-server
server side check for valid filenames
2018-02-08 09:16:31 +00:00
Brian Gough
9224e164fe Merge pull request #315 from sharelatex/bg-validate-filenames-client
validate filenames on the client
2018-02-08 09:16:05 +00:00
Brian Gough
b083e4bc5f remove redundant MAX_PATH definition 2018-02-07 16:14:56 +00:00
Brian Gough
c14380d563 use the SafePath.coffee file in the client too 2018-02-07 15:50:29 +00:00
Brian Gough
9c36b38e2c make SafePath.coffee shareable between client and server code 2018-02-07 15:43:56 +00:00
Brian Gough
57549d32be remove unused path module 2018-02-07 15:28:26 +00:00
Brian Gough
2a5ed0caf5 use Errors.InvalidName instead of plain Error object 2018-02-07 15:22:00 +00:00
Brian Gough
c6f74d24f1 add missing SafePath.clean function 2018-02-07 15:21:04 +00:00
Henry Oswald
df9b866bee remove 'script blocker' from recaptcha message 2018-02-07 14:24:15 +00:00
Henry Oswald
b387ca3b2a change wording on recaptcha to JLM's option 2018-02-07 14:19:33 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
2018-02-07 14:15:13 +00:00
Shane Kilkelly
a06c4003f9 Merge pull request #312 from sharelatex/sk-add-from-v2-flag-to-analytics
Add a `fromV2` flag to Analytics events, when coming from V2 instance
2018-02-07 09:48:11 +00:00
Alberto Fernández Capel
413e81f29a Update analytics manager to use new path
It fixes a typo in the path.

Related to https://github.com/sharelatex/analytics-sharelatex/pull/43
2018-02-07 09:39:00 +00:00
James Allen
5edeff36b6 Vertically center caret 2018-02-06 16:22:20 +00:00
Brian Gough
76281a3d79 use extended file validation rules in frontend 2018-02-06 11:46:50 +00:00
Brian Gough
ddf1d6e65e add valid-file directive for front-end 2018-02-06 11:46:50 +00:00
Brian Gough
7f727d434e server side check for valid filenames 2018-02-06 10:44:58 +00:00
Alasdair Smith
e93e055b13 Merge pull request #309 from sharelatex/ja-tags-folders-tweaks
UX tweaks to tags/folders side bar entry
2018-02-06 10:36:15 +00:00
Alasdair Smith
e3811d33e9 Merge pull request #302 from sharelatex/msw-history-failure
Bail out if history API request fails
2018-02-06 10:35:57 +00:00
Shane Kilkelly
6d8b50efc4 Add a fromV2 flag to Analytics events, when coming from V2 instance 2018-02-06 10:35:15 +00:00
James Allen
fc4ffc3905 Fix typo and file extension in example tex template 2018-02-06 10:27:10 +00:00
Alasdair Smith
0c2d7e250f Merge pull request #308 from sharelatex/as-upgrade-less
Update Less/grunt-contrib-less to latest version
2018-02-06 10:21:14 +00:00
James Allen
6a1597560e Remove unused modal templates 2018-02-06 10:16:06 +00:00
James Allen
4f89506afc Make link sharing more prominant 2018-02-06 10:06:32 +00:00