Commit graph

3260 commits

Author SHA1 Message Date
Alasdair Smith
5e39e61c9b Merge pull request #348 from sharelatex/as-fix-cm-share
Fix CodeMirror/ShareJS binding when switching docs
2018-02-23 10:12:12 +00:00
Alasdair Smith
92260e7b52 Merge pull request #340 from sharelatex/ja-remove-brand
Remove the public/brand folder
2018-02-23 10:11:47 +00:00
James Allen
1d3db923f0 Tidy up logic (a bit) around guest track changes 2018-02-23 09:55:57 +00:00
Alasdair Smith
2be37795bd TODO for cleaning up sharejs callbacks 2018-02-22 11:44:09 +00:00
Alasdair Smith
598837e17c Use applyAsync to prevent issue when switching docs 2018-02-22 11:44:09 +00:00
Alasdair Smith
c5735a31df Remove unused listener 2018-02-22 11:44:09 +00:00
Alasdair Smith
e1187f3d8a Listen for changes to the CodeMirror Doc, instead of all changes to the editor
This prevents an issue where switching docs (i.e. files) would cause the newly
opened doc from being inserted into the old doc.

This approach is similar to Ace's sessions.
2018-02-22 11:44:09 +00:00
Alasdair Smith
c85e9ba3b1 Instead of setting value of CM, swap Docs
This allows for tracking changes on individual docs (i.e. files), instead of
just changes to the editor. This is similar to how Ace works with sessions
2018-02-22 11:44:09 +00:00
Alasdair Smith
eae8b5a592 Merge pull request #330 from sharelatex/as-karma-tests
Karma tests
2018-02-22 11:06:56 +00:00
Paulo Reis
f1a36919f9 Make sure the widget does not overlap the footer. 2018-02-21 13:39:39 +00:00
Alasdair Smith
0b77e97df2 Added angular mocks for testing and stub out globals 2018-02-20 14:01:02 +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
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
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
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
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
James Allen
5d6925921c Fix read only links 2018-02-12 10:42:57 +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
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
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
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
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +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
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
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
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
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
4f89506afc Make link sharing more prominant 2018-02-06 10:06:32 +00:00
James Allen
37115b8408 Add loading indicator while server returns links 2018-02-06 10:00:59 +00:00
James Allen
e7ba75c2e5 Don't show pop-up when changing link sharing status 2018-02-06 09:56:46 +00:00
James Allen
3e5527b826 UX tweaks to tags/folders side bar entry 2018-02-05 17:04:56 +00:00
Paulo Reis
3c3bb0a892 Use globalVars strategy to do v2-specific styling. 2018-02-05 16:20:33 +00:00
Alberto Fernández Capel
ae33b84289 Ignore heartbeat event handler params
They are not used for anything and the cause an error when
the handler is called from a scroll event.
2018-02-05 13:48:52 +00:00
James Allen
9e5c98dd07 Use local references to variable 2018-02-01 16:52:43 +00:00
Shane Kilkelly
19c97cb15b Merge pull request #289 from sharelatex/afc-track-edit-sessions
Send editing session heartbeat to the analytics service
2018-02-01 12:31:38 +00:00
Brian Gough
5e52ade1ff Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames
prevent duplicate filenames
2018-01-31 11:50:45 +00:00
James Allen
9a9938083c Merge pull request #267 from sharelatex/as-remove-rollout
Remove rollout logic for auto compile and link sharing
2018-01-31 10:27:09 +00:00
James Allen
aa6c16593e Add renamingToName override name for instant apparent renames 2018-01-31 09:42:41 +00:00
James Allen
9721dffbb6 Add missing state reset to error handler 2018-01-31 09:41:58 +00:00
Brian Gough
1c6dc66ed1 prevent double calls to rename 2018-01-29 16:45:59 +00:00
Brian Gough
6ed181d52c fix check for name in filetree move 2018-01-29 15:27:52 +00:00
Brian Gough
63fa024d98 client-side duplicate check for move/rename/create 2018-01-29 15:24:51 +00:00
Alberto Fernández Capel
839ea496f1 Track clicks anywhere on the window as activity when the editor is open 2018-01-25 16:32:00 +00:00
Alberto Fernández Capel
a68489a604 Track session activvity if the user scrolls the editor 2018-01-25 16:10:47 +00:00
Alberto Fernández Capel
7d0d18ea5e Use the cursor:editor:update event to track user activity
It is strictly a superset of the change event we were using
before: if there's a change, there will be always a cursor
update, but there can be cursor updates (like when the user
presses the arrow keys) that don't change the document.

This is coherent with what we do to track user activity at

dfb9943521/public/coffee/ide/connection/ConnectionManager.coffee (L49-L50)
2018-01-24 17:20:30 +00:00
Alberto Fernández Capel
e42d1f9b13 Change heartbeat backoff logic
Send first two heartbeats at 0 and 30 secs, then increase the backoff
interval 1min per call until a maximun of 5min.
2018-01-24 16:05:53 +00:00
Alberto Fernández Capel
dd2e9d7431 Remove unused var 2018-01-24 15:37:16 +00:00
Alberto Fernández Capel
f0777f996c Space editing sessions heartbeats with an increasing backoff
We send the first heartbeat as soon as the session start.
The next ones are sent (if there's any activity)
when the editing session is about 30 and 60 seconds.
Then at 2min, 3min, 4min, 5min and later on every 5min.

The backoff is not reset, so if due to inactivity the
session expires in the server the backoff will still be
the same.
2018-01-24 15:22:41 +00:00
Brian Gough
feb02dacd4 only update client filetree on success 2018-01-24 10:07:42 +00:00
James Allen
28deb4e107 Merge pull request #292 from sharelatex/ja-v1-ownership
Fallback to project creator when there is no owner
2018-01-24 09:50:20 +00:00
Alberto Fernández Capel
8a1523cc03 Read project id from the global window var 2018-01-23 15:58:59 +00:00
James Allen
a558d05ac6 Only show import modal for owned projects 2018-01-23 15:12:00 +00:00
Nate Stemen
ea5063d7ea dont return needsClosingBrace from Helpers 2018-01-23 09:35:24 -05:00
Nate Stemen
91302cfb16 move end bracket logic to helpers and remove unecessary unpacking 2018-01-23 09:35:24 -05:00
Nate Stemen
30eca714eb fix random things with snippets 2018-01-23 09:35:24 -05:00
Nate Stemen
d2adc753aa use helpers to see if there is '}' already 2018-01-23 09:35:24 -05:00
James Allen
d7706f642b Show the creator as the owner if no owner present 2018-01-23 13:47:48 +00:00
James Allen
ce9a1fec87 Revert "Go back to allowing v1 projects to be imported" 2018-01-23 11:49:33 +00:00
James Allen
2fb4059633 Merge pull request #258 from sharelatex/ja-allow-v1-imports
Go back to allowing v1 projects to be imported
2018-01-23 10:30:23 +00:00
Alberto Fernández Capel
b3b05d1af3 Disable the trailing throttle event in the editing session heartbeat
Throttle sends an event as soon as the function is called. Then
we wait X minutes, but we only want to send another event if
there's any activity *after* those X minutes.
2018-01-23 10:29:11 +00:00
Alberto Fernández Capel
0bef5531bb Rename editSession -> editingSession 2018-01-23 10:29: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
06e2f0df1c Remove unused styles for auto compile & link sharing onboarding 2018-01-17 16:04:10 +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
c466025df4 Go back to allowing v1 projects to be imported 2018-01-16 09:40:58 +00:00
Alasdair Smith
4a0628d801 Remove unnecessary test script 2018-01-15 16:23:10 +00:00
Alasdair Smith
984ecae200 Rename directory to es to align with coffee dir 2018-01-15 16:23:10 +00:00
Alasdair Smith
4642d55b7b Add basic example script 2018-01-15 16:23:10 +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
662122bb1c CI and local dev environment improvements
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
2018-01-15 09:36:41 +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
0cf875bd0a Merge pull request #170 from sharelatex/pr-fix-link-rewriting
Enable HTML5 mode in Angular, to allow disabling link rewriting.
2018-01-11 08:42:29 +00:00
James Allen
79055d0e8d Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs
Show apology message instead of raw binary files
2018-01-11 08:42:13 +00:00
James Allen
c6b6b95dec Remove some unused files 2018-01-09 14:19:23 +00:00
Nate Stemen
c43aa54bee Merge branch 'ns-fix-package-command-meta' 2018-01-08 08:53:42 -05:00
Nate Stemen
7af615ff6c Merge branch 'ns-no-duplicate-packages' 2018-01-08 08:53:07 -05:00
Nate Stemen
cf4d6c1165 Merge branch 'master' into ns-no-duplicate-packages 2018-01-05 11:46:44 -05:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
f0d7658bdd Don't show import dialog for projects, just link to v1 editor 2018-01-03 16:46:26 +00:00
Paulo Reis
b73a56f70c Take header height into account in the main page masthead; avoid margin collapsing. 2018-01-03 12:12:45 +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
2dcc17ad09 Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history
Handle deleted and renamed files better in v2 history UI; Fixes #226
2018-01-03 11:29:59 +00:00
Nate Stemen
d2ee03d9b9 make commandNames object for fast lookups 2017-12-21 15:51:50 -05:00
Paulo Reis
399ebc473f Center global alerts in v2. 2017-12-21 13:38:40 +00:00
Paulo Reis
baa57c56aa Improve dropdown spacing in v2. 2017-12-21 13:34:11 +00:00
Paulo Reis
f5751c34a9 Make inline tags look nicer with v2 typography. 2017-12-21 12:57:33 +00:00
Alasdair Smith
1be9e29f35 Switch from button to link to fit better 2017-12-21 11:10:23 +00:00
Paulo Reis
d5502fd502 Make layout work nicely without navbar (content BG now expands to the top). 2017-12-21 11:03:27 +00:00
Alasdair Smith
fb23b30c45 Merge branch 'master' into as-update-v2-copy 2017-12-21 10:57:16 +00:00
James Allen
940b22ef95 Remove debug line 2017-12-20 16:42:09 +00:00
James Allen
d0fee7e76c Show a file tree of changed paths, so we can work with renamed and deleted files 2017-12-20 16:22:32 +00:00
Paulo Reis
d22a9acc76 Highlight project name a little, style renaming widget in v2. 2017-12-20 15:56:32 +00:00
Paulo Reis
cf30cfd923 Create new style for links inside alerts; apply it to the reconnection alert. 2017-12-20 15:39:50 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
Paulo Reis
8d1736af59 Fix forgotten conflict. 2017-12-20 09:51:32 +00:00
Paulo Reis
0a0c6c6c0c Merge branch 'master' into pr-style-v2-chatpane 2017-12-20 09:50:49 +00:00
Paulo Jorge Reis
c8741daeb2 Merge pull request #204 from sharelatex/pr-style-v2-pdf
Style v2 PDF viewer, alerts and logs
2017-12-20 09:17:21 +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
b4a5e5a041 Tidy up HistoryV2Manager 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
8ea779af58 Add some front end tests for 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
Brian Gough
388a052647 Merge pull request #213 from sharelatex/bg-allow-autocompile-without-code-check
allow autocompile without code check
2017-12-19 13:46:12 +00:00
Nate Stemen
685595ed0a remove comment 2017-12-19 08:44:19 -05: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
Paulo Reis
547c0cb79f Use new theme red shade as the danger red; tone down compile log alerts. 2017-12-19 13:10:12 +00:00
Paulo Reis
88d669cbb5 Remove debugging statements. 2017-12-19 10:52:17 +00:00
Paulo Reis
91d479378b Apply padding and font-weight changes. 2017-12-19 10:51:49 +00:00
Paulo Reis
709a4bf4fb Adjust padding values. 2017-12-19 10:50:33 +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
8453a7a910 Increase width slightly 2017-12-18 17:26:24 +00:00
Paulo Reis
4e02033c82 Use Lato as the sans-serif font for v2. 2017-12-18 16:19:10 +00:00
Alasdair Smith
72ca08ae2d Reduce margin under list 2017-12-15 16:11:31 +00:00
Nate Stemen
7d5c661b4e make command names local array 2017-12-15 11:10:44 -05: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
Alasdair Smith
a6cd210ef6 Update v1 dash pane with new copy & restyle to fit correctly 2017-12-15 12:02:11 +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
Brian Gough
8d91cd2748 allow autocompile without code check 2017-12-14 16:19:43 +00:00
Shane Kilkelly
b6d6ac8304 Ignore select-all events for disabled check-boxes 2017-12-14 16:18:01 +00:00
Paulo Reis
d89aa0ca02 Remove commented out code. 2017-12-14 11:52:41 +00:00
Paulo Reis
df5254d603 Remove LESS vars from other branch. 2017-12-14 11:29:41 +00:00
Paulo Reis
d5c000d761 Use correct SL color for the chat textarea. 2017-12-14 11:26:13 +00:00
Paulo Reis
907654747b Style the chat input box. 2017-12-14 11:25:50 +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
ca68f01a9d Build chat message styles on the controller side (allowing for extra parameters). 2017-12-14 11:23:22 +00:00
Paulo Reis
9deddcf2a8 Disable dark theme handling for v2, for now. 2017-12-14 11:23:22 +00:00
Paulo Reis
c5e2560b43 Basic colors for chat. 2017-12-14 11:22:57 +00:00
Henry Oswald
490c56c692 libs -> libraries
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Alasdair Smith
b7a43d95e0 Remove unused method, now handled by FreeTrialModalController 2017-12-13 15:55:32 +00:00
Alasdair Smith
e7992e65e4 Merge branch 'master' into as-v2-upgrade-redirect 2017-12-13 14:45:51 +00:00
Alasdair Smith
4c81cd874f Remove unnecessary method - handled by FreeTrialModalController 2017-12-13 11:09:46 +00:00
Nate Stemen
618f04ea7a allow package manager to have access to metadata 2017-12-12 15:14:24 -05:00
Nate Stemen
68b57f8d95 check current commands against package commands 2017-12-12 14:33:11 -05:00
Shane Kilkelly
603252f3b4 Prevent user from trying to delete archived project they don't own
This change disables the select-project checkbox if the user
is on the 'archived' project pane and they don't own the project.
The request to delete would fail anyway, but this prevents UI confusion
2017-12-12 16:23:24 +00:00
Paulo Reis
d8153f9fdb Merge branch 'master' into pr-style-v2-pdf 2017-12-12 14:19:22 +00:00
Alasdair Smith
4126e9bd31 Merge branch 'master' into as-v1-dash-link 2017-12-12 09:55:48 +00:00
Alasdair Smith
f5c914ed6c When upgrading track changes on V2, redirect to V1 trial page 2017-12-11 18:03:09 +00:00
Paulo Reis
edfc259c53 Fix missing border on SL. 2017-12-11 16:55:50 +00:00
Paulo Reis
59e675797e Merge branch 'master' into pr-style-v2-resizers 2017-12-11 15:55:50 +00:00
Paulo Reis
ab46e3930a Configure toggler cursors for v2. 2017-12-11 15:41:07 +00:00
Paulo Reis
0652fc62a0 Configure resizer cursors for v2. 2017-12-11 15:33:00 +00:00
James Allen
de484e1a08 Remove unused reference to e 2017-12-11 13:31:16 +00:00
James Allen
f465a962d4 Put recaptcha css in a base location 2017-12-11 13:01:21 +00:00
James Allen
53dc8cddfc Refactor captcha into middleware and angular service 2017-12-11 12:58:55 +00:00
James Allen
69499847e4 Refactor front end code into validateCaptcha service 2017-12-11 12:32:43 +00:00
James Allen
83086e4a79 Add recaptch to share endpoint 2017-12-11 11:57:59 +00:00
Paulo Reis
97129b5dda Make the togglers more obvious when panes are closed. 2017-12-08 15:29:05 +00:00
Paulo Reis
9575e80291 Pseudo elements in togglers where causing artifacts in v2; only allow those in SL. 2017-12-08 10:31:31 +00:00
Paulo Reis
5bea196b8f Style logs, log hints and alerts in general. 2017-12-07 16:35:39 +00:00
Nate Stemen
d224e09b5e Merge pull request #192 from sharelatex/ns-remove-labels
removing labels service
2017-12-07 09:38:00 -05:00
Paulo Reis
1a6e831b9e Basic PDF viewer colors for v2. 2017-12-07 14:14:42 +00:00
Paulo Reis
09dcbcf3b7 Fix missing variables. 2017-12-07 10:35:43 +00:00
Paulo Reis
7c5a7880b0 Merge branch 'master' into pr-style-v2-resizers 2017-12-06 15:49:18 +00:00
Alasdair Smith
48cd048e5c Merge branch 'master' into as-v1-dash-link 2017-12-06 15:12:29 +00:00
Paulo Jorge Reis
a5f99ccce3 Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling
V2 editor styling
2017-12-06 11:22:28 +00:00
Paulo Reis
2ccf0750f2 Run SVGs through SVGOMG. 2017-12-06 11:21:02 +00:00
Nate Stemen
9bf5d1e14c removing labels service 2017-12-05 13:57:36 -05:00
Paulo Reis
a88538c3fd Make the back to projects button closer to current SL. 2017-12-05 10:20:25 +00:00
Paulo Reis
aab43f5916 Smaller line-height in the file tree. 2017-12-05 10:07:45 +00:00
Alasdair Smith
6a185a838d Increase height & margin 2017-12-04 17:20:53 +00:00
Paulo Reis
7498ead1f5 Make sure SL synctex controls remain the same. 2017-12-04 15:58:40 +00:00
Paulo Reis
963ad4fece Style resizer togglers. 2017-12-04 15:48:23 +00:00
Paulo Reis
0bad7d8549 Adjustments to synctex controls. 2017-12-04 15:12:13 +00:00
Paulo Reis
9fda8e62fa Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers 2017-12-04 13:48:52 +00:00
Paulo Reis
fd852004fe Refactor synctex controls z-index handling. 2017-12-04 12:25:40 +00:00
James Allen
0b0fd576eb Merge branch 'master' into as-v1-dash-link 2017-12-04 10:02:42 +00:00
James Allen
0602fed6e5 Merge branch 'master' into as-import-v1 2017-12-04 10:02:21 +00:00
James Allen
158b0d56cf Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:01:45 +00:00
James Allen
f21870aac2 Merge branch 'master' into pr-ol-beta-editor-styling 2017-12-04 10:01:27 +00:00
James Allen
849861073d Merge branch 'master' into pr-fix-link-rewriting 2017-12-04 10:01:08 +00:00
Henry Oswald
c020e4e6bd moment and fineuploader are loaded seperately in editor, not packaged up 2017-12-02 12:29:06 +00:00
Alasdair Smith
bf23a09644 Move setting sidebar height to OL only file so var can be moved to specific scope 2017-12-01 17:59:02 +00:00
Alasdair Smith
e7f83c73ae Extract v1 dash link styles to file so can define OL only vars 2017-12-01 17:53:52 +00:00
Alasdair Smith
d6e50ac940 Extract var to allowed to be overridden 2017-12-01 17:16:37 +00:00
Alasdair Smith
9a073cdaf0 Add link to V1 dash 2017-12-01 16:58:19 +00:00
James Allen
381761127e Replace previous fineuploader path with old version 2017-12-01 13:26:31 +00:00
Shane Kilkelly
2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Paulo Reis
aeffe1cea9 Style resizers while dragging. 2017-12-01 11:22:12 +00:00
Paulo Reis
cd6b51a1f6 Increase v2 resizer hit area. 2017-11-30 17:00:42 +00:00
Paulo Reis
ce3e410250 Configure resizer colors. 2017-11-30 17:00:25 +00:00
Paulo Reis
3a959cccfd Use custom chat resizer values. 2017-11-30 15:24:48 +00:00
Paulo Reis
826f49b9a4 Add default resizer values to layout directive. 2017-11-30 15:24:39 +00:00
Paulo Reis
e38c0de6b9 Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers 2017-11-30 15:13:00 +00:00
Alasdair Smith
f232899f3f Show warning symbol on second step 2017-11-30 10:16:15 +00:00
Alasdair Smith
6eae1d59ea Use asyncForm directive to trigger import 2017-11-30 10:16:15 +00:00
Alasdair Smith
3aaf6559c8 Add image of v2 editor 2017-11-30 10:16:15 +00:00
Alasdair Smith
265e659999 Add multiple steps 2017-11-30 10:16:15 +00:00
Alasdair Smith
958e4cad9b Fix wrong controller 2017-11-30 10:16:15 +00:00
Alasdair Smith
b68d6411ee Basic styles for import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith
0e11668a61 Change v1 project link to button which opens import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith
cbba7c38df Add basic v1 import modal template & controller 2017-11-30 10:16:15 +00:00
Nate Stemen
c2bb8b9f89 removing calls 2017-11-29 13:30:53 -05:00
Nate Stemen
74ba7402de Merge branch 'ns-file-completer' 2017-11-29 09:20:09 -05:00
Shane Kilkelly
8b5115ff03 Merge branch 'sk-update-fineuploader' 2017-11-29 09:41:14 +00:00
Paulo Reis
448d03a28a Enable HTML5 mode in Angular, to allow disabling link rewriting. 2017-11-28 15:46:27 +00:00
Nate Stemen
26df9bca05 Merge pull request #136 from sharelatex/ns-autocomplete-bugs
fixing popup and code folding issues
2017-11-28 10:28:54 -05:00
Nate Stemen
2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
Nate Stemen
8ef48925c1 Merge pull request #71 from sharelatex/ns-package-completer
fixing package completer
2017-11-28 08:56:49 -05:00
Paulo Reis
2c0fcb51e0 Unneeded LESS guard. 2017-11-28 11:27:45 +00:00
Paulo Reis
0091d639bf Use white review icon in OL. 2017-11-28 10:49:04 +00:00
Henry Oswald
7ce56aa3b6 add http catch onto form 2017-11-28 10:13:54 +00:00
Henry Oswald
b16862fa31 add error handling for form 2017-11-27 18:03:42 +00:00
Paulo Reis
b66e28df19 Use a non-breakable space to give height. 2017-11-27 17:12:14 +00:00
Paulo Reis
e94cef12b7 Use ::before to fill empty space in indented filetree items. 2017-11-27 17:11:32 +00:00
Henry Oswald
3f2ec422f8 change subject line to put details in subject 2017-11-27 13:52:31 +00:00
Henry Oswald
7eb2f0d917 move generic sales modal to use new support endpoint 2017-11-27 12:49:12 +00:00
Shane Kilkelly
661041a35d Use template elements for file uploaders, and i18n 2017-11-27 12:06:18 +00:00
Paulo Reis
1177f34125 Adjustments to keep the current SL look and feel. 2017-11-24 16:43:02 +00:00
Paulo Reis
860399d9de Adjust toolbar paddings; adjust Overleaf menu icon width. 2017-11-24 16:03:30 +00:00
Paulo Reis
926fd69bb5 Use resizer icons in Overleaf, to switch the PDF layout. 2017-11-24 15:53:49 +00:00
Paulo Reis
39602d78ed Make sure all toolbar icons and buttons are vertically centered. 2017-11-24 15:36:23 +00:00
Paulo Reis
f4f2fa4e19 Use Overleaf logo as the main menu icon. 2017-11-24 15:33:48 +00:00
Henry Oswald
5ef7bad60f removed groove 2017-11-24 14:58:35 +00:00
Paulo Reis
2464bec280 Style the recompile button; use flexbox for the toolbar. 2017-11-23 16:42:38 +00:00
Paulo Reis
f55ffff960 Refactor toolbar variants as mixins. 2017-11-23 15:21:06 +00:00
Alasdair Smith
c052aa72ad Fix missing import, fixing broken onboarding popup 2017-11-23 11:18:23 +00:00
Alasdair Smith
195032b4b4 Remove non-existant import 2017-11-22 17:08:21 +00:00
Alasdair Smith
e61b82c452 Remove unused link sharing rollout, but keep onboarding popup 2017-11-22 17:07:50 +00:00
Shane Kilkelly
57d0bab354 Remove commented out code, and un-used button 2017-11-22 17:00:30 +00:00
Shane Kilkelly
c8cbdfd3cb Use the configured 'processing' text 2017-11-22 16:50:21 +00:00
Alasdair Smith
6f8b0c6e87 Revert "Remove old unused link sharing onboarding"
This reverts commit 66a0a7ff8b5b5081d86df333429cb0455221c81a.
2017-11-22 16:46:16 +00:00
Nate Stemen
ac9e27713d changing allowed file types 2017-11-22 11:25:02 -05:00
Alasdair Smith
c00d9e1b51 Remove unused feature onboarding styles 2017-11-22 16:21:35 +00:00
Alasdair Smith
de3b9d6a49 Remove old unused link sharing onboarding 2017-11-22 16:09:32 +00:00
Shane Kilkelly
fee1fc3d1f Fix visuals of file uploader 2017-11-22 15:52:02 +00:00
Alasdair Smith
f85880ba38 Remove old unused track changes notice 2017-11-22 15:03:46 +00:00
Alasdair Smith
8f32f0d65f Remove old unused track changes onboarding 2017-11-22 14:48:22 +00:00
Paulo Reis
9e109ccaaa Fix wrong hover color in SL theme. 2017-11-22 12:14:02 +00:00
Paulo Reis
8cf82178e1 Only highlight hovered folder when dragging. 2017-11-22 12:10:33 +00:00
Paulo Reis
ead190bf23 Style drag and drop, also renaming and inputs. 2017-11-22 11:54:57 +00:00
Brian Gough
69cb93fe64 Merge pull request #139 from sharelatex/bg-fix-spelling-cancel-request
fix the cancellation of spelling requests
2017-11-22 09:45:36 +00:00
Brian Gough
dc71a6a0a1 Merge pull request #113 from sharelatex/bg-prevent-editing-in-broken-ace-session
put ace in readonly mode when changing session
2017-11-22 09:45:19 +00:00
Nate Stemen
2f03bb6015 adding file completer 2017-11-21 11:26:44 -05:00
Shane Kilkelly
1ddfd948d6 Update the file-upload library 2017-11-21 16:21:58 +00:00
Paulo Reis
8758119e62 Handle multi-selection. 2017-11-21 16:10:07 +00:00
Paulo Reis
1fd29253e6 Handle filetree multiselection. 2017-11-21 11:45:06 +00:00
Paulo Reis
0de57885b1 Make full-width backgrounds, even with indented filetree items. 2017-11-21 11:20:39 +00:00
Alasdair Smith
1a8a915116 Merge pull request #77 from sharelatex/ns-autocomplete-insertion-bug
fix autocomplete insertion on single backslash; Fixes #55
2017-11-20 15:20:45 +00:00
Alasdair Smith
3c0c670b5f Merge pull request #78 from sharelatex/ns-capital-letter-autocomplete-bug
allow for capital letters in commands; Fixes #56
2017-11-20 15:20:18 +00:00
Alasdair Smith
51ec0ab4c7 Merge pull request #87 from sharelatex/as-fetch-ol-projects
Show V1 (OL) projects in project list
2017-11-20 15:04:10 +00:00
Shane Kilkelly
81887dd4f5 wip: upgrade fineuploader 2017-11-20 14:43:13 +00:00
Brian Gough
029e3b1557 fix the cancellation of spelling requests 2017-11-20 12:25:09 +00:00
Paulo Reis
269975560f Basic filetree skinning, still WIP. 2017-11-20 12:24:00 +00:00
Alasdair Smith
a63e40f03f Adjust vertical padding on V1 badge 2017-11-20 11:23:02 +00:00
Alasdair Smith
bb8f80c1e4 Tweak v1 badge styles 2017-11-20 11:23:02 +00:00
Alasdair Smith
35883b6b27 Extract V1 badge styles to file 2017-11-20 11:23:02 +00:00
Alasdair Smith
c1b3cc3a69 Add v1 filter 2017-11-20 11:23:02 +00:00
Alasdair Smith
7910f2109f Switch to V1 wording 2017-11-20 11:23:02 +00:00
Alasdair Smith
37c7a95fde Hide V1 projects from shared filter 2017-11-20 11:23:02 +00:00
Alasdair Smith
20c756ec9a Switch to v1 wording 2017-11-20 11:23:02 +00:00
Alasdair Smith
fe90ef047f Temp OL label 2017-11-20 11:23:02 +00:00
Nate Stemen
f00dbf3d56 fixing popup and code folding issues 2017-11-17 16:25:45 -05:00
Alasdair Smith
154943ba68 Don't check for linting errors if code check is disabled
There are a couple of reasons for this:

1. Some linting errors are returned from the server after a compile is run,
replacing client-side linting errors. If code check is disabled this does not
happen, and therefore linting errors persist until the next compile. This makes
it appear as though autocompile is not running

2. It is likely that if code check is disabled, the user is deliberately
ignoring linting errors and therefore the linting check is pointless
2017-11-17 16:38:44 +00:00
Nate Stemen
00e3e8da9f adding last labels configuration 2017-11-16 14:59:04 -05:00
Nate Stemen
c78a0ae209 removing comment 2017-11-16 14:49:29 -05:00
Nate Stemen
c051316aac adding deleted file 2017-11-16 14:45:20 -05:00
Brian Gough
bd09ef81f2 added comments 2017-11-16 15:41:16 +00:00
Alasdair Smith
2b88d2bc4e Change autocompile onboarding image to not imply that it is on
We have a theory that the image shown in the autocompile onboarding implies
that it is already switched on. This changes the image to show the switch
as off, hopefully fixing it
2017-11-16 13:35:06 +00:00
Brian Gough
dc6110db8d put ace in readonly mode when changing session
if the session fails to attach successfully (e.g due to an exception in
the changeSession event handler) the editor will be left in a state
where the user will not be able to enter any text.  This should at least
cause them to reload the editor.
2017-11-16 11:32:08 +00:00
Brian Gough
125a5ec606 temporarily avoid exception in ace event handler
full fix will be to use the angular $http cancellation mechanism
2017-11-15 16:28:31 +00:00
Nate Stemen
a78330877b fixing services call 2017-11-15 10:14:31 -05:00
Nate Stemen
428ae3aa53 adding labels service back 2017-11-15 09:27:46 -05:00