Henry Oswald
1ddf95e746
accesabble != accessible
2015-11-24 16:53:44 +00:00
Henry Oswald
8ca962b734
added missing convert handler
2015-11-24 14:17:40 +00:00
Marc Egea i Sala
0390f80aaa
Merge pull request #5 from overleaf/file-not-in-the-current-commit
...
Try to download file if it's not in the git tree
2015-11-24 13:22:46 +00:00
John Lees-Miller
318e11deeb
mock the persistent store with jmock
2015-11-24 12:06:43 +00:00
John Lees-Miller
e2574ab163
fix whitespace
2015-11-24 12:06:05 +00:00
John Lees-Miller
62749a0dab
update to IDEA 15
2015-11-24 12:05:54 +00:00
John Lees-Miller
624c3e6af1
update to junit 4.12 to get jmock working
...
Also moved junit to the test scope.
2015-11-24 12:05:24 +00:00
Henry Oswald
4f3b01ed43
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-23 17:11:06 +00:00
Henry Oswald
89b2cd8477
added secure banner to both payment forms
2015-11-23 17:10:53 +00:00
Marc Egea i Sala
937d9c82b4
Update local version after processing snapshots
2015-11-23 16:24:22 +00:00
Henry Oswald
61182451f1
removed SubscriptionDomainHandler from user controller
2015-11-23 15:12:30 +00:00
Henry Oswald
333c1be68f
added dropbox and github promo on left hand side
2015-11-23 15:12:17 +00:00
Marc Egea i Sala
6a25132f0c
InteliJ IDEA project library files
2015-11-23 12:30:46 +00:00
Marc Egea i Sala
229ed1c09d
Try to download file if it's not in the git tree
2015-11-23 09:36:24 +00:00
Xavier Trochu
3b6270236c
Replace indentation from 2 space to tabs.
2015-11-20 14:38:23 +01:00
Xavier Trochu
b6486cb825
Cleanup the dependencies
2015-11-20 14:05:54 +01:00
Xavier Trochu
0219900933
Forward the options argument to getFileStream
2015-11-20 12:07:04 +01:00
Xavier Trochu
bfd41fdaf9
Add aws-sdk unit test.
...
Fix Aws-Sdk persistor to return a correct error on file not found.
Fix FileHandler after some change were lost on a previous merge
2015-11-20 12:02:22 +01:00
Henry Oswald
0e20cb36fd
Merge pull request #2 from EDP-Sciences/master
...
Remove the internal metrics module.
2015-11-19 16:32:14 +00:00
Xavier Trochu
0323787a64
Remove the internal metrics module.
...
The internal metrics module is unneeded as metrics-sharelatex does the
same function.
2015-11-19 17:00:12 +01:00
James Allen
dea97bb9dc
Fix bad connection debugging parameters
2015-11-19 13:15:51 +00:00
James Allen
442ae638de
Revert "Report unsaved changes after 60 seconds"
...
This reverts commit 44a7e598f2fdbd91d18cc340de477ca3d33a1338.
2015-11-19 12:04:35 +00:00
James Allen
99bca31766
Error and hard refresh document after 30 seconds unsaved changes
2015-11-19 12:04:12 +00:00
James Allen
bf452bf306
Keep the connection.id up to date with socket.io client id
...
The meta.source of an update is populated on the server side so
we need to keep our local connection id up to date with it. When a duplicate
op is submitted we must send all possible client ids that it could have
been sent with.
2015-11-19 12:04:12 +00:00
James Allen
cde5144c42
Retry updates that have not been acknowledged.
...
If we do not get a reply from the server acknowledging our update after 5 seconds,
send it again. If it never got to the server, this is like normal. If the update
got to the server, but we never received the ack then we need to rely on ShareJs's
duplicate handling. We set the dupIfSource parameter on any retried updates which
let ShareJs know that it's a dup if we already have an op with this version number
and client id. The doc-updater and real-time services need changes to correctly
send another ack only to the submitting client in the case of a duplicate update.
2015-11-19 12:04:12 +00:00
Henry Oswald
6eb9b095bd
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-19 11:52:19 +00:00
Henry Oswald
dc066dfbdb
added adminDN and adminPW fields to ldap settings
2015-11-19 11:52:11 +00:00
Henry Oswald
b3bdbb3fb7
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-19 11:51:53 +00:00
James Allen
503b766dcc
For duplicate ops only send ack to submitting client
...
When a duplicate op is received, we only need to ack it to client
that sent it. Only that client is having trouble, and all other clients
will already have received it.
2015-11-19 10:58:28 +00:00
James Allen
2589e2d417
Gracefully return when an op has already been submitted
...
It is not a fatal error if an op has already been submitted. We just
need to send an ack back to the client that submitted it and continue.
If we detect a duplicate op, set dup: true on the op and pass it back
to real-time for distributing. The dup: true flag will ensure it only
gets acknowledged to the submitting client, not everyone.
2015-11-19 10:54:28 +00:00
Marc Egea i Sala
dcaf2d0fa6
Merge pull request #4 from overleaf/handle-401
...
Handle 401 errors as ptorected projects
2015-11-19 10:52:53 +00:00
Marc Egea i Sala
18bb534f96
Handle 401 errors as ptorected projects
2015-11-19 10:40:07 +00:00
James Allen
2476c1e868
Report unsaved changes after 60 seconds
2015-11-18 15:23:23 +00:00
Henry Oswald
003cdc01fc
consolidated 2 options in payment left menu
2015-11-18 15:21:48 +00:00
Henry Oswald
f40e984e10
Updated ldap settings to make them clearer
2015-11-17 16:27:29 +00:00
Henry Oswald
3836142cee
don't create 2 sessions in sixpack
2015-11-17 16:16:37 +00:00
Henry Oswald
5a9174b1de
use user_id for client side six pack. also change name of editor free trial test
2015-11-17 15:54:59 +00:00
Henry Oswald
76be671e26
fix the popup alert when starting a new trial
2015-11-17 14:56:03 +00:00
Henry Oswald
b1c0dfb0e4
show discount rate on pricing page
2015-11-17 12:23:27 +00:00
Xavier Trochu
476db58c3f
Add the opts parameter to getFileStream and implement Range requests
2015-11-17 12:52:25 +01:00
Henry Oswald
631e84f5d6
copy coupon code over when switching to student
2015-11-17 11:47:28 +00:00
Henry Oswald
264839e27d
don't show tax or subtotal if there is no info on it
2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36
show normal price if there is a discount
2015-11-17 11:42:03 +00:00
Henry Oswald
fefe7c2022
ignore ldap in modules
2015-11-17 11:41:52 +00:00
Henry Oswald
ef3613371f
don't show coupon area for upgrades
2015-11-17 11:41:39 +00:00
Henry Oswald
471b285ad7
changed plan choice using ab sixpack not ga
2015-11-16 16:40:14 +00:00
Henry Oswald
9d3c49242d
added api into angular sixpack
2015-11-16 16:22:27 +00:00
Henry Oswald
f7854649e2
added 20% off option
2015-11-16 15:58:04 +00:00
Henry Oswald
89381e84eb
switch to student switches to free trial
2015-11-16 15:51:54 +00:00
Henry Oswald
05c45cd658
changed upgrade to list features
2015-11-16 14:36:59 +00:00
