github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
6609 commits 3 branches 7 tags 201 MiB
Commit graph

6365 commits

Author SHA1 Message Date
James Allen
09486f2eea Recompile on Cmd-S and :w 2018-05-03 12:20:53 +01:00
Hayden Faulds
7c93c92c6a Merge pull request #531 from sharelatex/hof-custom-retry 
add V1HistoryNotSyncedError
 2018-05-02 14:01:07 +01:00
Hayden Faulds
ba0e06d0fe add V1HistoryNotSyncedError 2018-05-02 13:18:43 +01:00
Shane Kilkelly
1c31012135 Merge branch 'master' into sk-fix-chat-link-color-in-v2 2018-05-01 15:23:42 +01:00
Shane Kilkelly
af70ef0dc4 Add templates to the hasFeature function 2018-05-01 14:01:52 +01:00
Shane Kilkelly
387108da48 Make links in chat messages white (same as text), with underline 2018-05-01 10:16:56 +01:00
James Allen
40da785363 Fix test for sampling front users 2018-05-01 09:02:43 +01:00
James Allen
dfc2b8631b Merge pull request #521 from sharelatex/as-watch-modules-coffee 
Add modules public/coffee dir to nodemon frontend watch
 2018-05-01 08:50:31 +01:00
James Allen
d2e54c5e0c Merge pull request #504 from sharelatex/afc-show-group-export-csv 
Show export user CSV even if the group has reached max capacity
 2018-05-01 08:50:04 +01:00
James Allen
4c7364fd01 Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits 
Re-order compile rate limits
 2018-05-01 08:48:22 +01:00
James Allen
a294fe795c Merge pull request #519 from sharelatex/ja-relative-dates-in-v2 
Display last modified as a relative date in v2
 2018-05-01 08:48:14 +01:00
James Allen
d454be8053 Bring down proportion to 10% 2018-04-30 17:19:21 +01:00
James Allen
6399621d1f Show front widget for paid and sampled free users 2018-04-30 17:13:57 +01:00
Alasdair Smith
b2e3997e83 Add modules public/coffee dir to nodemon frontend watch 2018-04-30 10:18:06 +01:00
James Allen
5c87a2aa90 Display last modified as a relative date in v2 2018-04-27 16:50:46 +01:00
hugh-obrien
157efa6d96 make publish modal accessible from query string 2018-04-27 15:50:11 +01:00
Hugh O'Brien
5a580b6ef9 Merge pull request #517 from sharelatex/hob-publish-menu-style 
Remove ol-variables which cause style problems in SL
 2018-04-27 14:54:30 +01:00
hugh-obrien
e76a15e4e0 remove ol core variables 2018-04-27 14:50:52 +01:00
Hugh O'Brien
780b377cf2 Merge pull request #515 from sharelatex/hob-publish-menu-style 
Basic publish menu styling
 2018-04-27 14:25:34 +01:00
hugh-obrien
ea2e585699 basic publish menu styling 2018-04-27 13:37:08 +01:00
Alasdair Smith
4759097e49 Merge pull request #494 from sharelatex/as-main-role 
Add main role
 2018-04-25 09:45:17 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4 
Payment page improvments
 2018-04-24 09:01:34 +01:00
Jessica Lawshe
8bedd99d73 Merge pull request #492 from sharelatex/jel-annual-buy-text 
Update button text for annual plan
 2018-04-23 11:35:09 -05:00
Jessica Lawshe
5d5edb7808 Button text for annual plan 
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
 2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994 Don't include v1 folders in "Add to folders" list 2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309 Don't show dropdown for v1 folders 2018-04-23 11:34:10 -05:00
Jessica Lawshe
820f9c7acc Merge pull request #506 from sharelatex/as-document-event-emitter 
Add documentation and tests of EventEmitter implementation
 2018-04-23 11:33:40 -05:00
Alasdair Smith
152c816b5c Add documentation and tests of EventEmitter implementation 2018-04-23 11:01:19 +01:00
Alberto Fernández-Capel
5fb368d1f2 Merge pull request #505 from sharelatex/afc-travisci 
Fix build in travisci
 2018-04-23 10:50:59 +01:00
Alasdair Smith
ad1df3532f Merge pull request #490 from sharelatex/hof-deleted-project-history 
Pass project history id with updates
 2018-04-23 10:05:07 +01:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar 
Add toggle switch directive to editor toolbar
 2018-04-23 10:04:12 +01:00
Alasdair Smith
61648e1f19 Merge pull request #497 from sharelatex/as-naming-consistency 
Include snake_case named file in frontend tests
 2018-04-23 10:03:54 +01:00
Alberto Fernández Capel
4db146dd51 Do not specify node version in .travis.yml 
That way, travis uses the version specified in .nvmrc
 2018-04-19 12:30:31 +01:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Alasdair Smith
d524249fc8 Include snake_case named tests 2018-04-17 15:03:52 +01:00
James Allen
d9a7b1248a Re-order compile rate limits to do project/user check before everyone check 2018-04-17 14:43:54 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
James Allen
37f009c3cd Remove blank test causing race condition 2018-04-17 10:00:06 +01:00
James Allen
87cc08569a Fix bad if statement sending doc open into infinite loop 2018-04-16 17:03:18 +01:00
James Allen
d6605610f5 Fix HistoryV2Manager front end tests 2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c Fix RestoreManager unit tests 2018-04-16 16:27:24 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works 
it may have been broken from an angular upgrade or similar.
 2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352 capitalise month and year on payment page 2018-04-16 15:11:31 +01:00
Alasdair Smith
3af10733cc Replace hard coded rich text hashed file path with registration system 2018-04-16 14:14:49 +01:00
Henry Oswald
39e41681a0 change to plans[currencyCode]['symbol'] from price.currency.symbol 
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
 2018-04-16 12:19:55 +01:00
Alasdair Smith
671a2c9767 Make content wrapper have main role 2018-04-16 11:43:24 +01:00
Alasdair Smith
3482724679 Make ide body have main role 2018-04-16 11:33:53 +01:00
Henry Oswald
086f080ee4 add !isFormValid(simpleCCForm) back in, was used during debugging 2018-04-16 11:01:14 +01:00
Henry Oswald
985d05a297 remove .has-error class, not used 2018-04-16 10:56:03 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144 make a seperate external error class which is used on entire payment form 2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f add highlight for bad card/cvv/mmyy number in. 2018-04-16 10:26:39 +01:00
Henry Oswald
903a9db936 upgrade static recurly lib to 4.8.5 for plans page 2018-04-16 10:10:43 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Alasdair Smith
4a12754d90 Mark visible toggle switch as hidden from screen readers 2018-04-16 10:07:46 +01:00
Alasdair Smith
0f70d526d9 Remove unused toggleRichText method 2018-04-16 09:42:26 +01:00
Alasdair Smith
a8c6ac1367 Style toggle switch 2018-04-16 09:36:32 +01:00
Alasdair Smith
591f341f5f Add switch-toggle directive 2018-04-16 09:36:10 +01:00
Henry Oswald
b1ee05de3e better styling, close to being deployable 2018-04-13 17:32:20 +01:00
Henry Oswald
e19a118ef4 poorly styled but almost viable 2018-04-13 17:26:05 +01:00
Henry Oswald
c050791905 change ng to use show/hide 
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
 2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae remove the form control, it just breaks the iframe styling 2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Paulo Jorge Reis
9e40555c89 Merge pull request #487 from sharelatex/pr-fix-v2-togglers 
Control the visibility of the custom toggler
 2018-04-13 13:46:55 +01:00
Hayden Faulds
7755a7cc1f add overleaf to projections for project structure updates 2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca send projectHistoryId with resync requests 2018-04-13 13:45:03 +01:00
Hayden Faulds
3006d018d9 send projectHistoryId with project structure updates 2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3 return projectHistoryId in DocumentController.getDoc 2018-04-13 13:45:02 +01:00
Jessica Lawshe
8d2c3ca6a1 Remove undefined controller 2018-04-12 11:53:31 -05:00
Jessica Lawshe
49222f11db Merge pull request #480 from sharelatex/jel-remove-old-exp 
Remove old A/B experiments
 2018-04-12 11:23:41 -05:00
Paulo Reis
35d7c96d04 Control the visibility of the custom toggler when panes are hidden externally. 2018-04-12 16:41:49 +01:00
Alberto Fernández Capel
1b8f4bff2f Ensure dump folder exists before running LinkedFiles tests 
The folder is also created in another test, so it will work the second
time the tests are executed, but it fails the first time.
 2018-04-12 10:29:24 -05:00
Jessica Lawshe
f9a56f7b37 Remove unknown experiments 2018-04-12 10:18:15 -05:00
Jessica Lawshe
be5f95ba69 Remove "history-discount" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
2301b83f22 Remove "teaser-dropbox-text" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment 
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
 2018-04-12 10:18:15 -05:00
Hayden Faulds
50686090c8 push doc pathname logic into DocController 2018-04-12 16:16:44 +01:00
Hugh O'Brien
2d3f169c49 Merge pull request #473 from sharelatex/hob-publish-modal-setup 
Publish modal web setup
 2018-04-12 14:01:18 +01:00
Alasdair Smith
c87cb1d361 Basic styles for editor toolbar 2018-04-12 13:46:19 +01:00
Brian Gough
4115a35773 Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking 
replace files and separate uploads and locking (connects to overleaf/sharelatex#422)
 2018-04-12 09:52:02 +01:00
Alasdair Smith
d3d7bde6ef Merge pull request #482 from sharelatex/as-fix-hashed-files 
Fix hashed file path for rich text
 2018-04-11 12:12:30 +01:00
Alasdair Smith
60a28f7173 Fix hashed file path for rich text 2018-04-11 12:00:36 +01:00
Paulo Jorge Reis
68ee3f7449 Merge pull request #474 from sharelatex/pr-fix-z-index-v2-resizers 
Remove forced z-index from v2 splitters
 2018-04-11 11:31:05 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
35cc5bf19c Add defensive check for req.query, fixing tests 2018-04-10 10:38:40 +01:00
Alasdair Smith
f0bcb332bb Merge pull request #479 from sharelatex/as-rt-feature-flag 
Switch to runtime flag for RT instead of feature flag
 2018-04-10 10:24:58 +01:00
Brian Gough
882b555433 create new file on replace 2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4 rename internal method uploadFile to _uploadFile 2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c clean up whitespace 2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a preserve original callback signature for addFile 2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9 fix indentation 2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c fix indentation of comment 2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757 refactor addFile and addFileWithOutUpdatingHistory 2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4 separate out file uploads 2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d add comment about upsert and locking 2018-04-09 12:05:07 +01:00
Brian Gough
baec4eb195 move uploads outside the lock 2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3 Remove unused feature flag 2018-04-06 17:00:27 +01:00
Alasdair Smith
c3b2af4345 Instead of checking RT flag at compile time, adjust at run time 2018-04-06 16:59:06 +01:00
Alasdair Smith
d433a88158 Pass rich text flag if query string is set 2018-04-06 16:58:12 +01:00
Alasdair Smith
315b2f24ee Always include RT styles 2018-04-06 16:01:59 +01:00
James Allen
2c0bd94fa7 Use mkdirp when restoring a file if the folder doesn't exist 2018-04-06 15:20:51 +01:00
James Allen
11d47fcc31 Use updated project-history response format 2018-04-06 15:20:18 +01:00
Alasdair Smith
fba5e4f80a Disable webpack source map 2018-04-06 11:28:21 +01:00
James Allen
1e8439a2c6 Fix restore of docs from old deleted docs 2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664 Add unit tests for RestoreManager 2018-04-06 10:30:13 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
James Allen
075db1e5b9 Remove stray console.log 2018-04-06 10:30:13 +01:00
James Allen
3832850be6 Implement restore end point with acceptance tests 2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce First pass at restore end point 2018-04-06 10:30:13 +01:00
Paulo Reis
3fecb4f180 Forcing z-index is not needed anymore. 2018-04-05 11:54:53 +01:00
Alasdair Smith
8ff1492962 Merge pull request #471 from sharelatex/as-karma-css 
Serve CSS when running karma tests
 2018-04-05 09:27:58 +01:00
Alasdair Smith
1d6dd06b88 Serve underscore in karma tests 
Because of the way that we're using underscore in the ES bundle (using the
global), we need to include underscore globally
 2018-04-04 13:19:21 +01:00
Paulo Reis
2e898bcf13 Use LESS to conditionally hide SL assets. 2018-04-03 09:01:43 -05:00
Paulo Reis
4ee81b3b44 Undo unintended SL changes. 2018-04-03 09:01:42 -05:00
Paulo Reis
396b29f32d Conditionally load SL assets on error pages; adjust styles for OL v2. 2018-04-03 09:01:42 -05:00
Jessica Lawshe
b2c7bb9d95 Track v2 onboard events 
Added events to the v2 banner to track on Metabase and Google
Analytics.
 2018-04-03 08:48:11 -05:00
James Allen
216b17ab92 Fill in v2 link 2018-04-03 11:55:19 +01:00
James Allen
0a00dea610 Merge pull request #469 from sharelatex/ja-feature-flag-rename 
Split references feature flag into mendeley and referencesSearch
 2018-04-03 11:53:58 +01:00
Alasdair Smith
b417516c7f Add CSS to karma 
This is useful for rich text tests which rely on DOM structure/CSS layout of
rich text
 2018-04-03 11:12:17 +01:00
Alasdair Smith
672305c9c2 Merge pull request #453 from sharelatex/ja-update-import-modal 
Tone down and reword v1 import modal
 2018-04-03 10:24:39 +01:00
Alasdair Smith
3668912102 Merge pull request #470 from sharelatex/pr-fix-v2-resizers-width 
Configure splitter width in v2
 2018-04-03 10:24:31 +01:00
Alasdair Smith
fa7e64adbb Wrap RT styles in .rich-text to prevent clashes 2018-04-03 09:47:35 +01:00
Alasdair Smith
4511cfa92f Add RT styles 2018-04-03 09:47:35 +01:00
Paulo Reis
bd3c12cf90 Make sure the layout lib knows about the resizer width in v2. 2018-03-29 10:35:17 +01:00
James Allen
f80962b74b Split references feature flag into mendeley and referencesSearch 2018-03-28 17:11:41 +01:00
Paulo Jorge Reis
bc46044f85 Merge pull request #466 from sharelatex/pr-v2-system-messages 
v2 system messages
 2018-03-28 15:17:26 +01:00
Paulo Jorge Reis
efee5a88bf Merge pull request #434 from sharelatex/jel-preview-unsupported 
Remove expressions used for debugging
 2018-03-28 15:16:49 +01:00
Paulo Jorge Reis
ab6abb2a4c Merge pull request #465 from sharelatex/revert-464-as-hotfix-rt 
Bring back editor toolbar
 2018-03-28 15:15:44 +01:00
Paulo Reis
8d2db3b31e V2 styling for system messages. 2018-03-28 14:46:07 +01:00
Paulo Reis
525deabc2b Move language subdomain message into the projects list too; make the close buttons similar. 2018-03-28 13:54:02 +01:00
James Allen
f13c7fd573 Revert "Replace references feature flag with mendeley and referencesSearch" 
This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.
 2018-03-28 13:47:34 +01:00
Paulo Reis
2dde810a1d Adjust styling. 2018-03-28 12:05:47 +01:00
Paulo Reis
b8049f3c46 Move system messages into the project list page (only). 2018-03-28 12:05:32 +01:00
James Allen
28aef4e72b Merge pull request #457 from sharelatex/as-silent-webpack-exit 
Exit webpack without error if no entry points found
 2018-03-28 11:18:18 +01:00
James Allen
e0facd40da Merge pull request #461 from sharelatex/ja-feature-flag-rename 
Replace references feature flag with mendeley and referencesSearch
 2018-03-28 11:16:56 +01:00
Alasdair Smith
2e93e0bf23 Revert "Hotfix RT button showing up when it isn't enabled" 2018-03-28 10:13:23 +01:00
Henry Oswald
a998d738ee Merge pull request #460 from sharelatex/ho-null-check-docs 
null check map on files and docs inside logger
 2018-03-28 10:01:49 +01:00
Alasdair Smith
4217b48a15 Hotfix RT button showing up when it isn't enabled 2018-03-27 20:10:03 +01:00
James Allen
dc2d7a9c7e Replace references feature flag with mendeley and referencesSearch 2018-03-27 16:20:21 +01:00
Henry Oswald
3b3b404288 Update LoggerSerializers.coffee 2018-03-27 14:45:47 +01:00
Henry Oswald
eeb76441c0 null check map on files and docs inside logger 2018-03-27 14:41:56 +01:00
Alasdair Smith
7520174288 Silently exit webpack process if no entry points are found in src or modules 
This better supports the community edition which currently has no code or
modules that match and throws an error.
 2018-03-27 12:30:40 +01:00
James Allen
21424f6bba Add placeholder read more link 2018-03-27 10:36:57 +01:00