Commit graph

910 commits

Author SHA1 Message Date
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
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
53dc0b63c8 v1 of enago 2015-08-04 10:45:19 +01:00
Henry Oswald
258a8e3f04 added picture of kiri and geri 2015-07-08 11:30:02 +01:00
James Allen
c75cdf24b5 Fix selectAll for angular upgrade 2015-06-29 13:43:44 +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
b657c5207e cleaned up the views a bit 2015-05-27 21:45:29 +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
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
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
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
9764ab258b added complex password validation to password resets 2015-04-30 12:05:46 +01:00
Henry Oswald
65b91930d1 field != feild 2015-04-28 17:50:06 +01:00
Henry Oswald
cdbc239a62 config the password options via the settings 2015-04-28 17:39:35 +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
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
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
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
Henry Oswald
52f3248869 null check entity in filetree for orderByFoldersFirst 2015-04-14 17:05:13 +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
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
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
Sibren Vasse
f4f74a2baf Fix for adblock blocking loginscreen. 2015-03-17 20:14:55 +01:00
James Allen
bb61dfe34a Show nice error page if socket.io could not be loaded 2015-03-09 13:57:13 +00:00