Henry Oswald
aba8f164fc
copy right 2015 not 2014
2015-10-14 14:44:48 +01:00
Henry Oswald
f5162d424f
if a user is inactive for 12 hours disconect them.
2015-10-14 14:28:24 +01:00
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
James Allen
d11d536994
Refactor adding and removing collaborators to not go through EditorController
2015-10-08 14:15:36 +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
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
Henry Oswald
a73b2ceb37
Merge branch 'connect-failed'
2015-10-07 11:30:48 +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
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
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
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
Henry Oswald
27c02f5ef5
added some robots to the blocked list
2015-09-22 14:27:14 +01:00
Shane Kilkelly
30a63d1e42
Remove ng-click on output files, which was causing a double-request for download.
2015-09-22 10:11:03 +01:00
Henry Oswald
011f628de8
lock down translations version
2015-09-17 10:26:29 +01:00
Henry Oswald
24007affa7
change admin link to /admin/user
...
this is the page for the admin panel, if the panel is installed
then it will load, otherwise a redirect to register users has been
added in.
2015-09-16 12:17:58 +01:00
Henry Oswald
70611da833
added a null check to getRequestUserAndProject
2015-09-15 12:47:48 +01:00
Henry Oswald
5ffd76c670
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16
Fix a case where a null user would cause displayName to crash.
2015-09-14 12:27:27 +01:00
Shane Kilkelly
77ac6c1baf
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-09-14 12:08:11 +01:00
Shane Kilkelly
7bc9218b3c
Fix up a bunch of issues with the track-changes list view.
...
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
2015-09-14 12:08:05 +01:00
Henry Oswald
507e8d13a6
Merge pull request #200 from heukirne/wordcount
...
Wordcount hook
2015-09-11 16:22:15 +01:00
Shane Kilkelly
778f588741
Merge pull request #199 from sharelatex/sk-missing-users
...
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-11 14:24:08 +01:00
Henrique Dias
3be0425b45
add unit tests for wordcount
2015-09-11 10:21:05 -03:00
Henrique Dias
d228fd88ab
add worcount file param
2015-09-11 09:53:06 -03:00
Henrique Dias
77c2162872
add wordcount clsi handler
2015-09-10 12:41:48 -03:00
James Allen
662050b3f9
Only show services header if we have some services to render
2015-09-10 16:01:12 +01:00
Shane Kilkelly
4a315a0474
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-10 14:35:09 +01:00
James Allen
1c9f9274a9
Remove uneeded and now wrong Sentry error capturing
2015-09-08 11:48:39 +01:00
James Allen
25b9a9be19
Upgrade Ace to 'package 11.07.15'
...
This required a refactor of all code that listen to events changes since the API
has changed. See https://github.com/ajaxorg/ace/pull/1745 for more details.
2015-09-07 17:04:05 +01:00
James Allen
5fdb50958e
Fix logs dropdown to work with Angular 1.3
2015-09-03 13:13:28 +01:00
James Allen
95db287fef
Fix more dropdown menu in project list for new Angular
2015-09-03 13:02:43 +01:00
James Allen
c64891a61b
Fix folder dropdown to work with new Angular
2015-09-03 12:54:11 +01:00
James Allen
aa06eb55b7
Merge branch 'master' into angular_1.3.15
2015-09-03 12:52:08 +01:00
James Allen
7446572ed9
Group online users into dropdown menu when more than 3
2015-09-02 14:33:51 +01:00
James Allen
34c8f22dd7
Allow multiple collaborators to be added at once with a list of emails
2015-09-02 14:33:43 +01:00
James Allen
639424f664
Don't error on project clone if not root doc is set
2015-09-02 14:32:21 +01:00
James Allen
40704b486e
Don't lock up on very long lined documents
2015-08-28 16:52:09 +01:00
Shane Kilkelly
0aaeb6671e
Keep password reset token in session, and strip it from reset page url.
...
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.
Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Henry Oswald
a53e3b80cf
if blog or universities site is down don't crash, send 500
2015-08-20 16:55:16 +01:00
Shane Kilkelly
23bd5d317c
A few extra cases which should not be treated as html.
2015-08-20 15:58:36 +01:00
Shane Kilkelly
ebf754904f
More thorough tests for the FileStoreController when downloading .html files.
2015-08-20 15:56:56 +01:00
Shane Kilkelly
aab7a8713e
Catch the case where filename is shorter than the extension length.
2015-08-20 15:56:30 +01:00
Shane Kilkelly
85c1704fc5
Test that content-type is set for mobile-safari user-agents.
2015-08-20 14:03:12 +01:00
Shane Kilkelly
ce248f56d7
Un-break FileStoreControllerTests by mocking out the req.get method.
2015-08-20 12:28:51 +01:00
Shane Kilkelly
2dd56d0b32
If we're sending a html file to mobile-safari, do so as plain text.
...
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
2015-08-20 12:02:43 +01:00
Shane Kilkelly
936b41ff2a
Merge branch 'sk-unpublish-buttons'
2015-08-19 15:44:02 +01:00
Henry Oswald
038c5a33a2
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-08-19 12:00:58 +01:00
Henry Oswald
0e9ec00f85
added stubbed logger in document controller tests
2015-08-19 11:58:59 +01:00
Henry Oswald
63580f6a79
remove useClsi2 flag in project collection
2015-08-19 11:58:41 +01:00
Henry Oswald
a777fcc5a6
changed post to deactivate projects to set params via body rather than query params
2015-08-19 11:55:35 +01:00
Henry Oswald
50fc886c94
changed inactive to active as its more effienct query in mongo
2015-08-19 11:54:30 +01:00
Shane Kilkelly
18f75bba79
Generalize this style to all .btn elements under the .template-details-section
2015-08-19 09:59:01 +01:00
Shane Kilkelly
865372d13f
Add some whitespace around buttons in template-details.
2015-08-18 14:45:44 +01:00
Shane Kilkelly
96619bde8c
Move the template-browser code into the 'templates' module.
...
Now located to be located at `modules/templates/public/coffee/main/index.coffee`,
moved to complete a migration of template related code into the templates module.
Corresponding commit in sharelatex-web-modules:
625c556e42072d30f30d474aaef72deff24ca154
2015-08-18 14:21:35 +01:00
Shane Kilkelly
6b295fde28
Add shane image.
2015-08-17 14:23:36 +01:00
Henry Oswald
d3499acd7b
pass options through stating how long ago want to archive from and limit
2015-08-14 14:11:53 +01:00
Henry Oswald
70b825fd2a
fixed call to ProjectUpdateHandler.markAsOpened and made it async
2015-08-14 11:27:11 +01:00
Henry Oswald
66b87df17c
added deactivate project endpoint
2015-08-14 11:26:11 +01:00
Henry Oswald
bec9bf5c87
replace lodash with underscore in this project
2015-08-14 09:42:27 +01:00
Henry Oswald
68e970cd69
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-08-14 09:31:25 +01:00
Henry Oswald
21a67ddab4
added deactivate old projects endpoint
2015-08-13 22:50:39 +01:00
Henry Oswald
a0142d4415
added inactive and reactivate project logic
2015-08-13 22:40:28 +01:00
Brian Gough
a25373d53e
update metric-sharelatex to v1.2.0 for mongodb-core support
2015-08-06 09:44:47 +01:00
James Allen
ec5e03bd01
Fix subscription currency dropdowns
2015-08-04 15:58:31 +01:00
Henry Oswald
04d3e527d6
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-08-04 10:46:19 +01:00
Henry Oswald
53dc0b63c8
v1 of enago
2015-08-04 10:45:19 +01:00
Brian Gough
2bc003894b
use latest version of metrics with commit id until ready to tag
2015-08-02 15:55:26 +01:00
Brian Gough
c5cc639bff
upgrade mongoose from 3.8.28 to 4.1.0
2015-08-02 15:24:17 +01:00
Henry Oswald
3e55aef25a
show error if socket io fails to connect. Not tested yet.
2015-07-31 15:42:47 +01:00
Henry Oswald
417fd4f5f5
add logging to tell us how long since a project that is being opened was last updated
2015-07-22 10:38:48 +01:00
Henry Oswald
c12213b46b
added logging around load editor times
2015-07-22 10:38:28 +01:00
Henry Oswald
a786b623a8
added logging to help debug slow project list page loading
2015-07-22 01:06:23 +01:00
Henry Oswald
3ecf201eda
send -> sendStatus
2015-07-08 16:56:38 +01:00
Henry Oswald
9028bcf830
set body parser limit to 2mb
2015-07-08 14:35:03 +01:00
Henry Oswald
39df8964cf
added route that got lost in merge
2015-07-08 13:29:10 +01:00
Henry Oswald
9a49ce4a0e
removed extra req.session.destroy
2015-07-08 12:58:02 +01:00
Henry Oswald
258a8e3f04
added picture of kiri and geri
2015-07-08 11:30:02 +01:00
Henry Oswald
8020cd8f47
removed tpds from settings.defaults.coffee, if not set updates are now not queued
2015-07-02 12:09:08 +01:00
Henry Oswald
56346ad88c
remove analytics router and fixed bad package.json
2015-07-01 15:48:23 +01:00
Brian Gough
e6a670533d
added default mongoose connection
2015-07-01 15:36:50 +01:00
Henry Oswald
7fd29b18a8
destroy users session before creating a new one for them after login
...
session changed to prevent against fixation attacks
2015-07-01 15:29:02 +01:00
Henry Oswald
4f0b922a5d
changed name used when project or file uploaded, this changed when
...
we started using https://github.com/expressjs/multer
* originalname - Name of the file on the user's computer
* name - Renamed file name
2015-07-01 15:28:49 +01:00
Henry Oswald
3ab57f6830
put express locals on webRouter, this prevents problem with accessing sessions in locals, they should also only be used on web routes not api routes
2015-07-01 15:28:30 +01:00
Henry Oswald
941d407231
added saveUninitialized option to session which is now required
2015-07-01 15:26:17 +01:00
Henry Oswald
15a57f5dc4
removed req.session.destorys from endpoints now on the api router which are not needed
2015-07-01 15:26:05 +01:00
Henry Oswald
1cc0cbe8fc
split site into 2 routers, webRouter and apiRouter
...
web router has things like sessions etc added onto it. Api router is minimal, doesn't include things like csrf
2015-07-01 15:23:18 +01:00
Henry Oswald
665bdcf538
v1 of express4 conversion
2015-07-01 15:17:43 +01:00
James Allen
c75cdf24b5
Fix selectAll for angular upgrade
2015-06-29 13:43:44 +01:00
Brian Gough
a4f99c4224
remove fairy from exception handler
2015-06-23 14:16:06 +01:00
Brian Gough
893de9d8ac
updated metrics package version
2015-06-23 13:54:05 +01:00
Brian Gough
3de841dd71
added event loop monitor
2015-06-23 13:50:42 +01:00
Henry Oswald
84bf0dd9a3
added timeout and logging for tpdsworker queing via http
2015-06-23 11:19:23 +01:00
Henry Oswald
b83fe4dcf9
put tpdsworker url in from settings
2015-06-23 11:13:05 +01:00
Henry Oswald
2ec925b45e
fairy removed from web, makes http request to tpds worker now
2015-06-22 22:33:04 +01:00
Henry Oswald
706c1824f0
changed package.json to use our fairy fork
2015-06-18 15:43:42 +01:00
James Allen
559e26145b
Run module unit tests with main tests
2015-06-16 10:54:15 +01:00
James Allen
30eb79dfdc
Add link to DataJoy that shows randomly 50% of the time
2015-06-09 15:36:16 +01:00
James Allen
0eec715bb5
Upgrade to Angular 1.3.15 and latest ui-bootstrap
2015-06-09 14:59:12 +01:00
Henry Oswald
fc72ca601e
update package.json
2015-06-09 10:19:24 +01:00
Henry Oswald
eeead86fba
updated mongoose
2015-06-02 16:24:40 +01:00
Henry Oswald
aaa902cca9
fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page
2015-06-01 14:38:09 +01:00
Henry Oswald
33aa5c732f
if a domain licence link has expired render a nice message explaining they need to retry
2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74
changed email expire to 1 day for verifying account
2015-06-01 12:22:46 +01:00
Henry Oswald
6727c3ee00
changed ShareLaTeX thoughts to go into type form
2015-05-29 16:27:35 +01:00
Henry Oswald
d3f6c0c614
Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv
2015-05-29 12:17:54 +01:00
Henry Oswald
e4011b9ba1
Merge branch 'emailverification'
2015-05-29 12:10:02 +01:00
Henry Oswald
702fdc1480
improved views for domain licence invites
2015-05-29 12:09:28 +01:00
Henrique Dias
f709ddf3eb
add csv export unit tests
2015-05-28 17:22:49 -03:00
Henrique Dias
f50eb0398f
add export csv group feature
2015-05-28 16:54:41 -03:00
Henry Oswald
43c4531e51
kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere
2015-05-28 13:02:08 +01:00
Henry Oswald
e454d2f059
don't allow renaming in client if user is not owner
2015-05-28 12:59:02 +01:00
Henry Oswald
ca28d8ee70
changed views to use translations
2015-05-27 22:15:46 +01:00
Henry Oswald
b657c5207e
cleaned up the views a bit
2015-05-27 21:45:29 +01:00
Henry Oswald
22b94e9246
renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler
2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f
added tests around new endpoints for joining groups
2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1
pull logic checking if user is already part of a group out of controller into handler
2015-05-27 16:33:47 +01:00
Henry Oswald
72e528e9d1
if you are alread in the group show the custom group page
2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d
if a user is elelable to be part of a group subscription and they go to
...
/user/subscription it should redirect them to the group subscription invite
2015-05-27 15:35:31 +01:00
Henry Oswald
1d21bddcf5
fix Onetime token handler path
2015-05-27 15:06:36 +01:00
Brian Gough
a5d14f4ffb
handle unexplained case where smokeTestModule is undefined
2015-05-26 16:33:02 +01:00
Henry Oswald
481bd67fbd
changed paths to use hyphens and add succesfull join page
2015-05-26 15:26:45 +01:00
Henry Oswald
94b26e71a4
ignore test script
2015-05-26 15:25:24 +01:00
Henry Oswald
841231dbf8
make PasswordResetTokenHandler generic so it can be used for invites
2015-05-26 15:24:09 +01:00
Brian Gough
e51cdb81bd
port leak fixes from smoke-test-sharelatex module
2015-05-26 10:54:55 +01:00
Henry Oswald
12bf268978
Merge branch 'master' into emailverification
2015-05-25 11:51:46 +01:00
Henry Oswald
d774ca7e0a
added sigma-master
2015-05-25 11:37:53 +01:00
Henry Oswald
cad8d8a23b
v1 basic invite works, not pretty or tested
2015-05-22 13:57:15 +01:00
Brian Gough
cc9c8fdc94
freeze Date in Recurly tests before all calls
...
beforeEach freezes and resets for each subtest, which does not give
the desired result as the time increases between each subtest, we want
to freeze once at the beginning and reset at the end using before/after.
2015-05-19 15:00:30 +01:00
Henry Oswald
f5c39efcac
patched xss hole with messages not setting the content type correctly
2015-05-19 11:04:52 +01:00
Henry Oswald
47d4ed9631
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-05-18 16:10:07 +01:00
Henry Oswald
2bc39ddf0b
added sigma.js lib used for module spike
2015-05-18 16:09:47 +01:00
Brian Gough
3051d7dab6
modify LockManager test to avoid dependence on timing
2015-05-18 09:14:28 +01:00
Diego Giovane Pasqualin
7c6ed0ff77
Update bcrypt to 0.8.3
...
This new version compiles successfully on nodejs newer than 0.10.
2015-05-11 16:43:29 -03:00
Brian Gough
1bb7ae3996
always remove the spinner, even if it is not spinning
2015-05-11 14:12:24 +01:00
Brian Gough
92836f49fc
avoid unnecessary spell checks on session change
2015-05-11 10:07:11 +01:00
Henry Oswald
8fc41e9e05
added templateLinks property to example config for ShareLaTeX server pro
2015-05-10 13:10:03 +01:00
Brian Gough
3ad517e1c2
Merge pull request #177 from sharelatex/fix-ace-extension-errors
...
prevent loading error for ace language tools extension in development
2015-05-05 14:47:44 +01:00
Brian Gough
6014085e8e
prevent loading error for ace language tools extension in development
2015-05-05 14:33:18 +01:00
Henry Oswald
72af6748c9
Merge pull request #157 from oskanberg/patch-1
...
Rename 'javscript' to 'javascript'
2015-05-05 14:28:27 +01:00
Henry Oswald
bb071e99fa
make startup message consistent
2015-04-30 15:03:07 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +01:00
Henry Oswald
312c56a24e
allow password resets to be performed when site is not public by adding routes into white list
2015-04-30 11:58:26 +01:00
Henry Oswald
a7640b5bbd
changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist
2015-04-30 11:57:40 +01:00
Henry Oswald
635f79d2f6
added password strength check to change password
2015-04-28 18:30:19 +01:00
Henry Oswald
65b91930d1
field != feild
2015-04-28 17:50:06 +01:00
Henry Oswald
11a5c009a6
make default password rules very permisive
2015-04-28 17:42:30 +01:00
Henry Oswald
a1e24eb064
Merge branch 'passwordStrength'
2015-04-28 17:39:46 +01:00
Henry Oswald
cdbc239a62
config the password options via the settings
2015-04-28 17:39:35 +01:00
Henry Oswald
f385a7a4b5
open chat links in new window
2015-04-28 16:20:24 +01:00
Henry Oswald
fa4a51b5a3
email address is not allowed as part of password
2015-04-28 16:20:12 +01:00
Brian Gough
82c35d9b82
example of using controller to access other fields
2015-04-27 16:38:40 +01:00
Henry Oswald
639f73ea74
mvp for password validation
2015-04-27 14:42:32 +01:00
Henry Oswald
7d109ce77d
null check error in pdf view
2015-04-23 10:40:11 +01:00
Henry Oswald
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Henry Oswald
31a51b73d8
improved linkify so data is correctly sanitized, used inbuilt angular lib
...
don't know how I missed that last time!
2015-04-22 17:58:33 +01:00
Henry Oswald
7a46b98c82
fixed unit tests for deleting files sent from tpds
2015-04-22 15:08:29 +01:00
James Allen
6c585adb3c
Merge branch 'buffer_sharejs_ops'
2015-04-22 13:59:19 +01:00
Brian Gough
d0c759c6fb
always send the latest position when emitting updatePosition event
...
Avoid sending outdated position by capturing the current position in
$scope.currentPostion on every call and sending it the when the timer
for updatePosition runs.
2015-04-20 14:26:56 +01:00
James Allen
87d625b5e0
Delay flushes performed after getting an op acknowledgement as well
2015-04-17 17:32:23 +01:00
James Allen
8a32ca1b64
Reduce buffer delay to 1 second
2015-04-17 16:45:17 +01:00
James Allen
af85c83877
Buffer updates when only a single user is editing a document
...
Add in 5 second delay between flushing updates when only a single user
is editing a document. As soon as an update is received from another user
we switch to sending updates immediately again so there is no latency
between collaborators. The logic applies to individual docs, so two users
can be editing different docs and will still buffer updates since they
will not affect each other.
2015-04-17 11:24:28 +01:00
Henry Oswald
c583903e04
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-04-16 21:02:47 +01:00
Henry Oswald
dbd076849b
updated online user management to only send cursor position when people are collaborate
...
if someone is in the project with them cursor info is sent every 500ms, if they are
by themself it is sent every 5mins so they are still marked as online.
2015-04-16 21:01:03 +01:00
Brian Gough
396644d314
proposed fix to delete tpds dump files after use
2015-04-15 14:41:38 +01:00
James Allen
5c30a7de67
Add in option for global login requirement (defaults to on)
2015-04-15 11:14:53 +01:00
Henry Oswald
52f3248869
null check entity in filetree for orderByFoldersFirst
2015-04-14 17:05:13 +01:00
James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
33f56b71a2
Remove redundant body parser line
2015-04-14 13:04:49 +01:00
James Allen
8b4ccae60a
Read cookie session length from settings file
2015-04-14 13:04:29 +01:00
Henry Oswald
5f6bdaf700
show the social buttons by default in settings
2015-04-13 11:30:59 +01:00
Brian Gough
2ed934120c
Fix display of annotations when switching files in ace editor
...
The annotations (error markers) were not preserved when switching
between files. The setAnnotations method was being called before the
document is ready -- when the document is attached to ace the content
is deleted and reinserted, which caused the annotations to be removed.
To fix the problem we set the annotations after attaching.
2015-04-08 14:39:39 +01:00
Brian Gough
10cd5186c2
add pdfjs-1.0.712 back in for existing clients
...
clients with the old page loaded still making requests to it
2015-04-01 14:24:39 +01:00
Brian Gough
52b041c0bf
update pdf text layer builder with improvements from pdfjs 1.0.1040
2015-03-31 14:55:05 +01:00
Brian Gough
b893446b9c
use new pdfjs getDestination method in pdfRenderer
...
gives faster lookup of link destinations in pdf file
2015-03-31 14:54:36 +01:00
Brian Gough
0684fa36fd
upgrade pdfjs to version 1.0.1040
2015-03-31 14:53:27 +01:00
Mick O'Brien
9f037384b6
Update word regex for spellcheck
...
Adds Latin Extended-A characters to word regex to prevent splitting words half way through on characters like ąęćółżźńś.
2015-03-23 16:14:38 +00:00
James Allen
358242a5e0
Merge pull request #159 from SibrenVasse/adblock_fix
...
Fix for adblock blocking loginscreen.
2015-03-23 12:29:40 +00:00
James Allen
f82f5e5479
Release version 0.1.4
2015-03-20 19:08:48 +00:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
Brian Gough
b0a32b1ef8
make new pdf viewer the default for all users
...
remove old pdf viewer
2015-03-20 11:28:28 +00:00
James Allen
ff55e4c5ed
Merge branch 'private_registration'
2015-03-20 10:34:17 +00:00
James Allen
393169bc2a
Create a grunt task to create the admin user
2015-03-19 17:36:50 +00:00
James Allen
e2d515f957
Allow public registration module to hook into email system
2015-03-19 17:19:56 +00:00
James Allen
185514ea35
Fix failing unit test
2015-03-19 16:41:09 +00:00
Brian Gough
3bdf2158c1
avoid exception on page size change
2015-03-19 14:26:06 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
Brian Gough
6320fcccec
remove underscore from pollSavingStatus
...
the underscore module is not loading in time for some users on MacOS
2015-03-19 14:22:22 +00:00
James Allen
d76ef86077
Tell user to contact admin email to register
2015-03-18 16:20:26 +00:00
James Allen
93a088618a
Return proper error from registration handler
2015-03-18 16:19:48 +00:00
James Allen
cb948fede2
Move email sending into registration controller
2015-03-18 15:57:01 +00:00
Brian Gough
adb98d05b5
sentry 1.1.16 does not yet support release parameter, use build tag instead
2015-03-18 15:50:26 +00:00
Sibren Vasse
f4f74a2baf
Fix for adblock blocking loginscreen.
2015-03-17 20:14:55 +01:00
Brian Gough
5d788ca7c5
add grunt version target to report version to sentry
...
it writes the git commit id and Jenkins build number into the sentry
configuration
2015-03-17 16:59:17 +00:00
Oliver Skånberg-Tippen
5df9f49a4e
Rename 'javscript' to 'javascript'
2015-03-10 18:56:46 +00:00
James Allen
0f69ee0f22
Add in proxy for /socket.io so that we don't need to faff with real-time service location
2015-03-09 14:09:09 +00:00
James Allen
bb61dfe34a
Show nice error page if socket.io could not be loaded
2015-03-09 13:57:13 +00:00
James Allen
d376acdaa9
Allow an __appName__ parameter in translations
2015-03-09 12:14:30 +00:00
Brian Gough
b41cdb424b
Merge branch 'master' of github.com:sharelatex/web-sharelatex
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-03-06 15:03:52 +00:00
Brian Gough
24b2844ece
avoid race condition loading underscore
...
make underscore.coffee angular module depend on libs, which depends on
underscore-1.3.3
Have avoided adding an extra dependency on underscore itself so that
the version number is not duplicated. We could have a single
definition of underscore in the requirejs config, to keep the version
number in one place.
2015-03-06 15:03:30 +00:00
Henry Oswald
97f0fad525
add vat number option to payment form
2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224
send coupon code server side to be applied to users subscription
2015-03-04 17:50:24 +00:00
Henry Oswald
69806c02d0
improve behaviour of trying to rename a file to empty
2015-03-04 14:19:47 +00:00
Henry Oswald
9805c6a9ff
doc model no longer has lines or rev in it
2015-03-04 11:10:59 +00:00
Henry Oswald
fe3b9bf07a
clients can not rename docs/files/folders to blank name.
...
Client and server side checks added
2015-03-04 11:10:59 +00:00
Brian Gough
8d092fc84d
replace .filter with _.filter to remove dependency on ES5
2015-03-03 16:45:37 +00:00
Brian Gough
c52a122966
workaround for lack of DOM element .remove in IE
2015-03-03 16:44:26 +00:00
Brian Gough
edc83b905c
remove circular references when reporting to sentry
2015-03-03 16:41:21 +00:00
Brian Gough
0ff5f54bf6
fix unit test for build parameter
2015-03-02 15:33:45 +00:00
Brian Gough
c1cde643ef
use send build identifier to clsi only for new pdf viewer
...
old pdf viewer will continue to use the main ouput.pdf file
2015-03-02 14:59:53 +00:00
Brian Gough
7aea33b562
keep existing behaviour when loading other output files
2015-03-02 12:18:10 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
caed778117
load output files from cached build when known
2015-02-26 16:47:47 +00:00
Brian Gough
a64b8724bd
include the build parameter in the compile unit tests
2015-02-26 16:21:44 +00:00
Brian Gough
5b9f2e8fc1
pass build id through to clsi when requesting pdf
2015-02-26 16:21:44 +00:00
James Allen
c495e5c492
Release version 0.1.3
2015-02-26 11:48:42 +00:00
Henry Oswald
8100f988b2
comment out ldap in settings.defaults
2015-02-26 11:40:02 +00:00
Henry Oswald
40b30b957a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-24 22:07:43 +00:00
Henry Oswald
161f24ffdf
add flag which requires login for /learn
2015-02-24 22:07:36 +00:00
Henry Oswald
387a8b8ae3
hide some forms in user settings if authentication is managed by external system
2015-02-24 13:41:46 +00:00
Henry Oswald
3a9c6503ee
null check mathjax
2015-02-23 17:46:17 +00:00
Henry Oswald
9a7f73ed89
null check response.outputFiles
2015-02-23 17:43:22 +00:00
Henry Oswald
4f11974c85
added null check when looking for deletedByExternalDataSource
2015-02-23 17:33:05 +00:00
Henry Oswald
5028665913
ignore errors from https://pstatic.datafastguru.info its malware we have
...
no control over
2015-02-23 17:29:38 +00:00
Henry Oswald
c98c2db6be
change Raven?.captureException to not log json, might be causing error
2015-02-23 17:27:35 +00:00
Henry Oswald
8638b531a5
fire off register to newsletter on user registration as it can be slow
2015-02-23 16:03:45 +00:00
Henry Oswald
c33956c0af
fix jade warnings about missing space, need to escape the module html
...
insertions a different way. != func rather than !{func}
2015-02-23 10:18:48 +00:00
Henry Oswald
f7f681d2a3
deal with nan tax rate if user is not in taxable location for subscription dashboard/change plan
2015-02-22 18:35:59 +00:00
Henry Oswald
d112ad22a8
added ldapjs to package.json
2015-02-20 15:23:24 +00:00
Henry Oswald
6a3f760c6f
added ShareLaTeX server pro options with ldap into settings.defaults
2015-02-20 12:09:35 +00:00
Henry Oswald
78b4bccba1
remove qq upload loading gif, just 404's atm and is not missed
2015-02-19 11:42:57 +00:00
Henry Oswald
e4121d8a28
forgot comma in ignoreUrls
2015-02-19 11:25:06 +00:00
Henry Oswald
4eed88c1ab
broken a err and null check into 2 lines
2015-02-19 10:54:28 +00:00
Henry Oswald
67f4929e49
null check on loadRootFolder
2015-02-18 22:31:45 +00:00
Henry Oswald
e8b50e2ffd
null check highlights before removing them
2015-02-18 22:29:07 +00:00
Henry Oswald
2c3b19e43d
null check on deleting entry from scope
2015-02-18 22:28:02 +00:00
Henry Oswald
ad5de0e93a
added null check on Facebook
2015-02-18 22:25:58 +00:00
Henry Oswald
5d09999da5
ignore errors from twitter loading
2015-02-18 22:19:49 +00:00
Henry Oswald
c15484db6b
added null check on log entry files in the client
2015-02-18 22:16:29 +00:00
Henry Oswald
4ec05364bb
set chat message to empty string by default
2015-02-18 22:06:18 +00:00
Henry Oswald
a9660a3a07
add err and null project test for locating project element
2015-02-18 21:57:21 +00:00
Henry Oswald
455d78773e
change the meta tags a little to help with so
2015-02-18 21:57:21 +00:00
Henry Oswald
f8e3fa6308
increase the auto compile limit a little
2015-02-18 21:57:21 +00:00
Henry Oswald
21a01d94d4
check that content exists before adding it to getAllDocs.
...
causing error which I think is blowing up the mongo driver elsewhere
2015-02-18 21:57:21 +00:00
James Allen
766bfbf5ef
Provide easy way out of track-changes
2015-02-18 17:50:14 +00:00
James Allen
000f01fbeb
Remove unneeded uid module
2015-02-17 11:21:50 +00:00
James Allen
1a7d4f6be1
Fix smoke tests
2015-02-17 11:21:14 +00:00
Henry Oswald
4c4aaac7a9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-17 10:59:25 +00:00
Henry Oswald
c4b21f3184
added some null checks to message.user.id
2015-02-16 23:16:38 +00:00
Brian Gough
3d69033212
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-02-13 15:56:51 +00:00
Brian Gough
c29714f427
avoid unnecessary infinite scroll loadUntilFull calls
...
allow the dom to update before checking if more data is needed
2015-02-13 15:53:59 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +00:00
James Allen
f037c466cd
Quieten noisy Ace warnings
2015-02-12 12:17:21 +00:00
James Allen
18d627baba
Add missing localStorage.coffee... oops
2015-02-12 11:55:52 +00:00
James Allen
7dd1ab84d5
Wrap calls to localStorage in an exception handler
2015-02-12 11:32:27 +00:00
James Allen
4dde3e4979
Update Ace to 'package 20.12.14'
2015-02-12 10:37:10 +00:00
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
Henry Oswald
bf38fb7459
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-10 18:05:51 +00:00
Henry Oswald
1d6c928c81
fix bug which showed all plans as monthly in payment form.
...
Also use translations for string of month/year
2015-02-10 18:05:39 +00:00
James Allen
18723c2e26
Bump version to 0.1.2
2015-02-10 14:05:51 +00:00
James Allen
bd5f303712
Remove dropbox js include
2015-02-10 14:05:51 +00:00
James Allen
b44e9b1dcb
Move template front end code to module
2015-02-10 13:02:43 +00:00
James Allen
01cf220d57
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-02-10 11:38:43 +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
James Allen
2875958363
Merge pull request #140 from metbosch/fix/124_scroll_large_images
...
Allowed scroll on binary-file container
2015-02-09 13:32:57 +00:00
Brian Gough
353e9c86a8
sample only 1% of pdf exceptions due to volume of requests to sentry
2015-02-09 11:18:46 +00:00
Henry Oswald
08420a305a
autolink chat messages
2015-02-07 16:15:33 +00:00
Henry Oswald
7918ea4bc3
don't evaulate wiki/learn html with angular
2015-02-07 15:55:27 +00:00
Henry Oswald
6f5b524b56
use currency for change plan pricing
2015-02-06 17:08:42 +00:00
Henry Oswald
79e7f82a36
only setup recurly once for subscription dashboard and apply async to make sure updates on pricing are applied
2015-02-06 16:54:11 +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
f75376124e
Update open source branding
2015-02-05 16:56:35 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
3aad31069c
Always show chat name or email
2015-02-05 13:05:57 +00:00
James Allen
ae3175c805
Show cookies error message on forbidden response
2015-02-05 12:57:44 +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
888ebd5d7b
Attempt to stop superfish malware from loading
2015-02-05 11:23:45 +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
993c5bcee7
dont show generic error message on subscriptions if they are part of a group
2015-02-04 20:56:50 +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
Henry Oswald
42d8f1f222
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-03 14:10:27 +00:00
James Allen
753a80ada5
Navigate away from deleted docs. Closes #141
2015-02-03 13:51:56 +00:00
James Allen
0d299b308e
Ignore generated sharejs.js lib
2015-02-03 12:58:26 +00:00
James Allen
bd8311e1cf
Merge pull request #146 from sharelatex/fix-pdfng-no-background-digests
...
Fix pdfng no background digests
2015-02-03 12:11:46 +00:00
Henry Oswald
e9ab77351a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-03 11:36:16 +00:00
James Allen
2aa229d145
Add in profiling end point
2015-02-03 11:05:23 +00:00
Henry Oswald
e4976539d9
show generic error handler only on error
2015-02-03 10:41:58 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
James Allen
48a17729e4
Show change plan list on clicking change plan, not hide
2015-02-02 14:53:45 +00:00
Henry Oswald
7f0b4e5ba5
Merge branch 'master' into sitelicences
2015-02-02 11:15:14 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
49e13128a0
forgot new moment lib
2015-01-30 10:13:32 +00:00
Henry Oswald
69b5eaad19
fixed the classic "UI Layout Callback Error"
2015-01-29 19:23:04 +00:00
Henry Oswald
cb889efb6a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-29 18:32:26 +00:00
Henry Oswald
948eeb87ba
improved momentjs
...
- access it via amd not global
- remove warning message
- updated 2.7.0 -> 2.9.0
2015-01-29 18:31:11 +00:00
Henry Oswald
5a15e826a7
moved mathjax to be served locally
2015-01-29 18:29:53 +00:00
James Allen
36513f443c
Ensure we are in a digest loop when updating validation errors
2015-01-29 14:43:38 +00:00
James Allen
3731c62e17
Get validation working with address fields and Angular digest loop
2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a
Allow subscriptions with no free plans, and adjust styles
2015-01-29 14:11:25 +00:00
Henry Oswald
69c3f48c1e
if there is a validation error re enable the button
2015-01-29 13:56:19 +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
a13e78e853
catch rejected promises in pdfviewer
2015-01-26 16:07:49 +00:00
Brian Gough
b4f527b099
handle rejected promises in pdf viewer
2015-01-26 16:07:49 +00:00
Brian Gough
182dfabbae
fix pdf loadcount (no ?: operator in coffeescript)
2015-01-26 16:07:49 +00:00
Brian Gough
1a8438be5f
handle error loading pdf
2015-01-26 16:07:49 +00:00
Brian Gough
d9a3776183
make sure the progress bar always goes to 100% before removing
2015-01-26 16:07:49 +00:00
Brian Gough
5a47b1bac2
use .25-second delay before loading indicator is removed
2015-01-26 16:07:49 +00:00
Brian Gough
940c6a4b8d
replace console.logs with error callbacks
2015-01-26 16:07:48 +00:00
Brian Gough
a5900c4b9a
handle case where Raven is not defined in pdf renderer
2015-01-26 16:07:48 +00:00
Brian Gough
192918dda1
replace $timeout by setTimeout in pdf viewer
2015-01-26 16:07:48 +00:00
Brian Gough
63fd1f7c78
remove comments
2015-01-26 16:07:48 +00:00
Brian Gough
20d1a8b0f7
queue all pdf rescale/relayout events to avoid duplicate redraws
...
delay spinner by 100ms, since it now shows sooner
2015-01-26 16:07:48 +00:00
Brian Gough
866de306d6
added comment about double resize event
2015-01-26 16:07:48 +00:00
Brian Gough
3d1fe22f00
remove layout-ready event from pdfjs, we get it from jq layout
2015-01-26 16:07:48 +00:00
Brian Gough
bd8cfb1dae
fix pdf viewer to work without background scope.apply
2015-01-26 16:07:48 +00:00
Brian Gough
1160560bfb
add missing scope.$apply in pdf viewer event handlers
...
shows up now there are no apply's coming from the unsaved file check
2015-01-26 16:07:48 +00:00
Brian Gough
994b307e3f
added comment for background polling change
2015-01-26 16:06:50 +00:00
Henry Oswald
bebe94a128
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-26 15:38:34 +00:00
Henry Oswald
b06c9f509e
if chat errors don't keep trying to get more chat messages
...
causes loop which is why we have so many sentury errors
2015-01-26 15:36:34 +00:00
Brian Gough
5050c8c023
optimise common case for highlights (triggered on mousemove)
2015-01-26 15:14:55 +00:00
Brian Gough
5244fddce2
optimise common case for closing context menu (triggered on scroll)
2015-01-26 15:04:30 +00:00
Brian Gough
e62a2c7a6f
only set watch on attrs.layoutDisabled when attribute is defined
2015-01-26 15:04:30 +00:00
Brian Gough
0453c657da
prevent $scope.$apply from firing on every unsaved files check
...
only trigger a digest when there is a change in the saved state
2015-01-22 17:00:56 +00:00
Brian Gough
b407fde6e3
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-01-21 15:26:38 +00:00
Brian Gough
58750140f4
enable new pdf viewer by default for newly created users
2015-01-21 15:26:01 +00:00
Brian Gough
e66cd6dc58
Merge pull request #142 from sharelatex/pdfng-scrollhandler
...
Pdfng scrollhandler performance improvements
2015-01-21 15:25:29 +00:00
Brian Gough
4ab0f00b8d
do not render offscreen pdf pages yet
...
they cause a delay without a visible spinner
2015-01-21 14:37:59 +00:00
Brian
f510c5d19f
render current page immediately
2015-01-20 21:33:49 +00:00
