Henry Oswald
28e507b007
Revert "A tiny cache-busting change"
...
This reverts commit 1241b397d32cf982c9bb92865c725ce1e431e409.
2015-10-09 10:12:08 +01:00
Henry Oswald
ea5046ef20
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-10-09 10:11:57 +01:00
Henry Oswald
e593b3f717
append string to ide.js min which we can use for testing via status cake
2015-10-09 10:11:38 +01:00
Shane Kilkelly
8676ce9538
A tiny cache-busting change
2015-10-09 08:45:50 +01:00
James Allen
c4e4f2c77a
Add modules hook for contacts and support groups in auto complete
2015-10-08 18:17:53 +01:00
James Allen
78c5741d06
Add contact when adding collaborator
2015-10-08 16:42:23 +01:00
Brian Gough
b6dae59655
fix callback logic in compressAndSaveRawUpdates
2015-10-08 16:39:13 +01:00
Brian Gough
8226bf3be4
increase lock time to 5 minutes
2015-10-08 16:11:39 +01:00
James Allen
d11d536994
Refactor adding and removing collaborators to not go through EditorController
2015-10-08 14:15:36 +01:00
Brian Gough
add6a68fe1
add missing callback in compressAndSaveRawUpdates
2015-10-08 10:53:25 +01:00
James Allen
5fef2a82b8
Acceptance tests no longer run on Travis
2015-10-07 18:40:12 +01:00
James Allen
f723b1699b
Mongo/redis no longer needed without acceptance tests
2015-10-07 18:39:47 +01:00
James Allen
9b40d34b2a
Acceptance tests no longer run on Travis
2015-10-07 18:39:24 +01:00
James Allen
8cc7869b03
Pull in contacts from contacts api and send to tag-input for autocomplete
2015-10-07 17:32:35 +01:00
James Allen
3959cba071
add in acceptance tests
2015-10-07 14:20:30 +01:00
James Allen
b6106697a0
Don't look up user details in this api
2015-10-07 14:07:54 +01:00
Henry Oswald
f1d07811df
update the entire users features on assign bonus bu don't update
...
the user features if there is nothing to update when assigning bonus
2015-10-07 13:50:51 +01:00
James Allen
5a58c8247e
API/service layout deprecation warning
2015-10-07 13:44:57 +01:00
James Allen
1a4b8f4269
API/service layout deprecation warning
2015-10-07 13:44:40 +01:00
Henry Oswald
a73b2ceb37
Merge branch 'connect-failed'
2015-10-07 11:30:48 +01:00
James Allen
ededf6f6b9
Set up beginnings of getContacts end point
2015-10-06 17:22:11 +01:00
James Allen
9d99b12ed5
Create (unit tested only) add contact end point
2015-10-06 16:41:35 +01:00
Henry Oswald
b69ec9768d
bonus allocater does not need to check if user has subscription any more.
2015-10-05 16:50:34 +01:00
James Allen
64ffcde3df
Namespace subscription groups as SubscriptionGroup
2015-10-05 16:37:03 +01:00
Henry Oswald
fae7d431f4
after subscription is updated always check bonus
2015-10-05 16:33:13 +01:00
Henry Oswald
9a60617162
change referral allocated to only upgrade features and to find highest level
...
i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.
2015-10-05 12:30:03 +01:00
John Lees-Miller
946c1d56be
Merge pull request #3 from overleaf/error_handling
...
Error handling
2015-10-05 10:30:19 +01:00
John Lees-Miller
fcd9877a00
Merge pull request #2 from overleaf/anonymous-versions
...
Support for anonymous saved versions
2015-10-05 10:29:07 +01:00
Henry Oswald
89256f9d5f
added connect timeout option to socket.io.connect needed for the firing of connect_failed. Best way to test is drop connect timeout to 10ms and remove some transports from realtime.
2015-10-05 00:43:37 +01:00
Marc Egea i Sala
6ae47e8821
Bugfix: using statusElement and not codeElement again
2015-10-02 15:22:55 +01:00
Henry Oswald
ef69729dfd
change archive and unarchive to post's
2015-10-01 15:55:07 +01:00
Henry Oswald
6052bf6a7e
change test to 19 not 20 as a stub in mongo is left behind
2015-10-01 15:54:46 +01:00
Marc Egea i Sala
3970fb146c
Handle response errors through Util.getCodeFromResponse
...
Centralizing the exceptions to provide more details on fail.
2015-09-30 10:45:58 +01:00
Shane Kilkelly
ae10cc5755
Update default raven version to 1.1.22
2015-09-30 10:40:20 +01:00
Shane Kilkelly
12f1a798c6
Add raven version 1.1.22
2015-09-30 10:38:52 +01:00
Shane Kilkelly
15847f8921
Add the 'release' attribute to Sentry configuration.
2015-09-29 15:41:25 +01:00
Marc Egea i Sala
8648f8bde7
Use WLUser to provide default name and email
2015-09-29 11:36:10 +01:00
Shane Kilkelly
b4c7209a11
Try to reconnect either on editor-cursor move, or when any thing in the page is clicked.
2015-09-29 10:23:21 +01:00
Shane Kilkelly
8bd83f64e0
Try to reconnect when the editor cursor is moved.
2015-09-28 16:18:09 +01:00
Shane Kilkelly
b393de1450
Try to reconnect when the user types in the editor.
2015-09-28 15:45:14 +01:00
Shane Kilkelly
54de12d908
Fix alignment of inputs in Search-Replace panel.
2015-09-28 14:16:10 +01:00
Marc Egea i Sala
61a5c5870c
Support for anonymous saved versions
...
This fixes a case when de API sends a version without user. There was a
bug allowing to create anonymous versions in the application and we
have to support the old data.
The problem here is that SnapshotInfo classes are inflated from json
via Gson. This method does not call any constructor and, since the json
does not include the ‘user’ key, the bridge crashes because we’re not
expecting null users.
I’m not happy with this fix, but is the minimum solution that does not
affect anything else.
2015-09-25 16:15:37 +01:00
James Allen
2a03591030
Stub out noisy/slow logger-sharelatex and mongojs modules in tests
2015-09-25 13:46:20 +01:00
James Allen
23dfe68cb8
Don't error when rewinding and insert op which is beyond the length of the document.
...
ShareJS will accept an op where p > content.length when applied,
and it applies as though p == content.length. However, the op is
passed to us with the original p > content.length. Detect if that
is the case with this op, and shift p back appropriately to match
ShareJS if so.
2015-09-25 13:44:44 +01:00
John Lees-Miller
3635257cac
Merge pull request #1 from overleaf/catching-null-pointer-exceptions
...
Loggin API response in order to figure out the use case for errors
2015-09-24 13:45:01 +01:00
Marc Egea i Sala
78c92e62b6
Loggin API response in order to figure out the use case for errors
2015-09-24 12:33:51 +01:00
Brian Gough
92e0b0f04c
add logging to each stage of archiving
2015-09-24 09:10:06 +01:00
Brian Gough
e683b0275a
bug fix for clear archive in progress flag
2015-09-24 09:09:49 +01:00
Brian Gough
692e8c657c
Revert to the default lock timeout now we have write barriers
...
Revert "increase lock timeouts for archiving"
This reverts commit 9eee1b383772adf058130d6e5eab409f57ce03cd.
2015-09-24 08:53:09 +01:00
Brian Gough
2ab1778dd9
move default value of lastVersion into function body
2015-09-23 16:31:33 +01:00
