Commit graph

4783 commits

Author SHA1 Message Date
James Allen
b4254f06ef Update Project schema for overleaf imports 2017-08-21 17:49:08 +02:00
Joe Green
d184c9c555 Add Jenkinsfile
* added Jenkins file

* Use new build process

* comment out post stage

* use checkout step

* install grunt before unit tests

* swap hardcoded config for env vars
2017-08-16 10:43:48 +01:00
James Allen
1f326f7990 Merge pull request #575 from sharelatex/ja-overleaf-oauth
Allow OAuth based log-ins from Overleaf
2017-08-10 10:28:41 +02:00
James Allen
c928935865 Merge pull request #547 from sharelatex/ja-per-user-track-changes
Per-user track changes
2017-08-09 14:06:54 +02:00
James Allen
7538c8834f Merge branch 'master' into ja-per-user-track-changes 2017-08-09 14:05:36 +02:00
James Allen
a0a45ee654 Update date 2017-08-09 14:02:40 +02:00
James Allen
638eeb1247 Update Server.coffee 2017-08-09 11:51:08 +02:00
James Allen
17e849792c Pull out logic into module 2017-08-09 11:50:05 +02:00
James Allen
eac0ce8353 Initial spike of Overleaf based logins 2017-08-08 14:00:21 +02:00
James Allen
0be1ee6b6c Fix smoke test when product name changes 2017-08-08 12:31:36 +02:00
James Allen
3287bf273b Merge pull request #574 from sharelatex/ja-overleaf-styling
Add in overleaf styles alongside sharelatex styles
2017-08-08 12:13:46 +02:00
James Allen
f9690f9db0 Add Overleaf header logo 2017-08-08 08:26:26 +02:00
James Allen
b4029359bc Fix loading indicator 2017-08-08 08:17:16 +02:00
James Allen
4ab5451827 Keep both editor loading logos 2017-08-07 17:04:49 +02:00
Paulo Reis
d9e1254a6d Update loading screen. 2017-08-07 17:02:55 +02:00
James Allen
5c8442a86f Allow configureable brand prefix with overleaf styles 2017-08-07 17:01:59 +02:00
James Allen
e5c01df9a8 Merge pull request #544 from sharelatex/ja-update-ace
Update Ace with new context tracking linter
2017-08-04 10:46:34 +02:00
James Allen
6c342a6e65 Merge branch 'master' into ja-update-ace 2017-08-04 10:39:53 +02:00
James Allen
4826616411 Update with latex mode bracket matching changes 2017-08-04 10:38:54 +02:00
Shane Kilkelly
cce2f93ab3 Merge pull request #571 from sharelatex/sk-fully-hide-trackchanges
Sk fully hide trackchanges when not enabled
2017-08-03 15:33:05 +01:00
Shane Kilkelly
05c5b4f9c5 Merge branch 'master' into sk-fully-hide-trackchanges 2017-08-03 15:20:20 +01:00
Shane Kilkelly
9cc461605e Prevent track-changes hotkey actions when not enabled. 2017-08-03 15:17:28 +01:00
Shane Kilkelly
670d4438dc If track-changes is not enabled, don't show hotkeys for it. 2017-08-03 15:16:54 +01:00
James Allen
86a38df6e0 Merge pull request #563 from sharelatex/pr-support-html-encoded-i18n
Support HTML encoded i18n
2017-08-03 10:36:35 +02:00
James Allen
b2e6c028ba Merge pull request #562 from sharelatex/pr-ignore-deleted-projects-uncategorized
Correct count of uncategorized projects
2017-08-03 10:36:20 +02:00
James Allen
ef9b3e06ee Merge pull request #568 from sharelatex/ja-validate-contact-form
Validate and add error status to contact form
2017-08-03 10:35:48 +02:00
James Allen
2f3c1fae86 Merge pull request #564 from sharelatex/sk-autocomplete-graphics
Sk autocomplete graphics
2017-08-03 10:35:27 +02:00
James Allen
3d9da02815 Merge pull request #555 from sharelatex/sk-password-policy
Enforce stricter password policy.
2017-08-03 10:35:00 +02:00
James Allen
28838eff60 Merge pull request #567 from sharelatex/ja-admin-panel-additions
Some refactoring and methods needed to support the admin panel
2017-08-03 10:34:33 +02:00
James Allen
66d18bcbcd Validate and add error status to contact form 2017-08-02 14:59:03 +02:00
James Allen
10f362a77a Add SubscriptionUpdater.deleteSubscription 2017-08-02 09:59:45 +02:00
Shane Kilkelly
8a0f58c63d Use correct character width 2017-08-01 14:28:10 +01:00
Shane Kilkelly
3ffef7fe56 Dynamically adjust the width of autocomplete popup. 2017-08-01 13:40:30 +01:00
Paulo Reis
d576aa5b9d Update date threshold to show the per-user TC dialog. 2017-08-01 12:01:17 +01:00
Paulo Reis
7b85661035 Re-enable the toggle TC keyboard shortcut. 2017-08-01 11:59:32 +01:00
Paulo Reis
029ab8d2f1 Make sure TC state is applied to all users on load. 2017-08-01 11:30:23 +01:00
Paulo Reis
fbce49f5cd Merge branch 'master' into ja-per-user-track-changes 2017-08-01 10:56:02 +01:00
Shane Kilkelly
9a85e42ddb Remove stray file 2017-08-01 09:53:43 +01:00
Shane Kilkelly
dcaa35f9f1 Merge pull request #561 from sharelatex/sk-fix-autopair-settings
Persist `autoPairDelimiters` setting.
2017-08-01 09:09:34 +01:00
James Allen
e3bf4c539b Style tab panes 2017-08-01 09:51:27 +02:00
Shane Kilkelly
f057f788e3 Autocomplete for graphics 2017-07-31 14:51:22 +01:00
Paulo Reis
b5486155c0 Update shrinkwrap to include the HTML encoder. 2017-07-31 14:01:22 +01:00
Shane Kilkelly
eeabac7698 Get graphics paths from preamble 2017-07-31 11:28:52 +01:00
Shane Kilkelly
a841646559 Add preamble parser 2017-07-31 11:28:21 +01:00
Shane Kilkelly
eaf9ae5b94 Begin work on autocomplete for includegraphics 2017-07-31 09:34:58 +01:00
Shane Kilkelly
ba3550759d Persist autoPairDelimiters setting. 2017-07-31 08:36:13 +01:00
Paulo Reis
4849c705de Optionally ask the translate local method to HTML encode; use it in the problematic tooltip. 2017-07-28 17:31:28 +01:00
Paulo Reis
2fcbafa72d Add HTML encoder lib. 2017-07-28 17:30:57 +01:00
Paulo Reis
b44d0bfb85 Ignore deleted projects when determining the number of uncategorized projects. 2017-07-28 14:41:33 +01:00
Joe Green
63eacad899 Merge pull request #560 from sharelatex/jg-mongoose-upgrade
upgraded mongoose package
2017-07-28 10:25:40 +02:00