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
3349 commits 3 branches 7 tags 206 MiB
Commit graph

2100 commits

Author SHA1 Message Date
Henry Oswald
ad60268707 clean up vars for buildjs path and change default to cdn.sharelatex.dev:3000 2016-07-21 09:38:24 +01:00
Shane Kilkelly
0f2600b198 finish out skeleton of invite controller 2016-07-21 09:32:14 +01:00
Shane Kilkelly
f7c2fa37ab Fill out getInviteByToken 2016-07-20 16:44:22 +01:00
Henry Oswald
e27d5ce969 use Url for lib name 2016-07-20 16:10:33 +01:00
Henry Oswald
97b42478d1 don’t fingerprint sentry 2016-07-20 16:03:01 +01:00
Shane Kilkelly
0dc4e2c0c1 Merge branch 'master' into pr-email-tokens 2016-07-20 15:23:37 +01:00
Shane Kilkelly
5b22be8a0b Further scaffolding 2016-07-20 15:22:48 +01:00
Henry Oswald
e8aad2abb1 don’t fingerprint main.js and ide.js 2016-07-20 15:17:01 +01:00
Henry Oswald
596fc2525b simplified buildJSPath 2016-07-20 14:48:58 +01:00
Henry Oswald
a3e40adbaf Merge pull request #283 from sharelatex/ho-cdn 
Ho cdn
 2016-07-20 14:19:37 +01:00
Shane Kilkelly
a4c7db5f20 skeleton of inviteToProject function 2016-07-20 14:14:56 +01:00
Shane Kilkelly
e383e49161 Add CollaboratorsInviteController and routes 2016-07-20 14:04:14 +01:00
Henry Oswald
6c78ab4ace got requirejs working nicely with cdn 2016-07-20 12:58:32 +01:00
Henry Oswald
b589ab388f fix close editor button 
- only evaulate close on web router, not api/static assets
- allow /admin pages to still be available
 2016-07-19 17:15:20 +01:00
Henry Oswald
f8c38f30a8 got build js path working with mathjax 2016-07-19 15:41:33 +01:00
Brian Gough
13d6448ab8 Merge pull request #284 from sharelatex/fix-synctex-subdir-path 
work around for synctex paths containing /./
 2016-07-19 12:24:31 +01:00
Brian Gough
a93efde1ae add file path check on element names 2016-07-19 11:58:10 +01:00
Henry Oswald
0cbd9d0ff9 use url.resolve to adding https:// part 2016-07-19 11:41:36 +01:00
Shane Kilkelly
4e1df9f476 Fix wording of userHasSubscription to userHasNoSubscription 2016-07-19 11:37:58 +01:00
Shane Kilkelly
3aea3a68d1 Check the truth of subscription.customAccount, rather than definition. 2016-07-19 10:28:43 +01:00
Shane Kilkelly
effc3727be Don’t show upgrade prompts for users with custom subscription accounts. 
Set `hasValidSubscription` to true if user subscription is custom.
 2016-07-19 10:15:45 +01:00
Henry Oswald
a2a8b7123b created buildCssPath img and js path funcs 2016-07-18 17:18:51 +01:00
Brian Gough
1d74e6750c work around for synctex paths containing /./ 2016-07-18 17:00:34 +01:00
James Allen
62a444082d Add in /dev/csrf endpoint for easy automated testing 2016-07-18 16:47:54 +01:00
Henry Oswald
715ffcfbf2 changed ordering on static assets path, just tidying. 2016-07-18 16:24:48 +01:00
Brian Gough
a3c97533ae Merge pull request #281 from sharelatex/stop-compile 
add support for stopping compile
 2016-07-18 15:01:26 +01:00
Brian Gough
ded9bcaa11 remove unwanted styling on 'stop compile' button 2016-07-18 15:00:16 +01:00
Henry Oswald
c21549220c mvp for cdn 2016-07-18 14:05:07 +01:00
Brian Gough
92d41dd74e added comment for per-user route to top-level directory 2016-07-18 11:16:09 +01:00
Brian Gough
5a02e8c656 add support for stopping compile 2016-07-15 16:28:52 +01:00
Henry Oswald
0576380811 allow placeholder for sharing project to be changed 2016-07-14 11:40:32 +01:00
Paulo Reis
c23091da94 Always set feature flags, if available. 2016-07-14 11:07:10 +01:00
Paulo Reis
ab995671fc Namespace feature flags. 2016-07-14 10:10:14 +01:00
Paulo Reis
5d5bc57535 Add user name. 2016-07-14 09:55:11 +01:00
Paulo Reis
fee22db567 Refactor user blocks into a single script tag. 2016-07-14 09:47:25 +01:00
Paulo Reis
a261de9eb1 Set feature flags. 2016-07-14 09:37:04 +01:00
Paulo Reis
68906cb0c5 Avoid unneeded change_id event; id can be set as a Countly property, before initializing. 2016-07-13 16:29:53 +01:00
Henry Oswald
713f2110c1 use translations for title and meta description (google) 2016-07-12 14:25:25 +01:00
Paulo Reis
1e62ce679b Make 'knowledge base' a link to the KB index page. 2016-07-12 11:44:48 +01:00
Paulo Reis
785bf1b5a2 New key for the message label. 2016-07-11 16:24:06 +01:00
Paulo Reis
af93ac4413 Track suggestions usage. 2016-07-11 14:27:07 +01:00
Paulo Reis
9ef78b4bc2 Merge branch 'master' into pr-contact-form-suggestions 2016-07-11 13:54:06 +01:00
Paulo Reis
7eafa5ca3f Make Countly server configurable via settings. 2016-07-11 11:02:52 +01:00
Henry Oswald
94d760e32d import bootstrap font awseome via less not html 2016-07-10 11:10:43 +01:00
Paulo Reis
444120f8b1 Merge branch 'master' into pr-contact-form-suggestions 2016-07-08 13:55:08 +01:00
Shane Kilkelly
0e9beb5653 remove daft redundancy. 2016-07-07 09:42:01 +01:00
Shane Kilkelly
896cbb5f4c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-07 09:35:53 +01:00
Shane Kilkelly
9e35bdcaea Refactor: add ? suffix to truth tests. 2016-07-07 09:35:44 +01:00
Paulo Jorge Reis
efacd9e7f2 Merge pull request #267 from sharelatex/pr-log-dropdown 
"Other logs & files" dropdown / dropup
 2016-07-06 16:06:10 +01:00
Shane Kilkelly
21eb104928 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-06 15:39:12 +01:00
Shane Kilkelly
dda0841af3 Return early if there are no keys to delete 2016-07-06 15:39:03 +01:00
Paulo Reis
b867c37d49 Merge branch 'master' into pr-log-dropdown 2016-07-06 15:35:28 +01:00
Paulo Jorge Reis
59065395ef Merge pull request #273 from sharelatex/pr-countly-integration 
Countly integration
 2016-07-06 15:00:47 +01:00
Paulo Reis
7a3d3d3ffd Make Countly track by internal ids. 2016-07-06 14:44:28 +01:00
Paulo Reis
8e2475afdc Track hints feedback in both GA and Countly; clean-up. 2016-07-06 14:24:50 +01:00
Shane Kilkelly
fc6cf75ad5 Merge branch 'master' into sk-session-revocation 2016-07-06 13:19:15 +01:00
Paulo Reis
5c121a5f05 Track user log in and sign up. 2016-07-06 12:12:54 +01:00
Paulo Reis
7e1c1f7414 Remove heap integration. 2016-07-06 12:12:22 +01:00
Paulo Reis
c9b1faa1a1 Add user info to correlate with events. 2016-07-06 11:59:33 +01:00
Paulo Reis
909f7c15b5 Track log-related actions. 2016-07-05 16:27:14 +01:00
Paulo Reis
d5efe81a46 Track recompiles. 2016-07-05 16:02:46 +01:00
Shane Kilkelly
3f1a47eccb map the 'retain' values to session ids 2016-07-05 14:54:26 +01:00
Shane Kilkelly
5b9903551a add an array of session ids to retain. 2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308 clear sessions on password reset 2016-07-05 14:19:59 +01:00
Paulo Reis
fac3698c40 Better namespacing of sprite CSS classes. 2016-07-05 11:08:58 +01:00
Paulo Reis
7dd1906eaf Initial Countly integration. 2016-07-04 16:51:31 +01:00
Shane Kilkelly
df0a7bc547 test the _checkSessions function. 2016-07-04 14:04:10 +01:00
Shane Kilkelly
2ae2e6ed4f Test trackSession 2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60 Begin testing UserSessionsManager. 2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3 check sessions on login and logout. 2016-07-04 09:27:38 +01:00
Paulo Reis
11f198d970 Merge branch 'master' into sprites 2016-07-01 16:27:09 +01:00
Paulo Reis
4f49a25639 Use a figure element instead of an img, as there is no src attribute. 2016-07-01 16:02:01 +01:00
Shane Kilkelly
6f20f565fe Add early-return guards 2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02 Add ip_address and session_created to the session user object. 2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7 Refactor method names in UserSessionsManager 2016-07-01 15:33:59 +01:00
Henry Oswald
6f4a7f4779 mvp for using sprites for flags, needs border removing 2016-07-01 15:04:39 +01:00
Shane Kilkelly
6938f1d055 No need to build extra string 2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f Clear out sessions 2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94 Fix logging. 2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1 set expiry on the user sessions set. 2016-07-01 11:24:46 +01:00
Shane Kilkelly
88bef5c5ea Add revokeAllSessions handler, when password is reset 2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255 Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers 
remove scaffolding for per-user compiles so that it is always by default
 2016-06-30 15:16:28 +01:00
Brian Gough
c04e00026b remove scaffolding for per-user compiles so that it is always by default 2016-06-30 14:43:03 +01:00
James Allen
882e28a811 Don't choke on null projects 2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314 Remove a user from being a collaborator when their account is deleted 2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed Skip null user objects when getting collaborators 2016-06-30 13:56:21 +01:00
Paulo Reis
c5f53ef431 Track log hints feedback. 2016-06-30 11:30:30 +01:00
Henry Oswald
000c862ae1 return 404 if blog returns 403, caused by file not existing 2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5 save the session key string, rather than just the id 2016-06-29 15:12:12 +01:00
Paulo Reis
72d498c6c8 Merge branch 'master' into pr-contact-form-suggestions 2016-06-29 11:58:07 +01:00
Shane Kilkelly
db213c0621 Begin keeping record of user sessions in reds. 2016-06-29 11:35:25 +01:00
Henry Oswald
8f14526354 added custom footer in email option 2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884 hook notifications handler up to make request which doesn't make request if url not set 2016-06-28 16:52:27 +01:00
Paulo Reis
a6d184358f Avoid inline-styles. 2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126 Dynamically determine if the files dropdown should drop up or drop down. 2016-06-28 15:48:11 +01:00
Shane Kilkelly
9e16f250f9 Merge branch 'sk-subscription-address' 2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf set postal_code as zip 2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe Test the createSubscription action (+4 squashed commits) 
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
 2016-06-28 13:59:52 +01:00
Paulo Reis
616fd5daf6 Merge branch 'master' into pr-ui-feedback-error-nav 2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac Merge branch 'master' into pr-ui-feedback-error-nav 2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619 Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds 
use parameter for bcrypt rounds, rehash passwords on login if necessary
 2016-06-28 10:49:33 +01:00
Henry Oswald
b8b833b753 moved wiki into module 2016-06-28 10:16:02 +01:00
Shane Kilkelly
709f8f2bea start testing the paypal workflow. 2016-06-27 16:34:00 +01:00
Paulo Reis
3580d8377f Merge branch 'master' into pr-contact-form-suggestions 2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931 Integrate translations. 2016-06-27 15:38:13 +01:00
Shane Kilkelly
401565ba23 Fix references to the RecurlyWrapper object. 2016-06-27 12:14:43 +01:00
Paulo Reis
81b93ab5a9 Disable links to the docs when the wiki is not available. 2016-06-27 11:34:24 +01:00
Shane Kilkelly
9938787e4a fix a few silly issues. Appears to work now 2016-06-27 10:38:10 +01:00
Shane Kilkelly
72c73809f6 Generate address xml from object. 2016-06-27 09:44:40 +01:00
Paulo Reis
c82f4481e4 Show search results. 2016-06-24 17:10:18 +01:00
Paulo Reis
f427ce88d9 Better Jade syntax. 2016-06-24 16:37:35 +01:00
Paulo Reis
dfc375adf8 Add more feedback on :hover. 2016-06-24 15:55:19 +01:00
Henry Oswald
9888d6631a don't error if references is not enabled 2016-06-24 15:46:37 +01:00
Henry Oswald
6e59a10fb3 added more null checks for potential undefined notifications 2016-06-24 15:23:57 +01:00
Paulo Reis
c376c807d7 Forgotten href attribute. 2016-06-24 15:22:34 +01:00
Henry Oswald
51df3825e5 add null check on notifications handler 2016-06-24 15:11:22 +01:00
Henry Oswald
8d79b37651 return from _doIndexOperation if referneces is not setup eailer 2016-06-24 15:07:28 +01:00
Shane Kilkelly
026e9f46c8 WIP: process appears to work, setting address correctly 2016-06-24 15:03:46 +01:00
Shane Kilkelly
56bc840b88 WIP: fix up error handling and account for possibility of account already existing. 2016-06-24 14:11:28 +01:00
Paulo Reis
a33aeca9c3 Merge branch 'pr-latex-hints-improvements' 2016-06-24 14:07:57 +01:00
Henry Oswald
3887db8898 don't call notifications if notifications has no url 2016-06-24 14:06:04 +01:00
Paulo Reis
b4de353828 Merge branch 'master' into pr-latex-hints-improvements 2016-06-24 14:02:55 +01:00
Henry Oswald
9a3e621c9c stripe off errors and kb from page titles 2016-06-24 13:15:22 +01:00
Paulo Reis
5f7ffb5a8c Make hint card area non-clickable. 2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d Better handling of whitespace. 2016-06-24 12:07:02 +01:00
Shane Kilkelly
249381b6a8 WIP: initial work on sending address to recurly for paypal subscriptions 2016-06-24 11:42:58 +01:00
Paulo Reis
a587d5ddba Set up model options. 2016-06-24 11:02:29 +01:00
Henry Oswald
d294117286 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-23 16:40:22 +01:00
Henry Oswald
5371669f89 if references has no url don't send post, silently return 2016-06-23 16:39:54 +01:00
Paulo Reis
f62a45444d Prototype mark-up and styles. 2016-06-23 12:08:13 +01:00
Shane Kilkelly
cbdcc874e3 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-22 11:03:32 +01:00
James Allen
b693ced843 Merge pull request #263 from sharelatex/pr-human-readable-logs 
Human readable logs
 2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973 Minor UI improvements. 2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e Remove DataJoy link from the project page. 2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80 Merge branch 'ha_custom_image_logo' 2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91 Safety checks for non-existing values; avoid rendering the hint template when there is no hint. 2016-06-21 12:07:47 +01:00
Paulo Reis
d8e0026bc6 Add class to enable per-hint feedback tracking. 2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd Show thank you note after receiving feedback. 2016-06-20 15:04:47 +01:00
Paulo Reis
baea017adb Better mark-up for analytics tracking. 2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc Use plain links instead of buttons. 2016-06-20 14:42:36 +01:00
Paulo Reis
ada018263a Merge branch 'master' into pr-human-readable-logs 2016-06-20 11:54:56 +01:00
Paulo Reis
1893ae68a9 Add feedback widget for log hints. 2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3 Hint card styling. 2016-06-20 09:45:14 +01:00
Henry Oswald
fe11a4d835 include sentry below the fold 2016-06-18 12:29:52 +01:00
Henry Oswald
d2e4e22511 health checks should be on api router with no sessions 2016-06-18 11:58:26 +01:00
Henry Oswald
d27d19e02a added override for navbar background image 2016-06-17 14:18:52 +01:00
Paulo Reis
2bfe0d0ba9 Basic mark-up for hint card. 2016-06-17 14:16:38 +01:00
Brian Gough
98a0c54004 use parameter for bcrypt rounds, rehash passwords on login if necessary 2016-06-17 12:22:03 +01:00
Paulo Reis
54d48ce0ea Support extra info URL in human readable hints. 2016-06-17 11:42:32 +01:00
Paulo Reis
40fda6e361 Support HTML in human readable log messages. 2016-06-16 16:29:19 +01:00
Paulo Reis
9b8d695e43 Match logs against ruleset; show human readable message when appropriate. 2016-06-16 15:53:39 +01:00
Brian Gough
fcd5582e6e Merge pull request #259 from sharelatex/fix-per-user-containers 
Fix per user containers
 2016-06-16 14:12:57 +01:00
Brian Gough
8a0fa1321d add comments to router, downcase route 
express has case-insensitive routes
 2016-06-16 13:59:56 +01:00
Brian Gough
6873c1d972 fix download methods in CompileController 2016-06-16 13:59:24 +01:00
Shane Kilkelly
3e3dd199a0 Add id's to buttons on beta program page 2016-06-16 10:56:16 +01:00
Shane Kilkelly
241d3bfc14 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-16 10:17:47 +01:00
Shane Kilkelly
9919f5f44a Refactor heap analytics 2016-06-16 10:17:36 +01:00
Henry Oswald
101e98ed83 simpliyfied dashboard & fixed error with leave group shown to group owner 
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
 2016-06-16 09:17:43 +01:00
Shane Kilkelly
5ce0100371 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-16 08:50:15 +01:00
Henry Oswald
7dad0427e8 fixed logger in notifications builder 2016-06-15 17:40:54 +01:00
Shane Kilkelly
c8302e090f Merge branch 'master' into sk-heap-analytics 2016-06-15 15:35:47 +01:00
Shane Kilkelly
522ac8b59b initial port of heap code from DJ into sharelatex. 2016-06-15 15:35:03 +01:00
Paulo Reis
e891a47a9e Better support for larger text in keyboard tooltips. 2016-06-15 15:27:30 +01:00
Henry Oswald
a5abc7392d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-15 14:45:28 +01:00
Henry Oswald
8a9a65a80a fix the download and compile endpoint used by zip 2016-06-15 14:45:05 +01:00
Paulo Reis
d7e4009504 Small styling enhancements. 2016-06-15 10:48:40 +01:00
Paulo Reis
3310a3ea3f Change tooltip copy; get it from i18n catalogue. 2016-06-14 17:20:16 +01:00
Paulo Reis
a9e0185098 Added tooltip with keyboard shortcut in the recompile button. 2016-06-14 17:02:22 +01:00
Brian Gough
830d15136d fix missing variables in pdf sync 2016-06-14 08:49:08 +01:00
Henry Oswald
f9fdec8a15 whitelist /user/activate for non public access 2016-06-13 15:24:41 +01:00
Henry Oswald
84db5ec23a added logging and default calback 2016-06-13 13:38:30 +01:00
Henry Oswald
f3e48e332b explicit call to UserCreator.createNewUser 2016-06-13 13:38:17 +01:00
Henry Oswald
3bc3153490 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-13 13:24:04 +01:00
Henry Oswald
c52af1393e should be able to set first and last name via user details on registration 2016-06-13 13:21:44 +01:00
Brian Gough
49a7c3c27b Merge branch 'per-user-containers-part-2' 
Conflicts:
	app/coffee/Features/Compile/ClsiManager.coffee
	app/coffee/Features/Compile/CompileController.coffee
	app/coffee/Features/Compile/CompileManager.coffee
 2016-06-13 12:24:48 +01:00
Brian Gough
e6dcce21fd use build_id and user_id instead of build and user 2016-06-10 12:11:47 +01:00
Brian Gough
8bc5f53562 Merge pull request #253 from sharelatex/per-user-containers-part-1 
Per user containers part 1
 2016-06-10 09:40:00 +01:00
Brian Gough
47574d7c7e Merge pull request #252 from sharelatex/per-user-containers-part-0 
Per user containers part 0
 2016-06-08 15:55:17 +01:00
Shane Kilkelly
ad6e9e039d Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:31:24 +01:00
Shane Kilkelly
6ca2e2204b If user is in beta program, show link to opt-out page on the settings page. 2016-06-08 15:31:14 +01:00
Shane Kilkelly
8f1fec8c4f Add opt-out action to beta page 2016-06-08 15:11:39 +01:00
Brian Gough
6c244eb2f4 Merge pull request #251 from sharelatex/fix-download-urls 
fix filename of downloaded pdf files
 2016-06-08 14:33:12 +01:00
Shane Kilkelly
58d7d7bf74 Re-work wording of beta opt-in page. 2016-06-08 11:38:14 +01:00
Shane Kilkelly
90dac348ff refine beta opt-in workflow. 2016-06-08 11:04:44 +01:00
Shane Kilkelly
20485cbfed Merge branch 'sk-beta-program' 2016-06-08 10:34:03 +01:00
Shane Kilkelly
009fa79589 remove trailing parens. 2016-06-08 10:33:21 +01:00
Shane Kilkelly
0dfd80d307 Use css to add the beta symbol to the beta-label 2016-06-07 14:04:02 +01:00
Shane Kilkelly
2598661c4c Use correct title for Beta Opt-in page 2016-06-07 13:42:06 +01:00
Shane Kilkelly
618d3ee269 fix missing require 2016-06-07 13:41:50 +01:00
Shane Kilkelly
d8f1e8ec93 Add basic BetaProgram feature. 2016-06-07 11:15:56 +01:00
Henry Oswald
4029b76d9e - make system messages default tab in admin panel 
- add manage site tab to dropdown
 2016-06-06 16:11:26 +01:00
Henry Oswald
79929eae73 Merge branch 'clsichecks' 2016-06-06 14:34:22 +01:00
Shane Kilkelly
fdacf13782 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-06 13:12:31 +01:00
Shane Kilkelly
4e63a3c7bd Move betaProgram flag up to top-level of user object 2016-06-06 13:12:24 +01:00
Henry Oswald
829b37cd74 set user email on session again on change email 2016-06-06 10:50:45 +01:00
Henry Oswald
2339cda318 added contentful uni pages as fallback 2016-06-06 09:28:53 +01:00
Brian Gough
634c774592 make code clearer when compilation is per-user 2016-06-02 16:54:46 +01:00
Brian Gough
9d7f129b61 add per-user compilation in server 
when no user is defined, fallback to per-project compilation
 2016-06-02 15:48:13 +01:00
Brian Gough
061d4934f1 use url attribute sent back by clsi 2016-06-02 15:46:55 +01:00
Brian Gough
5be1886d43 use path attribute sent back by clsi 2016-06-02 15:43:20 +01:00
Henry Oswald
14cbf4f1c8 removed priority url from proxy to clsi 2016-06-02 13:11:20 +01:00
Henry Oswald
c284465ba5 added clsiformat checker, wired in 2016-06-02 13:09:32 +01:00
Brian Gough
b8e31dfc71 fix filename of downloaded pdf files 2016-06-01 16:47:55 +01:00
Henry Oswald
8a5cb86c31 check _checkRecoursesForErrors before compile 2016-06-01 16:46:41 +01:00
Shane Kilkelly
a5aab40320 Add the betaProgram feature to User model. 2016-06-01 16:17:28 +01:00
Henry Oswald
1437877b5a spike to check latex for basic errors before compile 
Aims to solve following problems which are currently not visible to user:

- project is too big, which files are worst offenders?
- when there are duplicate file names so an 'old' version keeps overrighting a new version
- when a file has the same path as a folder which blows up clsi i.e. images/research images/research/1.png
 2016-06-01 12:28:54 +01:00
James Allen
41f789a313 Add in metric to track client side error count 2016-05-27 10:46:14 +01:00
Brian Gough
b55c469b91 use Url instead for url for "url" module 
to avoid possible conflicts with use of url as a variable
 2016-05-26 16:24:18 +01:00
Brian Gough
d83cd547fb Merge pull request #247 from sharelatex/add-query-string-to-proxy-and-filter-synctex-requests 
Add query string to proxy and filter synctex requests
 2016-05-25 15:08:49 +01:00
Brian Gough
c7363a9df6 provide separate routes for sync-pdf and sync-code with error checking 2016-05-25 15:00:31 +01:00
James Allen
36ba88297b Don't hang request in the event of a spelling backend error 2016-05-24 15:11:14 +01:00
James Allen
35442f7ce9 Prompt the user to open a file on the left if no doc is open 2016-05-23 15:03:26 +01:00
James Allen
887631e661 Don't error if the rootDoc_id no longer exists in the project when copying 2016-05-23 14:58:28 +01:00
Henry Oswald
a24f635531 removed uneeded passing of clsiServer to _parseOutputFiles and improve logging 2016-05-21 10:23:17 +01:00
Brian Gough
7f332c0436 support url object with query-string when proxying to clsi 2016-05-20 16:51:19 +01:00
Brian Gough
3c5eb9a730 clean up whitespace 2016-05-20 16:35:00 +01:00
Shane Kilkelly
0c454f5ddd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-05-20 14:34:55 +01:00
Shane Kilkelly
2441930fe9 Add a spinner when waiting for image preview to load. 2016-05-20 14:28:51 +01:00
Henry Oswald
c918028d14 removed clsi priorty url 2016-05-20 12:46:14 +01:00
Henry Oswald
11724fce13 Merge branch 'master' into clsi-dynamic-load 2016-05-20 12:34:42 +01:00
Shane Kilkelly
9a6876d237 Toggle the dots at the end of bib preview, based on size of payload. 2016-05-20 09:17:25 +01:00
Henry Oswald
61b9a683aa put clsiCookie vals into subobject in settings 2016-05-19 16:55:58 +01:00
Henry Oswald
04e70735d2 Merge branch 'master' into clsi-dynamic-load 2016-05-19 16:26:54 +01:00
Shane Kilkelly
0ea16f0bcc Index '.bib' file objects. 2016-05-19 14:58:12 +01:00
Henry Oswald
789257fd4a use cookie key when setting cookie for jar 2016-05-19 13:52:18 +01:00
Henry Oswald
2abebd850c Merge branch 'project_url_query' into clsi-dynamic-load 2016-05-19 13:08:20 +01:00
Shane Kilkelly
b649c13c17 Eliminate weird flicker when loading bibtex 2016-05-19 11:25:24 +01:00
Shane Kilkelly
b70a993572 Make bib previews more robust. 2016-05-19 11:11:23 +01:00
Shane Kilkelly
5df5ba868c Fix logic for showing error or loading message. 2016-05-19 10:02:07 +01:00
James Allen
d813f45d28 Cherry-pick 0e70320 (Select icon based on file extension) from datajoy 2016-05-18 15:58:01 +01:00
Henry Oswald
dba8d96d11 pass clsiServerId to the client and use it as query stirng for requests 2016-05-18 12:50:50 +01:00
Shane Kilkelly
8621d497b4 Fix view so that bib preview only shows for bib files 2016-05-18 11:14:24 +01:00
Henry Oswald
b0baea5073 add query string to end of project resources 2016-05-18 10:09:22 +01:00
Shane Kilkelly
eae82a2b20 Preview bib files. 2016-05-17 17:00:14 +01:00
Shane Kilkelly
4f533147b1 enable range requests on files via ?range=m-n query string. 2016-05-17 16:59:47 +01:00
Brian Gough
ee15bbeee0 support the direct path to a clsi output file /project/project_id/build/build_id/output/* 
this avoids use of the query string ?build=... and so we can match the
url directly with the nginx location directive
 2016-05-13 10:33:38 +01:00
James Allen
aafdc794cd Remove text limit in content box of contact us 2016-05-10 10:44:51 +01:00
Henry Oswald
b8510301b6 expire cookie key from setting file length 2016-05-06 12:19:22 +01:00
Henry Oswald
ed4fdd48d7 clsi cookies are given an expire time via settings file 2016-05-05 16:50:18 +01:00
Henry Oswald
618935b643 hide hidden domains in hreflang head of html 2016-05-04 22:01:02 +01:00
Shane Kilkelly
48b7800c7f Revert, because mistake. 2016-05-04 10:43:40 +01:00
Shane Kilkelly
9738703424 If image preview fails to load, just show the "no preview" message 2016-05-04 09:32:59 +01:00
Shane Kilkelly
aa301dacb9 Return callback with error if an error is emitted on filestore stream. 2016-05-04 09:32:13 +01:00
Henry Oswald
b237a022c3 added rate limiting on wiki endpoint 2016-04-28 17:24:00 +01:00
Shane Kilkelly
74205ce11b Remove features.mendeley and features.zotero from User model 2016-04-28 16:01:47 +01:00
Henry Oswald
b00bd5cd94 if clsi cookies are not enabled don't call redis, return empty 2016-04-27 17:05:12 +01:00
Henry Oswald
78b08060ab redis get not multi used for _getServerId 2016-04-27 16:56:21 +01:00
Henry Oswald
1ee94f9bf5 return server id for set server id and _populateServerIdViaRequest 2016-04-27 16:20:10 +01:00
Henry Oswald
ae522e8b9b Merge pull request #235 from mdamien/patch-1 
Correct alignment for word count dialog
 2016-04-27 16:12:03 +01:00
Shane Kilkelly
07ad6eb704 actually use the rendering-error state. 2016-04-25 12:42:03 +01:00
Henry Oswald
616630200a improve send calls and return correct stuff from _makeRequest 2016-04-20 17:08:11 +01:00
Henry Oswald
18560d8621 set server cookie on every compile response and don't expire on get 2016-04-20 16:17:06 +01:00
Henry Oswald
4d54de8b9a renamed ClsiRequestManager to ClsiCookieManager and improved logging 2016-04-20 15:06:39 +01:00
Henry Oswald
b37595acf9 persist cookie in redis for compiles. 2016-04-19 16:48:51 +01:00
Shane Kilkelly
fbf5d35fa5 Merge branch 'master' into sk-tpr 2016-04-15 09:46:16 +01:00
Shane Kilkelly
9d027b88ba Bug fix: re-introduce the project-too-large error message 2016-04-15 09:45:48 +01:00
Henry Oswald
ffa04c7b55 add project url onto query string for compile hashing 2016-04-13 15:38:04 +01:00
Shane Kilkelly
939d7cd042 Merge branch 'master' into sk-tpr 2016-04-11 16:41:34 +01:00
Henry Oswald
424e09ec05 getGroupSubscriptionMemberOf gets plan code 2016-04-05 16:03:46 +01:00
Damien
77eba3ea22 Correct alignment for word count dialog 
on less than `md` sized screen
 2016-04-04 23:47:40 +02:00
Henry Oswald
633839c98b for support tickets include browser/os and hide email address if 
set already. This way we know who they are logged in with which has
caused condfusion.
 2016-04-04 16:05:42 +01:00
Shane Kilkelly
a686d187ad Pull refProviders into user model 2016-04-01 11:36:19 +01:00
Henry Oswald
3d719af71e if subscription is downgraded don't use plan code on subscription, use default instead 2016-03-31 18:04:20 +01:00
Henry Oswald
81cd2adfd3 member_ids != members_id 2016-03-31 17:36:06 +01:00
Henry Oswald
d80191c03b added more logging and missing err handler in subscription updater 2016-03-31 17:28:03 +01:00
Shane Kilkelly
0ce514a5a6 Add features to the user object in ide. 2016-03-31 17:10:49 +01:00
Henry Oswald
5a201153c7 refactored subscription updater again adding _setUsersMinimumFeatures 
single place you can call and the users minimum features are set
 2016-03-31 16:58:16 +01:00
Henry Oswald
cb3eb88af2 Merge branch 'subscriptionimprovements' 2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5 fixed change payment details page 
also increased size of year field for firefox users
and removed unnded options in new plan page
 2016-03-31 11:54:52 +01:00
Henry Oswald
1a651b38f4 added sendgrid as email option 2016-03-29 14:15:33 +01:00
Henry Oswald
e9478e0843 Merge branch 'templatessearch' 2016-03-24 12:06:41 +00:00
Henry Oswald
6662d4c2cd wired up modal for learn and added translations 2016-03-24 12:05:54 +00:00
James Allen
9b84e1b164 Improve styling of wiki search 2016-03-24 11:38:56 +00:00
Henry Oswald
ce2cfeaa5b don't show search bar in templates if its not configured 2016-03-24 09:52:19 +00:00
Henry Oswald
7634fcf3af added missing page button (not wired up) to /learn 2016-03-23 18:23:09 +00:00
Henry Oswald
90092a0c61 improved styling, not perefect still 2016-03-23 16:05:38 +00:00
James Allen
3fe0674462 Revert "Add error handling in mkdir_p" 
This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319.

Apparently mkdirp needs errors to be ignored to work...
 2016-03-23 15:33:01 +00:00
James Allen
4d0fe3bf5d Add error handling in mkdir_p 2016-03-23 15:18:10 +00:00
James Allen
ae5467894b Standardise on one Errors file 2016-03-23 15:14:49 +00:00
James Allen
bad9a0282d Add missing error handler 2016-03-23 14:38:11 +00:00
James Allen
c827407a99 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-23 11:29:59 +00:00
James Allen
3d8ac9f292 Add in a few null checks 
These were discovered by using a project that was messed up with the moving
folder bug where the folder ended up without an id, docs or fileRefs array
 2016-03-23 10:54:36 +00:00
Henry Oswald
9cfbbfa504 template search works nicely, needs styling 2016-03-22 22:16:38 +00:00
Henry Oswald
cf45b8bd74 Merge branch 'master' into templatessearch 2016-03-22 21:35:36 +00:00
Henry Oswald
c554b0630d if user has subscription before joining group is given option to cancel personal one 2016-03-22 16:59:47 +00:00
Henry Oswald
a6859e22b3 if user is member of group on downgrade use the group subscription 2016-03-22 16:05:46 +00:00
Shane Kilkelly
b212f33505 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 15:21:00 +00:00
James Allen
9706585d21 Fix translate in delete modal confirm button 2016-03-22 14:44:13 +00:00
Shane Kilkelly
d566ce3fd2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 14:38:56 +00:00
Henry Oswald
cc84aaf834 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 14:19:54 +00:00
Henry Oswald
7fb0249b2b null check subscription for custom accounts page 2016-03-22 14:19:46 +00:00
James Allen
a597ebfd90 Only show deleted files in track changes view 2016-03-22 14:13:50 +00:00
Shane Kilkelly
b8c3b427ee Merge branch 'sk-pdf-error-display' 2016-03-22 14:00:12 +00:00
Henry Oswald
cacb3bf39e Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 12:30:52 +00:00
Henry Oswald
69a7a1508b modal != modal instance 2016-03-22 12:28:37 +00:00
James Allen
7637c858c8 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 12:14:18 +00:00
James Allen
4595c90363 Use translations for action in project delete modal 2016-03-22 12:12:11 +00:00
James Allen
aa1f2cc8a9 Remove #s in href on project list buttons 2016-03-22 12:11:59 +00:00
Henry Oswald
c777f498ad Merge branch 'groove2' 2016-03-22 11:58:04 +00:00
James Allen
49bb4f07ea Move delete docs into view in file-tree element 2016-03-22 11:15:52 +00:00
Shane Kilkelly
45077cfba9 Merge branch 'master' into sk-pdf-error-display 2016-03-22 10:56:59 +00:00
Shane Kilkelly
4f3755318f Clean up. 2016-03-22 10:24:58 +00:00
James Allen
f182fbf396 Convert 'anonymous-user' from real-time api in 'null' internally 2016-03-22 09:53:47 +00:00
Shane Kilkelly
59b131f251 First pass at refactoring the output panel views. 2016-03-22 09:39:33 +00:00
James Allen
2af2dd694e Use null to represent anonymous user, as AuthorizationManager expects 2016-03-22 09:39:25 +00:00
James Allen
7791805949 Allow admin access to projects 2016-03-21 17:03:41 +00:00
Henry Oswald
840d3b75bb listen for close not exit when working with unzip command 
sometimes the command will fail because stout has not finished yet
 2016-03-21 16:37:29 +00:00
Henry Oswald
4d7ed1cb17 improved logging from unzip command 2016-03-21 16:00:12 +00:00
Shane Kilkelly
f58f1c3795 Account for the new too-recently-compiled error. 2016-03-21 15:16:17 +00:00
Shane Kilkelly
53dfa841cc Add the beginnings of a clsi-maintenance-mode message 2016-03-21 15:00:25 +00:00
Shane Kilkelly
3b35605edc Show logs, even if the compile timed out. 2016-03-21 14:05:26 +00:00
James Allen
9a0ec9c292 Don't throw fatal error when recently compiled 2016-03-21 13:54:45 +00:00
James Allen
8bfc613bb3 Log client side errors as warns so they don't show in Sentry 2016-03-21 13:29:34 +00:00
James Allen
6beb29f449 Don't treat no root resource as a fatal error 2016-03-21 13:28:53 +00:00
James Allen
8fb3e629e8 Require logins for all uploads to projects 2016-03-21 13:23:14 +00:00
Shane Kilkelly
9b22efbd98 split errors into normal error, and renderingError. 2016-03-21 13:20:03 +00:00
James Allen
0ba70e7ccc Remove missing parameter in log lines 2016-03-21 13:15:57 +00:00
James Allen
2a9e451876 Refine error page to in all situations, and don't send sentry errors on not found errors 2016-03-21 11:55:59 +00:00
Henry Oswald
4e78e34cdf finished contact us with groove 
for settings file:

<a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>
 2016-03-21 11:41:05 +00:00
Shane Kilkelly
a704289099 Show the error view, even when the pdf is in an error state. 2016-03-21 10:26:39 +00:00
James Allen
e7d67668e9 Improve error reporting and show 404 when project ids are malformed 2016-03-18 15:59:12 +00:00
Henry Oswald
882297c353 working framework. not happy with groove. Can't set mailbox 2016-03-18 12:55:35 +00:00
Henry Oswald
209c8ebbfc wip 2016-03-18 11:31:50 +00:00
Shane Kilkelly
f3db114654 Use the mongojs based apis to get Project and User information. 2016-03-18 11:20:33 +00:00
James Allen
de02928454 Merge branch 'master' into ja_email_tokens 2016-03-17 17:01:26 +00:00
Henry Oswald
c980382196 make calls to learn wiki run in parallel, 
only saves about 150ms but ever little helps
 2016-03-17 12:55:28 +00:00
James Allen
60a39f82c1 Fix off by one bug in moving folders from using an out of date project structure 2016-03-15 15:14:54 +00:00
James Allen
75d9912449 Use _.defaults to simplify assigning default features 2016-03-15 14:44:06 +00:00
James Allen
b7d226f434 Make privilege level check in EditorHttpController more explicit 2016-03-15 14:39:27 +00:00
James Allen
261466b042 Convert privilege levels to an enum 2016-03-15 14:35:01 +00:00
James Allen
398d43e2d1 Add missing ? check 2016-03-15 14:15:25 +00:00
James Allen
fe1f71413e Use ProjectGetter, not Project, in ProjectController.loadEditor 2016-03-15 14:12:43 +00:00
James Allen
d09705142e Add in missing error checks 2016-03-15 14:07:34 +00:00
James Allen
5781894453 Do array null check in callback args 2016-03-15 14:05:59 +00:00
Henry Oswald
76b3a78988 added lock around move element 2016-03-15 12:29:41 +00:00
Henry Oswald
d07e084446 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-15 11:34:46 +00:00
Henry Oswald
ba9bc3a2e8 check that element being inserted has an _id 2016-03-15 11:29:59 +00:00
James Allen
b556d57f40 Remove missed console.log debugging lines in AuthenticationController.coffee 2016-03-14 17:11:23 +00:00
James Allen
71ef045728 Implement authorization guards in Authorization{Manager,Controller} 2016-03-14 17:06:57 +00:00
Shane Kilkelly
2d4ced6a1c If user is not project owner, ask them to ask the owner to upgrade. 2016-03-14 16:19:08 +00:00
Henry Oswald
f24bc2c501 log out error when can't send to tpds worker 2016-03-14 14:44:45 +00:00
Henry Oswald
1b39b01114 check err on _putElement for file in project 2016-03-14 14:42:13 +00:00
Henry Oswald
8be55f760f swallow error if tpdsworker can not be comunicated with on addFile 2016-03-14 10:49:28 +00:00
Henry Oswald
3fc357a343 Merge branch 'master' into projectsizelimit 2016-03-14 10:31:07 +00:00
Henry Oswald
086875d50c added logging 2016-03-14 10:08:47 +00:00
Henry Oswald
15c6e49d1a if user changes email then check if they have a site licence 2016-03-13 22:31:14 +00:00
Henry Oswald
8812ff445e change zip size check to spawn 2016-03-12 15:43:16 +00:00
Henry Oswald
f11ba97389 check stat.isFile and isDirectory rather then symlink 2016-03-12 15:05:29 +00:00
Henry Oswald
6664b67fba check size of zip files 2016-03-12 12:38:21 +00:00
Henry Oswald
da242d90e6 added extra isSymLink checks into reading files 2016-03-12 12:01:36 +00:00