Henry Oswald
65859468de
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-12 09:21:48 +00:00
Henry Oswald
216c9cefe3
don't error on subscription dashboard page if there is no subscription.taxRate
2015-02-12 09:21:45 +00:00
James Allen
50048a53b5
Don't throw an exception if there is an error with unzip
2015-02-11 11:34:49 +00:00
James Allen
e4b77a2563
Merge branch 'dropbox-module'
2015-02-10 11:38:32 +00:00
James Allen
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +00:00
Henry Oswald
7030d5f822
change plan shows price including tax
2015-02-06 16:19:52 +00:00
Henry Oswald
86f963a7ec
recurly tax updates
...
- get all accounts does get all of them by looping through all pages
- creating coupons requires which plan the coupon is for
- fixed the total price shown to people so it includes tax
2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2
Remove Dropbox front end logic from main sharelatex repo
2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
5a922e2356
Include email address explicitly in welcome email to avoid any confusion
2015-02-05 12:52:50 +00:00
James Allen
366a0403a6
Clear rate limit in smoke tests
2015-02-05 10:18:18 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
Henry Oswald
7fdb8009a0
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-04 20:20:16 +00:00
Henry Oswald
e4a54cbdfc
added recurly subscription null checks
...
this deals with a user who has an expired old subscription then
is added to a group subscription.
2015-02-04 20:17:55 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +00:00
James Allen
2aa229d145
Add in profiling end point
2015-02-03 11:05:23 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
0a64c1c8ac
on register try and auto allocate a group licence if one exists
2015-01-27 18:22:51 +00:00
Henry Oswald
3360b3c35a
added basic domain allocation feature
2015-01-27 18:09:56 +00:00
Brian Gough
58750140f4
enable new pdf viewer by default for newly created users
2015-01-21 15:26:01 +00:00
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
17fe30ca0f
sanitise the ref for universities site. and remove unneeded sanitise
2015-01-19 10:49:40 +00:00
Henry Oswald
4bcc9fb5c9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-07 16:51:15 +00:00
Henry Oswald
7ec0264fe2
added missing currency symbols to subscription formatter
2015-01-07 16:51:05 +00:00
James Allen
923fbfc574
Correctly handle quote characters in template name when downloading
2015-01-07 13:16:38 +00:00
Henry Oswald
f9843b3709
tax auto updates on change of address now. Is also preset based on users ip address
2015-01-07 13:16:19 +00:00
Henry Oswald
aaaf28f916
added some helper methods into recurly wrapper which can be used by
...
our one time scripts
2015-01-07 12:02:07 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +00:00
Henry Oswald
baa0a42825
coupon field is shown if query string scf is shown
2014-12-28 17:51:36 +00:00
Henry Oswald
a7eb836c79
redirect to /thank-you on success and fix broken unit test from a few commits ago
2014-12-22 16:37:09 +00:00
Henry Oswald
5305cbfd3e
got more correct details making it to recurly and improved form.
2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b
can add account just about into recurly
2014-12-18 18:59:29 +00:00
James Allen
2a2dc458e8
Merge pull request #127 from sharelatex/pdfng-server-fixes
...
pdfng server fixes
2014-12-16 10:30:22 +00:00
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
660bb75df4
add query string parameters for compileGroup= and pdfng=
...
compileGroup will bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
2014-12-12 16:47:43 +00:00
James Allen
b260287965
Merge pull request #125 from sharelatex/clientside-error-logging
...
Clientside error logging
2014-12-12 15:54:23 +00:00
Brian Gough
fbf9111d80
Revert "revert to original CLSI proxy call"
...
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
2014-12-12 15:43:36 +00:00
Brian Gough
419d84564c
add support for client-side error logging using sentry
2014-12-12 13:58:07 +00:00
Henry Oswald
0561adde4b
added more logging
2014-12-12 12:21:14 +00:00
Henry Oswald
bd77d0e020
add null check in on project
2014-12-12 10:27:14 +00:00
Henry Oswald
5c7d77a853
added logging around docstore setting
2014-12-11 16:22:00 +00:00
Brian Gough
8a77d619a8
revert to original CLSI proxy call
...
due to problems with cost of authentication when byte-serving
2014-12-11 13:15:13 +00:00
Brian Gough
265ad4439c
Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng
2014-12-05 14:43:01 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
Brian Gough
138170be60
pass headers through when proxying request to allow for byte-range/etag handling
2014-12-02 14:53:46 +00:00
Brian Gough
ce8b5dd11c
generate fingerprints for the new pdf.js files
2014-12-01 16:48:40 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Brian Gough
175de30967
Merge branch 'master' into pdfng
2014-12-01 10:09:04 +00:00
Henry Oswald
a570d05132
fixed bug with setting root doc which would fail if the document class isn't on the top line
2014-12-01 01:07:03 +00:00
Brian Gough
57b09e1d60
started making pdf viewer conditional - work in progress
2014-11-28 16:59:39 +00:00
James Allen
175dfae085
Look up compile group and features from project owner, not current user
2014-11-28 14:26:21 +00:00
Henry Oswald
20a5ad6e27
fixed where project to large code is passed from
2014-11-27 16:22:39 +00:00
Henry Oswald
fa755c6521
added project to long check from clsi2 (bit of a punt)
2014-11-27 15:42:37 +00:00
Henry Oswald
0bc76b6d92
mkdir p changed so it does not get entire project, now without doc lines
2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508
Revert "added lock to update merger"
...
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5
added lock to update merger
2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425
change async to series
...
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0
modfied setRootDocAutomatically to work async
...
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Henry Oswald
857d867191
added locks into editor controller for new/move/deletes
...
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Henry Oswald
bd841b4795
coppied the lock manager over from doc updater
2014-11-25 16:52:27 +00:00
Henry Oswald
3bae278c92
Revert "increased timeout for geoip to 3 seconds"
...
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369
increased timeout for geoip to 3 seconds
2014-11-25 11:51:03 +00:00
Henry Oswald
dbecadcaea
Merge branch 'master' into multicurrency
2014-11-25 11:35:59 +00:00
Henry Oswald
6c0f03e9c7
added ab test to show collar plan to people in editor
2014-11-24 16:21:03 +00:00
James Allen
b8fdbdb406
Handle errors in request pipes
2014-11-24 13:58:41 +00:00
James Allen
970125b7a8
Check for null project in joinProject
2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c
Add null check into FileTypeManager isDirectory check
2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d
Wrap smoke test in domain to catch errors
2014-11-24 13:36:10 +00:00
Henry Oswald
a52b91691a
Merge branch 'master' into multicurrency
2014-11-21 13:16:29 +00:00
Henry Oswald
6d22bda88f
added new currencies removed ab test as well
2014-11-21 13:13:53 +00:00
Henry Oswald
6c746d9aec
added redis health check in
2014-11-19 23:18:20 +00:00
Henry Oswald
cd8c233c05
Revert robust redis connection code
2014-11-19 15:06:05 +00:00
James Allen
8b9a26d6f3
Add in http health check end points for redis subscription channels
2014-11-19 14:12:37 +00:00
James Allen
d6532c63f8
Use new robust subscription model
2014-11-19 11:09:42 +00:00
Henry Oswald
804bc16bc8
redirect users to /register when coming from templates or share url
...
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald
f5d3801bfb
changed findElementByPath to not call cb more than once & deal with nulls
2014-11-11 14:44:44 +00:00
Henry Oswald
ae897cb41d
try catch encodeURIComponent
2014-11-10 16:30:02 +00:00
Henry Oswald
c920874872
added null check to compile features
2014-11-10 11:26:40 +00:00
Henry Oswald
29ae816432
added next into controller for error
2014-11-10 11:23:07 +00:00
Henry Oswald
e077108993
null check user in logging
2014-11-10 11:21:59 +00:00
Henry Oswald
e9232eb197
try catch converting id to object id
2014-11-09 23:08:23 +00:00
James Allen
84c08edcf3
Factor out common joinProject logic to provide and HTTP end point for the real-time API
2014-11-07 12:31:47 +00:00
James Allen
218f5fedf8
Fix broken template creation route
2014-11-07 11:21:55 +00:00
James Allen
9c5ae5adf4
Remove unused old update method
2014-11-07 09:39:17 +00:00
James Allen
d27af25bc9
Convert template publishing to use HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef
Access Dropbox status via HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
e596b60af0
Move collaborator HTTP end points into the Collaborators feature
2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88
Add and remove collaborators with HTTP requests, not websockets
2014-11-06 14:39:40 +00:00
James Allen
94a17bd36d
Remove unused socket.io endpoints
2014-11-06 14:39:40 +00:00
Henry Oswald
b9dd2d826e
added null check on subscription for group plans
2014-11-04 10:53:03 +00:00
Henry Oswald
16e93b6f1b
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-11-03 12:07:53 +00:00
Henry Oswald
edf715919d
send user to 404 if templates returns 404
2014-11-03 11:48:56 +00:00
Henry Oswald
4c7293f8c2
remove lang from page title in wiki article
2014-11-03 11:48:43 +00:00
James Allen
528ff743e8
Remove github feature flat
2014-11-03 10:55:35 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4
wiki will try and get spanish version of page then fall back to english if it is not there
2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050
added file ref null check
2014-10-31 10:50:20 +00:00
Henry Oswald
0f4d9771aa
added null check to where we insert elements into a project
2014-10-31 10:37:44 +00:00
Henry Oswald
d428e7e5b4
handle a null in the file refs list
...
this seems to happen now and then when there is networking issues
2014-10-31 10:34:21 +00:00
Henry Oswald
56efefd6d4
renamed variable
2014-10-30 08:33:18 +00:00
James Allen
ca664e0063
Get subscription status correctly for showing upgrade/bonus link
2014-10-27 15:00:46 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00:00
Henry Oswald
011bdc4617
explicitly set the file types to delete
...
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
Henry Oswald
0a123418ac
insert ref data into uni page
2014-10-23 14:13:40 +01:00
Henry Oswald
8097e6ad71
made 7 day free trial the default
2014-10-21 13:48:46 +01:00
Henry Oswald
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
9be31a2ac1
removed type: from log lines
2014-10-20 14:24:39 +01:00
Henry Oswald
3cf64ce34f
pass new compile features to client side, don't show timeout upgrade for premium users
2014-10-20 12:21:40 +01:00
Henry Oswald
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b
added default opts for users compile features
2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
James Allen
8fa8a64c6f
Update email templates
2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396
Send source of update to doc updater and allow external updates to be ignored in UI
2014-10-16 11:27:10 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-15 14:11:11 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
af769c7871
allow ip to set via query string for plans page
2014-10-15 11:58:35 +01:00
James Allen
b32375530c
Refactor card css for use in new subscription page
2014-10-14 15:46:44 +01:00
Henry Oswald
b2b13ef9a7
pass plan to payment page to get the number of collaborators
2014-10-14 12:14:24 +01:00
Henry Oswald
19a08f82a6
default to USD if there is no match
2014-10-14 12:14:03 +01:00
Henry Oswald
4a774981cf
Merge branch 'master' into multicurrency
2014-10-14 11:52:03 +01:00
Henry Oswald
2538d16e63
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-14 11:50:10 +01:00
Henry Oswald
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
2bf34bba4d
added currency to subscription view model
2014-10-13 16:14:13 +01:00
James Allen
3c058edfb4
Add github feature flag to user model
2014-10-13 15:45:19 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
James Allen
5edefe2498
Add in compile timeout and group feature options
2014-10-13 15:42:11 +01:00
Henry Oswald
36264706f6
hooked the plans page up to the geo ip lookup
2014-10-13 14:10:15 +01:00
Henry Oswald
3ca04e25fd
add 1 second timeout to geoiplookup
...
response times generally seem to be around 0.05s from our servers
2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926
default to USD in geo ip lookup.
...
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0
use first ip passed though in string for ip lookup
2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd
added geoip lookup feature
2014-10-13 00:45:45 +01:00
Henry Oswald
40c3c3e1ce
added customAccount to subscription model
2014-10-10 15:57:27 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043
if its a custom account redirect to /user/subscription/custom_account
2014-10-10 15:11:22 +01:00
Henry Oswald
e5ab40c911
added example session invalidation code
2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7
unlink dropbox when a user cancels
2014-10-09 17:05:41 +01:00
Henry Oswald
9924882b59
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-09 16:45:26 +01:00
James Allen
4743b460f5
Only show rename or deleted message once
2014-10-09 09:13:38 +01:00
James Allen
accd8207b2
Show password reset expired message rather than server error if that's what has happened
2014-10-08 17:18:24 +01:00
Henry Oswald
c2c29bb282
university site renders via prozy ok
2014-10-08 16:07:44 +01:00
James Allen
82dc3cf654
Don't reload module views each request by default
2014-10-08 12:39:36 +01:00
James Allen
128c672edd
Merge branch 'github-sync'
...
Conflicts:
package.json
2014-10-08 12:13:37 +01:00
James Allen
dbd85a05f1
Send user features and features switches to views where needed
2014-10-07 13:31:13 +01:00
Henry Oswald
8789a4bde1
server rejects rename of entitys over 150 chars
2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b
server rejects project names over 150 chars
2014-10-07 11:14:02 +01:00
James Allen
6c7c09075c
Treat paths properly in project content update methods
2014-10-03 11:33:18 +01:00
James Allen
10732d112d
Hook module system into project list page
2014-10-03 11:32:59 +01:00
James Allen
13a96c925b
Add in endpoints to allow updating project files when the project id is know
2014-10-02 14:15:30 +01:00
Henry Oswald
81307324fc
v2, seems to work...
2014-09-26 17:04:33 +01:00
Henry Oswald
f73629f8d9
v1 of sentinal support
2014-09-26 14:52:00 +01:00
Henry Oswald
2376d0a188
added generic error logging
2014-09-18 14:37:23 +01:00
Henry Oswald
9c98e95ca4
send cancelation email after 1 hour
2014-09-16 14:25:12 +01:00
Henry Oswald
6efda9cf1c
push currency default to seperate var
2014-09-11 11:45:00 +01:00
Henry Oswald
20f0c648e5
default to USD
2014-09-11 11:35:39 +01:00
Henry Oswald
1b02dc72a3
destroy session on dropbox webhook
2014-09-10 14:19:44 +01:00
Henry Oswald
c08a568664
removed session logging
2014-09-10 10:09:25 +01:00
Henry Oswald
d961b48857
imporved logging for session debug
2014-09-10 08:20:36 +01:00
Henry Oswald
ca402a3061
added some logging in for sessions
2014-09-08 17:45:37 +01:00
James Allen
db9632f8f2
Allow modules to inject parts of views
2014-09-08 15:40:46 +01:00
James Allen
374c0f3d65
Add existence check for modules dir
2014-09-08 14:23:47 +01:00
James Allen
becb294c5c
Create basic module loading system
2014-09-08 14:19:24 +01:00
Henry Oswald
93b4c5f4f8
thank you page displays the correct currency
2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243
added currency to signiture
2014-09-08 10:36:30 +01:00
Henry Oswald
eeb27062a0
added currency query string param to subscribe button
2014-09-05 11:40:14 +01:00
Henry Oswald
8762297158
touch the session rather than setting the expires, same result
2014-09-04 18:07:31 +01:00
James Allen
971afb7342
Treat large text files as binary
2014-09-04 13:00:51 +01:00
Henry Oswald
e740e4913d
if user is already annual tell them so on the annual upgrade page
2014-08-29 14:13:05 +01:00
Henry Oswald
350b95a0a5
annual upgrade page works, needs a bit of copy love now
2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c
added confirm you want to change plan modal
...
added page and corisponding endpoint to migrate to annual plan
2014-08-27 17:51:10 +01:00
Henry Oswald
27b9cad8ca
make ga experiements per page
2014-08-24 17:07:40 +01:00
James Allen
894024ba29
Don't allow folders to be moved into their child folders
2014-08-22 14:38:52 +01:00
Henry Oswald
c91e95d593
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-22 14:22:12 +01:00
Henry Oswald
6c131b1084
- removed free trial on annual accounts
...
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
2014-08-22 14:20:39 +01:00
James Allen
c8ab1bd394
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-08-22 12:52:31 +01:00
James Allen
dc5e1f71bd
Remove console.log debug line
2014-08-22 12:52:27 +01:00
James Allen
456d194dbb
Merge branch 'james_tmp'
2014-08-22 12:51:35 +01:00
Henry Oswald
fd8221b869
make it possible to hide a lng
2014-08-21 17:58:25 +01:00
Henry Oswald
4a19d6731a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-21 13:03:54 +01:00
Henry Oswald
9bcf979e8a
changed title for restricted to use translations key
2014-08-21 13:03:51 +01:00
Henry Oswald
b9372e6dcd
added key for your projects
2014-08-21 13:02:28 +01:00
James Allen
f093c99b96
Remove deprecated background dropbox polling logic
2014-08-21 13:01:27 +01:00
Henry Oswald
04e50f8ba6
changed cookie name from hard coded to be config option, defaults to sharelatex.sid
2014-08-20 18:01:21 +01:00
James Allen
d0eee7a1e5
Refactor template settings
2014-08-20 14:47:27 +01:00
Henry Oswald
ca5b1e7422
cleaned up smoke tests
2014-08-19 14:35:20 +01:00
Henry Oswald
83d8c48dc6
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-19 11:20:06 +01:00
Henry Oswald
523694c4ff
changed smoke tests to work with curl
...
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com
https://github.com/goinstant/tough-cookie/issues/16
moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set
jar._jar.rejectPublicSuffixes = false
2014-08-19 11:17:51 +01:00
Henrique Dias
e0e9949da5
dynamic template menu by config settings
2014-08-18 14:26:47 -03:00