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

1853 commits

Author SHA1 Message Date
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