Commit graph

2888 commits

Author SHA1 Message Date
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
1aa7d9c6b3 Explicitly set link color according to log entry type. 2016-06-21 10:49:24 +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
d35a48e683 minfiy css as well 2016-06-18 21:49:32 +01:00
Henry Oswald
ec727b70a5 reduced some other images 2016-06-18 19:59:39 +01:00
Henry Oswald
4fc9c9a263 compress to 7 levels and only watch public files 2016-06-18 19:16:45 +01:00
Henry Oswald
b1e4af098d compress images using grunt imagemin 2016-06-18 16:52:38 +01:00
Henry Oswald
1d26be30a9 added grunt imagemin used to compress images 2016-06-18 16:50:56 +01:00
Henry Oswald
fed71ea0bd minify algolia and moment.js 2016-06-18 16:43:10 +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
acdb7f0d5c Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo 2016-06-17 14:55:41 +01:00
Paulo Reis
7316a429c0 Increase maximum brand image height. 2016-06-17 14:55:04 +01:00
Henry Oswald
9cd3698b0e Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo 2016-06-17 14:41:35 +01:00
Paulo Reis
732a0fdca0 Fit brand image into container. 2016-06-17 14:37:39 +01:00
Henry Oswald
8b79587c9b add settings as a value to reference in defaults file 2016-06-17 14:22:20 +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
0906bef5f9 change default bcrypt rounds to 12, to match default in AuthenticationManager 2016-06-17 13:50:32 +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
Paulo Reis
f167aacc08 Add sample rules file. 2016-06-16 15:29:00 +01:00
Brian Gough
5e30310aae restore popupDownloads=true for pdf downloads 2016-06-16 15:20:57 +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
02e3f7a02b change download links so they do not rely on build id
prefer the top level files, because the build directories are more
ephemeral.  In a shared project they can expire if there are multiple
compiles.
2016-06-16 14:05:21 +01:00
Brian Gough
f045eb65d3 add query string utility function 2016-06-16 14:03:42 +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
Paulo Reis
c54f3dae20 Create human readable logs module on top of LatexLogParser; use it in the PDF controller. 2016-06-16 11:14:45 +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
e28e959941 Quick fix require statements. 2016-06-15 13:46:40 +01:00
Paulo Reis
73d16b5c9c Merge branch 'recompile_tooltip' 2016-06-15 13:42:51 +01:00
Henry Oswald
46374f39ff Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-15 12:08:16 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +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
d6964feb2f Revert "enable per-user containers by default"
This reverts commit e80b8cd907605d9a7aad16496d49efff4bb08810.
2016-06-14 16:30:06 +01:00
Brian Gough
d0a273fac1 Merge pull request #257 from sharelatex/fix-synctex-position-calculation
Fix synctex position calculation
2016-06-14 15:07:48 +01:00
Brian Gough
77de4dd432 Merge pull request #258 from sharelatex/enable-per-user-container
enable per-user containers by default
2016-06-14 15:07:37 +01:00
Brian Gough
ed6c384b68 fix urls of downloaded files to those provided by clsi 2016-06-14 14:51:33 +01:00
Brian Gough
ecd9bed1c2 enable per-user containers by default 2016-06-14 14:21:56 +01:00
Brian Gough
991d3c7aa1 avoid exception when switching between full and split pdf view 2016-06-14 12:49:06 +01:00
Brian Gough
2840a7757f fix bug in synctex position calculation for syncToCode 2016-06-14 12:32:54 +01:00
Brian Gough
830d15136d fix missing variables in pdf sync 2016-06-14 08:49:08 +01:00
Paulo Reis
c815ba6ed2 Added Paulo Reis photo for the about page. 2016-06-13 15:34:16 +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
3c31988e9a enable on-demand viewing of pdfs for per-user compiles 2016-06-10 16:06:02 +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
42f2b262c2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:41:38 +01:00
Henry Oswald
895af7c07a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-08 15:36:20 +01:00
Henry Oswald
ed17bd026d added delete user script in grunt 2016-06-08 15:36:08 +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
8c9d15a3e4 Tweak style of the beta-feature-badge class. 2016-06-07 13:42:27 +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
a297c07bbb added null check into response.outputFiles? 2016-06-06 14:56:34 +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
55a8e3cffe extend tests for per-user compiles 2016-06-02 15:48:13 +01:00
Brian Gough
ce1524cd07 remove unnecessary build id in query string
this is now in the url
2016-06-02 15:48:13 +01:00
Brian Gough
272625fbcc add per-user compilation in client
enabled only when query string includes isolated=true
2016-06-02 15:48:13 +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
8529cb50b6 rolled back underscore and added lodash in 2016-06-02 13:18:07 +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
Henry Oswald
66ad587c9c bump underscore to 1.8.3 2016-06-01 16:46:11 +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
daf8f6f3cf Refresh the page if the user is not logged in when joining a project 2016-05-31 11:47:48 +01:00
James Allen
345d38c28d Don't clean up a documents event listener until after the socket has disconnected on error 2016-05-27 14:39:33 +01:00
James Allen
36c8c197e1 Add more debug log lines 2016-05-27 14:14:08 +01:00
James Allen
fec3266726 Don't remove new instance of Document from openDocs when cleaning up old instance 2016-05-27 14:13:53 +01:00
James Allen
a605dae7ba Don't show saving just because of pending ops
When typing continuously, there is always a pending op present.
The only time we're not saving is if the inflight op isn't changing.
So long as this has changed, it means the previous one has been processed.
2016-05-27 14:08:46 +01:00
James Allen
4bc31ae2b9 Don't throw an error if we get an ack for our update more than once, since we may try sending it more than once 2016-05-27 10:46:14 +01:00
James Allen
6ea58d4d6c Don't try to resend an update if the editor is not joined to the project 2016-05-27 10:46:14 +01:00
James Allen
39e57a9886 Throw fatal error if document update actually returns an error from the real-time service 2016-05-27 10:46:14 +01:00
James Allen
0175a86d4c Add in debugging console.logs which only display if ?debug=true is in URL 2016-05-27 10:46:14 +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
f937f0bc5c Remove missed debugging console.log 2016-05-25 10:38:40 +01:00
James Allen
a196531a58 Move spinner add logic into same code pathway as spinner remove logic 2016-05-24 15:13:08 +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
3452a9870e Show logs when compile fails correctly 2016-05-24 15:10:55 +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
Brian Gough
eaa41e4361 support displaying output files using .url parameter from clsi 2016-05-20 11:34:22 +01:00
Shane Kilkelly
939c7a8c72 Force reload BinaryFile view when a new object is selected. 2016-05-20 11:20:00 +01:00
Shane Kilkelly
2e2354c574 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-05-20 09:17:35 +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
Henry Oswald
f03a076669 make cash bust add onto object not recreate it 2016-05-19 16:23:56 +01:00
Brian Gough
5497eb86d1 Merge pull request #245 from sharelatex/clean-up-log-requests-in-pdf-controller
clean up log requests, avoid requesting blg file when not present
2016-05-19 16:13:21 +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
036b179ffe put the clsiserverid onto qs object for correct server allocation 2016-05-19 13:28:20 +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
199844db2d Fix styling of the bib-loading div. 2016-05-19 10:02:46 +01:00
Shane Kilkelly
3c298ed6ad Preview up to Two Megabytes of bib files 2016-05-19 10:02:25 +01:00
Shane Kilkelly
5df5ba868c Fix logic for showing error or loading message. 2016-05-19 10:02:07 +01:00
Shane Kilkelly
4509642914 use highlight colour for any font-awesome icons in file-tree. 2016-05-18 16:34:50 +01:00
Brian Gough
6305cea3e3 clean up log requests, avoid requesting blg file when not present 2016-05-18 16:17:38 +01:00
Shane Kilkelly
10f64004fc Show a book icon for *.bib files. 2016-05-18 15:58:24 +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
d2cc75b73f changed $scope.pdf.clsiServerId to ide.clsiServerId 2016-05-18 14:38:17 +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
78e52d8c96 Update FileStoreHandlerTests 2016-05-18 09:58:57 +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
Shane Kilkelly
af78e893f9 Merge branch 'sk-file-based-ref-import' 2016-05-17 11:48:01 +01:00
Shane Kilkelly
30a778c8e8 add temp module 2016-05-13 13:30:00 +01:00
Brian Gough
40464fe5b5 Merge pull request #244 from sharelatex/add-fast-path-to-pdf
Add fast path to pdf
2016-05-13 13:25:49 +01:00
Brian Gough
ac7aa5f936 request output files using /project/project_id/build/build_id/output/* route
avoids using query string for build_id
2016-05-13 11:48:58 +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
Shane Kilkelly
ae85dc3f5d Enable spaces after commas in references autocomplete 2016-05-12 15:13:00 +01:00
Shane Kilkelly
9eb2e933cd enable autocomplete on citations like citeauthor 2016-05-12 12:03:08 +01:00
Shane Kilkelly
60cc1bfbff Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-05-12 11:02:54 +01:00
Shane Kilkelly
41a6fa1480 Fix uncompiled pdf view 2016-05-12 11:02:24 +01:00
Brian Gough
ab0bcd4f57 increase default pdfjs chunk size from 64K to 128K 2016-05-10 15:53:37 +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
a1552aa872 reset the 'failedLoad' state when a new entity is selected 2016-05-04 10:08:48 +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
Henry Oswald
9db647491a added different ldap config example 2016-04-28 17:21:07 +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
ce34ce6865 Merge branch 'master' into sk-tpr 2016-04-19 13:56:54 +01:00
Shane Kilkelly
d54515a9a7 add a featureToggle property to ide. 2016-04-19 11:53:27 +01:00
Caleb Cooper
145b201087 Put brackets around the example ca path for ldap starttls support in the default config. This resolves an issue where the system was breaking the path into an array and trying to act on the first item in that array, "/", rather than the full path. 2016-04-15 13:46:11 -04: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
Shane Kilkelly
749d2aa013 Merge branch 'sk-safari-freeze-fix' 2016-04-11 14:47:03 +01:00
Shane Kilkelly
76697599ae Use the _ide version of browserIsSafari 2016-04-11 14:45:26 +01:00
Shane Kilkelly
e3b2ec9977 Add a ide.browserIsSafari boolean flag. 2016-04-11 14:35:59 +01:00
Shane Kilkelly
8d6003dcc5 Add commentary 2016-04-11 09:58:37 +01:00
Shane Kilkelly
4fd4a0372c In Safari, limit iterations of the command-parsing loop. 2016-04-11 09:55:53 +01:00
Henry Oswald
010bb61baf add michael pic 2016-04-11 08:26:06 +01:00
Henrique Dias
ae79ce75b7 Update settings.defaults.coffee 2016-04-06 11:32:08 -03:00
Henrique Dias
38c8eb868a Update package.json 2016-04-06 11:30:26 -03:00
Henry Oswald
424e09ec05 getGroupSubscriptionMemberOf gets plan code 2016-04-05 16:03:46 +01:00
Henry Oswald
bd54218cc9 added grunt as depenency 2016-04-05 14:17:36 +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
Shane Kilkelly
059d3432c2 Allow citations like -parencite[page 6]{ to work. 2016-03-30 11:28:56 +01:00
Henry Oswald
c7da9f1eef added different check to contact-us modal 2016-03-29 14:25:59 +01:00
Henry Oswald
1a651b38f4 added sendgrid as email option 2016-03-29 14:15:33 +01:00
Henry Oswald
e2dffdf722 when user contact us put project url at bottom of message 2016-03-24 14:23:18 +00: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
63c183402c Style active and focus states of search results too 2016-03-24 11:42:48 +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
6a4e13d3c8 added templates angular file forgoten in last commit 2016-03-24 09:35:11 +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
a95c941cb9 Fix FileStore unit tests 2016-03-23 15:13:32 +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
de0aa1035d pulled tempaltes search into its own file 2016-03-22 22:29:18 +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
Shane Kilkelly
62ececeef8 show logs on failure. 2016-03-22 16:59:40 +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
2c321a4803 If the compile request errors out, set view to 'errors'. 2016-03-22 15:51:05 +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
12b0e982c8 Don't raise an error if output.blg cannot be found. 2016-03-22 14:42:00 +00:00
Shane Kilkelly
d566ce3fd2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 14:38:56 +00:00
Shane Kilkelly
d5c280dc4d Show the pdf if it was already loaded.
This ensures the pdf will be visible if the user switches to fullscreen-view.
2016-03-22 14:38:48 +00:00
Henry Oswald
a89edde139 subscription tests fixed 2016-03-22 14:27:05 +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
Henry Oswald
fbfd160c6d default message to empty string 2016-03-22 14:02:15 +00:00
Shane Kilkelly
b8c3b427ee Merge branch 'sk-pdf-error-display' 2016-03-22 14:00:12 +00:00
Shane Kilkelly
2dd9aa9424 Merge branch 'sk-environment-autocomplete' 2016-03-22 13:55:41 +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
723031f7f3 un-show logs on successful run. 2016-03-22 10:32:55 +00:00
Shane Kilkelly
293cb3c73e fix typo 2016-03-22 10:32:44 +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
James Allen
88b8ce1f80 Enable working settings acceptance tests 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
Shane Kilkelly
35b5d3cc05 Update ReferencesHandlerTests. 2016-03-18 11:43:39 +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
Shane Kilkelly
11d77df898 Fix weird tab behaviour 2016-03-17 16:18:46 +00:00
Shane Kilkelly
020fd2e88d De-dupe autocomplete entries 2016-03-17 15:58:57 +00:00
Shane Kilkelly
53b46e42cd Refactor, take indentation into account. 2016-03-17 15:27:20 +00:00
Shane Kilkelly
229ced6f2f Remove Indentation. 2016-03-17 14:43:34 +00:00
Shane Kilkelly
95a6e1900e Add autocomplete entries for the end{} commands 2016-03-17 14:09:45 +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
Shane Kilkelly
d655e99439 Parse existing begin commands too. 2016-03-17 12:07:21 +00:00
Shane Kilkelly
eebd25351d Add the custom environments to the list of snippets 2016-03-17 11:23:53 +00:00
Shane Kilkelly
c25c2b676a Parse \newenvironment{} commands. 2016-03-17 11:14:05 +00:00
Shane Kilkelly
115734f82e Rename Snippets -> SnippetManager 2016-03-17 10:04:14 +00:00
Shane Kilkelly
7cc3f7613e Move the getCompletions call for Snippets into the Snippets module. 2016-03-17 10:00:07 +00:00
Shane Kilkelly
2985a0b0b2 Account for later commands on the same line. 2016-03-16 11:42:30 +00:00
Shane Kilkelly
027c82ed6b Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-15 16:02:54 +00:00
Shane Kilkelly
cff00c09b0 Add a '}' at the end of citation autocomplete if required. 2016-03-15 16:02:48 +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
724e6b5263 Require explicit value of true for ENV variables in config 2016-03-15 14:14:33 +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
88f8b701c8 Merge branch 'fschecks' 2016-03-13 15:52:13 +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
Henry Oswald
7e216391b7 wip 2016-03-12 10:55:17 +00:00
Shane Kilkelly
3ba5808074 Merge branch 'master' into sk-biber-errors 2016-03-11 13:54:06 +00:00
Shane Kilkelly
c4d49f6cf9 Update parser 2016-03-11 13:53:39 +00:00
Shane Kilkelly
5b9fa6d7d6 Upgrade parser. 2016-03-11 11:20:24 +00:00
James Allen
1bd8b8d1a3 Delete SecurityManager and replace with (unwritten) AuthorizationManager 2016-03-10 17:17:26 +00:00
James Allen
3e03164ed4 Remove dead auth_token code 2016-03-10 17:15:14 +00:00
Henry Oswald
36966f0c9b wip 2016-03-10 17:11:28 +00:00
Shane Kilkelly
170d3f646b Upgrade parser. 2016-03-10 16:01:54 +00:00
Henry Oswald
347bfe4a79 use cb for internal callbacks 2016-03-10 12:43:36 +00:00
Henry Oswald
3c4e74af4b project duplicator works and tests pass.
not so bad now.
2016-03-10 12:42:21 +00:00
Henry Oswald
d801ab623a project duplicator works, tests don't 2016-03-10 11:58:05 +00:00
James Allen
e36be96ec9 Move public access setting to its own end point 2016-03-10 11:13:57 +00:00