github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
1688 commits 3 branches 7 tags 206 MiB
Commit graph

1674 commits

Author SHA1 Message Date
Henry Oswald
2d03e0532f adjusted style of payment options 2014-12-28 19:04:47 +00:00
Henry Oswald
40aeed74ce added little ssl secure message 2014-12-28 18:55:29 +00:00
Henry Oswald
bd52594f23 added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center 2014-12-28 18:43:53 +00:00
Henry Oswald
673140b620 got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false 2014-12-28 18:35:44 +00:00
Henry Oswald
9d57288809 centered the billing forms 2014-12-28 18:23:08 +00:00
Henry Oswald
236d4d7ab3 made the fields smaller and pushed plan name to header 2014-12-28 18:16:55 +00:00
Henry Oswald
137b9c1077 removed some labels and added paypal/credit card logos 2014-12-28 17:59:29 +00:00
Henry Oswald
baa0a42825 coupon field is shown if query string scf is shown 2014-12-28 17:51:36 +00:00
Henry Oswald
7f979e77db - fixed new payment page so it uses correct plan and currency 
- submit button is disabled while processing
- removed test data
 2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf pull recurely pub api key from settings file 2014-12-23 12:08:01 +00:00
Henry Oswald
12a28d91f2 removed month names 2014-12-23 12:00:41 +00:00
Henry Oswald
74347611e9 don't show the form until we have some data from recurly 2014-12-23 11:44:42 +00:00
Henry Oswald
03311311dd added translations in 2014-12-23 11:42:56 +00:00
Henry Oswald
e2819c3bc6 added generic error handling to recurly processing and required fields 2014-12-23 11:04:54 +00:00
Henry Oswald
a7eb836c79 redirect to /thank-you on success and fix broken unit test from a few commits ago 2014-12-22 16:37:09 +00:00
Henry Oswald
d0c9783718 added paypal option in, not tested as we don't have paypal in stag 2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36 added address 2 2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9 cleaned up form and added basic validation 2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22 coupons work 2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2 works with multi plan and currency, auto updates view on change 2014-12-22 12:55:29 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
47fb2a0878 basic angular form which has data bound to it 2014-12-18 17:48:23 +00:00
Brian Gough
505675803b increase sentry sample rate to 100% 2014-12-18 09:31:38 +00:00
Brian Gough
7429e7845d add sentry exclusion list and set logging sample rate to 1% 2014-12-16 11:34:48 +00:00
James Allen
2a2dc458e8 Merge pull request #127 from sharelatex/pdfng-server-fixes 
pdfng server fixes
 2014-12-16 10:30:22 +00:00
Brian Gough
79b560f96b update tests for new pdf viewer server fixes 2014-12-16 09:44:25 +00:00
James Allen
2819935a52 Add photo of Brian 2014-12-15 15:13:34 +00:00
Brian Gough
660bb75df4 add query string parameters for compileGroup= and pdfng= 
compileGroup will  bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
 2014-12-12 16:47:43 +00:00
James Allen
b260287965 Merge pull request #125 from sharelatex/clientside-error-logging 
Clientside error logging
 2014-12-12 15:54:23 +00:00
Brian Gough
fbf9111d80 Revert "revert to original CLSI proxy call" 
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
 2014-12-12 15:43:36 +00:00
Brian Gough
d3b38c8dc2 Revert "Revert test changes for proxied headers when requesting pdfs from clsi" 
This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.
 2014-12-12 15:43:21 +00:00
Brian Gough
419d84564c add support for client-side error logging using sentry 2014-12-12 13:58:07 +00:00
Brian Gough
5ffdcc2bbb make git ignore for 'modules' specific to top-level directory 
to prevent match with public/coffee/modules/
 2014-12-12 13:27:20 +00:00
Henry Oswald
0561adde4b added more logging 2014-12-12 12:21:14 +00:00
Henry Oswald
bd77d0e020 add null check in on project 2014-12-12 10:27:14 +00:00
Henry Oswald
5c7d77a853 added logging around docstore setting 2014-12-11 16:22:00 +00:00
Brian Gough
f005c5e8dc Revert test changes for proxied headers when requesting pdfs from clsi 2014-12-11 13:42:51 +00:00
Brian Gough
8a77d619a8 revert to original CLSI proxy call 
due to problems with cost of authentication when byte-serving
 2014-12-11 13:15:13 +00:00
Brian Gough
724116bcc1 Merge branch 'master' into pdfng 2014-12-10 13:18:02 +00:00
Brian Gough
50e03e93ba poll the element for the pdf viewer if it is zero size 
avoid invisible pdf forever waiting for layout-ready event when
switching between full-screen and split-screen
 2014-12-09 14:40:54 +00:00
Brian Gough
1acc924e0b comment out console.logs in pdfng 2014-12-09 14:39:58 +00:00
Brian Gough
843fa6f847 handle shutdown of pdf viewer/rendering with destroy method 2014-12-09 13:46:44 +00:00
Brian Gough
b157323eb7 defer loading of pdf destinations until required 2014-12-09 13:45:12 +00:00
Brian Gough
1e2e1ecb9c stream in the whole pdf file after loading the required page 2014-12-09 13:41:49 +00:00
Henry Oswald
268de7d739 make the user.name more robust 2014-12-09 11:11:06 +00:00
Henry Oswald
611916119a changed where online users name logic is so it catches all cases. 2014-12-08 18:56:46 +00:00
James Allen
b94a9aab0d Hide loading bar once loaded enough to render 2014-12-08 17:48:57 +00:00
James Allen
48d4e96221 Remove development styles 2014-12-08 17:39:33 +00:00
James Allen
8c40432e18 Use fixed sized spinner 2014-12-08 17:39:24 +00:00
Brian Gough
63ac1093bc keep pages visible after a recompile until they are ready to rerender 2014-12-08 17:00:43 +00:00
Brian Gough
c3569dd45f add a progress event in the pdfng viewer 2014-12-08 17:00:26 +00:00
Brian Gough
2a66651ec9 flash the pdf controls in pdfng 2014-12-08 15:32:16 +00:00
Brian Gough
863c8b9586 prevent exception when scrolling during rerender in pdfng 2014-12-08 15:32:05 +00:00
Brian Gough
206e7db144 add spinners and classes for feedback on pdfng loading and rendering 2014-12-08 14:46:59 +00:00
Brian Gough
89d63c4f44 handle fullscreen mode in pdfng 
default to scale = 1 when containing div size is zero
 2014-12-08 10:28:02 +00:00
Brian Gough
0ae83d9be4 rescale pdf on parent size initialisation in addition to resizes 2014-12-05 19:42:16 +00:00
Brian Gough
407cecc0d3 save the pdf state when the directive is destroyed 2014-12-05 19:40:33 +00:00
Brian Gough
5915bfd885 prevent change to navbar url in pdf viewer 
return false from pdf <a> click handler
 2014-12-05 14:59:00 +00:00
Brian Gough
265ad4439c Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng 2014-12-05 14:43:01 +00:00
Brian Gough
1284ce613c support pdf double click 2014-12-05 14:33:06 +00:00
Brian Gough
4c0f3c55d7 clear the pdf renderqueue faster after the initial page has rendered 2014-12-05 12:14:40 +00:00
Brian Gough
7ea20c4266 avoid exception on pdfPage destroy 2014-12-05 12:12:17 +00:00
Brian Gough
c167e86ba5 use timeout instead of requestAnimationFrame in pdf scroll handler 
for simplicity as the time delay is large compared with rAF
 2014-12-05 12:12:01 +00:00
Henry Oswald
70d0af519b reset project to large state each time 2014-12-05 00:10:46 +00:00
Brian Gough
2074326237 render pdf pages in ascending order, fix bug where pages could be left unrendered 2014-12-04 16:52:11 +00:00
Brian Gough
4faac88065 handle destroy event in pdf page view and remove pending timeouts 2014-12-04 16:50:38 +00:00
Brian Gough
f8c1c5b025 avoid unnecessary retrieval of pdf viewport when rendering 2014-12-04 16:50:00 +00:00
Brian Gough
44057a9632 only check pdf page visibility on scroll every 50ms 2014-12-04 16:49:24 +00:00
Brian Gough
a15a6d877f avoid exception when elements in pdf view have been removed 2014-12-04 16:44:41 +00:00
Brian Gough
ce4fb7ec04 remove the pdf spinner, it causes unwanted reflow/repaint 2014-12-04 16:44:14 +00:00
Brian Gough
b388c587e5 remove debugging log for pdf featureswitch 2014-12-04 16:42:28 +00:00
Brian Gough
05af3573b6 try disabling pdfjs font face usage for performance 
each new font face rule causes a full screen repaint
 2014-12-03 15:18:58 +00:00
Brian Gough
a4ddfd5725 whitelist proxied headers when requesting pdfs from clsi 2014-12-03 15:09:46 +00:00
James Allen
4020c2f760 Update wrong synctex tooltip 2014-12-03 11:01:41 +00:00
James Allen
31ee8eea8b Show sync panel for everyone except anonymous users 2014-12-03 10:09:40 +00:00
Brian Gough
35b6abe79c fix tests for pdf header passing 2014-12-02 16:36:19 +00:00
Brian Gough
138170be60 pass headers through when proxying request to allow for byte-range/etag handling 2014-12-02 14:53:46 +00:00
Brian Gough
94448ed447 comment out logs/unused code in pdf viewer 2014-12-02 11:43:14 +00:00
Brian Gough
25521d1a26 insert the pdf text and annotations after the page has been rendered 2014-12-02 11:03:07 +00:00
Brian Gough
7071ee3540 set the size of the pdf container using jquery methods 2014-12-02 11:02:09 +00:00
Brian Gough
85750dfeb6 need to set the height of the container to get the pdf spinner working 2014-12-02 11:01:45 +00:00
Brian Gough
d6e47c2701 display empty div.pdf-canvas element as a blank page while it is being rendered 2014-12-02 11:00:33 +00:00
Brian Gough
ce8b5dd11c generate fingerprints for the new pdf.js files 2014-12-01 16:48:40 +00:00
Brian Gough
f260b141a0 use the current stable version of pdfjs - previously committed HEAD version by accident 2014-12-01 16:27:24 +00:00
Brian Gough
4888ae8766 fix infinite loop in translated coffeescript for pdfng text layer 2014-12-01 16:26:48 +00:00
Brian Gough
5053536fff load the compatibility library from the correct version of pdf.js 2014-12-01 15:41:17 +00:00
Brian Gough
440c1d3987 avoid exception 2014-12-01 15:24:19 +00:00
Brian Gough
0420e4638d exclude pdf.js from the compiled build, to allow switching 2014-12-01 14:36:23 +00:00
Brian Gough
be91bc2754 disable PDF.js autofetch only when used in new pdf viewer 2014-12-01 14:35:58 +00:00
Brian Gough
25bebe1104 support old and new pdf viewers depending on feature switch 2014-12-01 14:35:12 +00:00
James Allen
c70c048aae Send clear cache requests to the correct CLSI group 2014-12-01 12:19:01 +00:00
Brian Gough
3fd8bfb221 make the pdf viewer directive conditional depending on user feature switch 2014-12-01 11:47:56 +00:00
Brian Gough
3c05e032bd rename the new pdf directive to pdfng 2014-12-01 11:46:52 +00:00
Brian Gough
a7f9a68159 removed duplicated pdf controllers 2014-12-01 11:45:56 +00:00
Brian Gough
608e6cd0d9 remove autogenerated file 2014-12-01 10:42:57 +00:00
Brian Gough
ff04e1662a moved new pdf viewer under base App module 2014-12-01 10:42:47 +00:00
James Allen
e0178b17b5 Pass compile group correctly to Clsi._buildRequest 2014-12-01 10:28:09 +00:00
Brian Gough
175de30967 Merge branch 'master' into pdfng 2014-12-01 10:09:04 +00:00
Henry Oswald
a570d05132 fixed bug with setting root doc which would fail if the document class isn't on the top line 2014-12-01 01:07:03 +00:00
Brian Gough
57b09e1d60 started making pdf viewer conditional - work in progress 2014-11-28 16:59:39 +00:00
Brian Gough
57f4177f30 added pdfjs-1.0.712 in a subdirectory 2014-11-28 16:01:14 +00:00
Brian Gough
f09807cf33 Revert "upgrade pdf.js to v1.0.712" 
This reverts commit 1ace92f67d91395d047281047be2f0cff5ea7848.
 2014-11-28 15:25:29 +00:00
Brian Gough
d8e07731e0 clean up unnecessary redraws 2014-11-28 15:08:24 +00:00
Brian Gough
7485b564bc fix off by one error in viewport retrieval 2014-11-28 14:39:17 +00:00
Brian Gough
23011cf221 convert page indices from 1-based to 0-based to match pdfListView positions 2014-11-28 14:34:05 +00:00
James Allen
175dfae085 Look up compile group and features from project owner, not current user 2014-11-28 14:26:21 +00:00
James Allen
2c5f3c728c Highlight \vref like \ref 2014-11-28 13:58:27 +00:00
James Allen
dbd7b95823 Close spell check menu on scroll so it doesn't appear in the wrong position 2014-11-28 13:27:25 +00:00
Brian Gough
f914c75712 highlights working for moving to position in pdf from source 2014-11-28 11:57:23 +00:00
James Allen
793763f206 Merge pull request #120 from watercrossing/POSTFix 
Declare forms to use method="POST" explicitly
 2014-11-28 11:11:18 +00:00
Brian Gough
ea310f0248 highlights/dblclick in pdfng - work in progress 2014-11-27 16:58:38 +00:00
Henry Oswald
20a5ad6e27 fixed where project to large code is passed from 2014-11-27 16:22:39 +00:00
Henry Oswald
fa755c6521 added project to long check from clsi2 (bit of a punt) 2014-11-27 15:42:37 +00:00
Brian Gough
3694bea956 use margin for height/width in pdfng 2014-11-27 14:16:32 +00:00
Brian Gough
b8377bca7b fix offset calculation to match pdflistview 2014-11-27 13:46:22 +00:00
Brian Gough
7b4ca6501b update the margin size of pdfng 2014-11-27 13:42:05 +00:00
Brian Gough
21e5fb08cd replicate the pdflistview classes in pdfng viewer 2014-11-27 13:41:48 +00:00
Henry Oswald
0bc76b6d92 mkdir p changed so it does not get entire project, now without doc lines 2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508 Revert "added lock to update merger" 
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
 2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5 added lock to update merger 2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425 change async to series 
no real gain from parallel, series might reduce the cpu load if it finds the doc early
 2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0 modfied setRootDocAutomatically to work async 
was causing cpu to block for along time on big projects
 2014-11-26 17:19:21 +00:00
Brian Gough
a15ee57d77 working on zoom/fit buttons 2014-11-26 16:52:54 +00:00
Brian Gough
6c1cee1431 save pdf position and scale 2014-11-26 16:18:59 +00:00
Brian Gough
7b66802bf5 set up pdf viewer app in base 2014-11-26 16:18:39 +00:00
Brian Gough
d0fb34b2aa Merge branch 'master' into pdfng 2014-11-26 15:42:42 +00:00
Henry Oswald
393a637673 remove a couple of required coffee-scritps which are not required 2014-11-26 15:37:53 +00:00
Henry Oswald
857d867191 added locks into editor controller for new/move/deletes 
filesystem import manager uses the unlocked version
 2014-11-26 15:32:23 +00:00
Brian Gough
33d94af930 Merge branch 'master' into pdfng 2014-11-26 14:17:02 +00:00
Henry Oswald
bd841b4795 coppied the lock manager over from doc updater 2014-11-25 16:52:27 +00:00
Brian Gough
643bda6095 add pdfng module and use it by default 2014-11-25 16:49:09 +00:00
Brian Gough
81b8594944 upgrade pdf.js to v1.0.712 2014-11-25 15:58:01 +00:00
Henry Oswald
ba784c3e62 changed swiss franks to show Fr for display issues 2014-11-25 13:18:57 +00:00
Henry Oswald
d070c0acd8 fixed SGD collab price 2014-11-25 13:14:38 +00:00
Henry Oswald
3bae278c92 Revert "increased timeout for geoip to 3 seconds" 
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
 2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369 increased timeout for geoip to 3 seconds 2014-11-25 11:51:03 +00:00
Henry Oswald
dbecadcaea Merge branch 'master' into multicurrency 2014-11-25 11:35:59 +00:00
Henry Oswald
dd37436da2 delete old cookie keys 2014-11-25 11:35:46 +00:00
Henry Oswald
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
James Allen
afca9ba0cb Fix unit tests 2014-11-24 14:26:51 +00:00
James Allen
b8fdbdb406 Handle errors in request pipes 2014-11-24 13:58:41 +00:00
James Allen
970125b7a8 Check for null project in joinProject 2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c Add null check into FileTypeManager isDirectory check 2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d Wrap smoke test in domain to catch errors 2014-11-24 13:36:10 +00:00
James Allen
c28e09076b Add missing logger include in smoke test 2014-11-24 13:33:03 +00:00
Henry Oswald
a52b91691a Merge branch 'master' into multicurrency 2014-11-21 13:16:29 +00:00
Henry Oswald
6d22bda88f added new currencies removed ab test as well 2014-11-21 13:13:53 +00:00
James Allen
485459c839 Use real-time server for websockets 2014-11-21 12:44:41 +00:00
Henry Oswald
24b3226fcf bump redis version 2014-11-20 12:50:55 +00:00
Henry Oswald
851764f269 bump package.json 2014-11-20 11:10:22 +00:00
Henry Oswald
6c746d9aec added redis health check in 2014-11-19 23:18:20 +00:00
Henry Oswald
458e4335de added a load more currencies 2014-11-19 21:34:13 +00:00
Henry Oswald
57abc2cb24 lock down the version of redis 2014-11-19 16:45:10 +00:00
Henry Oswald
9e63b6c3a1 use redis 0.0.6 2014-11-19 16:41:12 +00:00
Henry Oswald
cd8c233c05 Revert robust redis connection code 2014-11-19 15:06:05 +00:00
Henry Oswald
dbb1d68b66 added SEK and CAD currencies 2014-11-19 14:52:59 +00:00
James Allen
8b9a26d6f3 Add in http health check end points for redis subscription channels 2014-11-19 14:12:37 +00:00
James Allen
34e20e99f5 Pull redis from github master temporarily 2014-11-19 11:09:59 +00:00
James Allen
d6532c63f8 Use new robust subscription model 2014-11-19 11:09:42 +00:00
James Allen
5ec9e587f0 Roll back real-time settings for now 2014-11-19 11:09:32 +00:00
James Allen
22346f5532 Revert "Pull redis from github master temporarily" 
This reverts commit 919fbdf8945bdd2cdb5ddda5a7ac8c5b7395597b.
 2014-11-18 18:01:58 +00:00
James Allen
f8cbc5d51a Pull redis from github master temporarily 2014-11-18 15:55:08 +00:00
Ingolf Becker
9d71073a5c Added more POST declarations 2014-11-17 15:19:11 +00:00
Henry Oswald
bb5ec10609 don't try and get angular min map file 2014-11-17 14:55:48 +00:00
Ingolf Becker
fd28751db0 Change Login and Register methods to use POST rather than GET 2014-11-17 14:55:28 +00:00
James Allen
e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
Henry Oswald
804bc16bc8 redirect users to /register when coming from templates or share url 
redirect to /login when going anywhere else (/project /project/1234)
 2014-11-13 17:12:39 +00:00
Henry Oswald
efe8667e5e changed the top level on bonus 2014-11-13 15:23:13 +00:00
Henry Oswald
f5d3801bfb changed findElementByPath to not call cb more than once & deal with nulls 2014-11-11 14:44:44 +00:00
Henry Oswald
948183b685 return done in smoke test 2014-11-10 16:33:36 +00:00
Henry Oswald
ae897cb41d try catch encodeURIComponent 2014-11-10 16:30:02 +00:00
Henry Oswald
c920874872 added null check to compile features 2014-11-10 11:26:40 +00:00
Henry Oswald
29ae816432 added next into controller for error 2014-11-10 11:23:07 +00:00
Henry Oswald
e077108993 null check user in logging 2014-11-10 11:21:59 +00:00
Henry Oswald
4c905c168a do null check on csrf token in smoke test 2014-11-10 11:20:34 +00:00
Henry Oswald
e9232eb197 try catch converting id to object id 2014-11-09 23:08:23 +00:00
James Allen
6d10e45135 Fix unit test 2014-11-07 12:35:10 +00:00
James Allen
84c08edcf3 Factor out common joinProject logic to provide and HTTP end point for the real-time API 2014-11-07 12:31:47 +00:00
James Allen
218f5fedf8 Fix broken template creation route 2014-11-07 11:21:55 +00:00
James Allen
f7e6b24ff6 Save template description on modal close 2014-11-07 10:26:09 +00:00
James Allen
a59a2dcf39 Make sure to send description before publishing 2014-11-07 10:20:29 +00:00
James Allen
c9e5583394 Use local versions of jquery and angular 2014-11-07 09:49:30 +00:00
James Allen
9c5ae5adf4 Remove unused old update method 2014-11-07 09:39:17 +00:00
James Allen
d27af25bc9 Convert template publishing to use HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef Access Dropbox status via HTTP end points 2014-11-06 14:39:40 +00:00
James Allen
e596b60af0 Move collaborator HTTP end points into the Collaborators feature 2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88 Add and remove collaborators with HTTP requests, not websockets 2014-11-06 14:39:40 +00:00
James Allen
94a17bd36d Remove unused socket.io endpoints 2014-11-06 14:39:40 +00:00
Henry Oswald
1a2411d4c2 removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter 2014-11-06 12:07:50 +00:00
Henry Oswald
a2f99bc04f prevent spell check from running twice on doc load 2014-11-04 14:20:59 +00:00
Henry Oswald
908926a0cc compiled pdf.worker with closure compiler manually 2014-11-04 12:44:45 +00:00
Henry Oswald
05a872763e revert updated pdf worker and don't minify it 
This reverts commit ffbf6f052f1800b55c7636a98e4f16fdf629c376.
 2014-11-04 12:16:06 +00:00
Henry Oswald
be6f0c1ad7 updated pdf worker 2014-11-04 12:10:21 +00:00
Henry Oswald
15285b67cc minify more assets 2014-11-04 12:01:53 +00:00
Henry Oswald
b9dd2d826e added null check on subscription for group plans 2014-11-04 10:53:03 +00:00
James Allen
22f5c5dcb9 Keep spacing consistent 2014-11-03 14:25:53 +00:00
James Allen
1d6647e67d Add in github to plans page 2014-11-03 14:23:12 +00:00
Henry Oswald
16e93b6f1b Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-11-03 12:07:53 +00:00
Henry Oswald
edf715919d send user to 404 if templates returns 404 2014-11-03 11:48:56 +00:00
Henry Oswald
4c7293f8c2 remove lang from page title in wiki article 2014-11-03 11:48:43 +00:00
James Allen
528ff743e8 Remove github feature flat 2014-11-03 10:55:35 +00:00
Henry Oswald
ccae47979f added chinese flags under cn 2014-10-31 13:21:04 +00:00
Henry Oswald
30100f2a07 fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync 2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4 wiki will try and get spanish version of page then fall back to english if it is not there 2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050 added file ref null check 2014-10-31 10:50:20 +00:00
Henry Oswald
0f4d9771aa added null check to where we insert elements into a project 2014-10-31 10:37:44 +00:00
Henry Oswald
d428e7e5b4 handle a null in the file refs list 
this seems to happen now and then when there is networking issues
 2014-10-31 10:34:21 +00:00
Henry Oswald
4f590d7acb added chinese flags in 2014-10-30 11:52:45 +00:00
Henry Oswald
14d32af6bf allow ace to scoll off screen 2014-10-30 08:33:54 +00:00
Henry Oswald
56efefd6d4 renamed variable 2014-10-30 08:33:18 +00:00
James Allen
ca664e0063 Get subscription status correctly for showing upgrade/bonus link 2014-10-27 15:00:46 +00:00
James Allen
2a69e185ce Append spell check menu to body so it isn't hidden by PDF view resizer 2014-10-27 14:51:28 +00:00
James Allen
184189fa3f Disable hotkeys for layout panels since they interfere with text editing 2014-10-27 14:47:06 +00:00
James Allen
f1ddff4061 Only ignore hidden files from Dropbox, not GitHub 2014-10-27 14:39:20 +00:00
Henry Oswald
f4be1884d3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-27 11:23:50 +00:00
Henry Oswald
011bdc4617 explicitly set the file types to delete 
the wild card version can get mixed up with app.del  '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
 2014-10-24 12:01:52 +01:00
James Allen
2debba6bbc Update PGP key 2014-10-24 11:55:30 +01:00
Henry Oswald
0a123418ac insert ref data into uni page 2014-10-23 14:13:40 +01:00
Henry Oswald
fab0dc5cbc change button to a 2014-10-23 11:51:35 +01:00
Henry Oswald
b067e0d0a4 fixed email us button on templates 2014-10-23 11:18:04 +01:00
Henry Oswald
0f8519f619 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-21 14:57:52 +01:00
Henry Oswald
c60f11519f added ga logging of starting free trial again 2014-10-21 14:06:53 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
James Allen
281c4eb4e3 Style tweaks for uni site 2014-10-21 13:39:47 +01:00
Henry Oswald
4bd0708029 put the compile group on the session so proxied requests are sent to the correct place 
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
 2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4 Revert "priority compiles are proxyed to the priority servers" 
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
 2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d priority compiles are proxyed to the priority servers 2014-10-20 17:48:00 +01:00
Henry Oswald
36136a99ca fixed escaping of html 2014-10-20 15:46:42 +01:00
Henry Oswald
9be31a2ac1 removed type: from log lines 2014-10-20 14:24:39 +01:00
Henry Oswald
7ba6689ea0 add clsi2_priority to settings.defaults 2014-10-20 12:21:58 +01:00
Henry Oswald
3cf64ce34f pass new compile features to client side, don't show timeout upgrade for premium users 2014-10-20 12:21:40 +01:00
Henry Oswald
fc4bc08fc2 added upgrade to get faster compiles message to timeout 2014-10-17 16:01:26 +01:00
Henry Oswald
b9d6d5bbf1 set the request timeout to a few mins for the compile 2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018 timeout option passed to clsi 2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d if user has premium compile send them to a different server set 2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b added default opts for users compile features 2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959 get users features for compile options i.e. timeout and which compiler 2014-10-16 16:34:21 +01:00
Henry Oswald
d8cc3b7b61 fixed leaky test 2014-10-16 16:02:31 +01:00
James Allen
8fa8a64c6f Update email templates 2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4 Fix argument signature of mergeUpdate and deleteUpdate 2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c Fix broken argument signature of addFolder 2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396 Send source of update to doc updater and allow external updates to be ignored in UI 2014-10-16 11:27:10 +01:00
Henry Oswald
1b893ff502 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-15 16:22:01 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
James Allen
7e9318814d Send source of update to doc updater on setDocument request 2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e Track the source of updates through the system on adding/updating of docs and files 2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-10-15 14:11:11 +01:00