Shane Kilkelly
baf46628ab
Merge pull request #349 from sharelatex/revert-324-hob-add-template-fields-to-project
...
Revert "Add template id fields to project model"
2018-02-20 13:52:01 +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
9a73c123b7
Merge pull request #303 from sharelatex/hof-mongo-transaction-lock
...
Introduce 'mongo transaction lock'
2018-02-20 09:42:08 +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
cd0fd5ee48
Merge pull request #344 from sharelatex/hof-safe-pathname
...
Bugfix: move getSafePathname method
2018-02-16 13:21:22 +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
Paulo Jorge Reis
b3531d9471
Merge pull request #341 from sharelatex/pr-fix-resp-menu
...
Fix hamburger menu
2018-02-16 10:01:25 +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
James Allen
8094c5fb72
Merge pull request #325 from sharelatex/ja-fix-read-only-links
...
Fix read only links
2018-02-12 14:05:33 +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
