Commit graph

6403 commits

Author SHA1 Message Date
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
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