Commit graph

452 commits

Author SHA1 Message Date
Henry Oswald
b6b252b1f8 only participate in track changes test if they are shown view 2015-11-10 15:14:27 +00:00
Henry Oswald
615e4b448a fix search on project list page. ng-if breaks it but ng-show does not for some reason 2015-11-10 11:36:11 +00:00
Henry Oswald
c8ba7b72ab Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-10 10:36:06 +00:00
James Allen
a153c6682a Put in client side check for document getting too long 2015-11-06 12:51:43 +00:00
James Allen
16b7bf222a Merge branch 'contacts' 2015-11-05 10:14:25 +00:00
James Allen
21f702a42e Fix bug with click on share button registering 2015-11-04 14:33:27 +00:00
Henry Oswald
77d349dd8f added more long form list of features on track changes upgrade 2015-11-02 18:44:26 +00:00
Henry Oswald
0ef8d77ce3 project list minimal to work with projects 2015-11-02 18:44:12 +00:00
Henry Oswald
79c4c6e26b added split test for on boarding, doing cut down view 2015-11-02 16:15:56 +00:00
Henry Oswald
2d03410c42 removed some editor actions sent to google analytics as we are sending too much data 2015-10-27 23:28:54 +00:00
Henry Oswald
b9187ebd08 added test to wording for datajoy popup 2015-10-27 10:58:51 +00:00
James Allen
144f1396b7 Fix problem with pasting multiple emails 2015-10-15 17:03:22 +01:00
James Allen
fb42489803 Improve formatting of users, groups and tags 2015-10-15 16:43:53 +01:00
Henry Oswald
2f48568f76 fix free trial button on timeout view 2015-10-15 11:38:01 +01:00
James Allen
d996ed6e47 Refactor addUserToProject for better access by groups 2015-10-14 17:29:58 +01:00
Henry Oswald
f5162d424f if a user is inactive for 12 hours disconect them. 2015-10-14 14:28:24 +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
8cc7869b03 Pull in contacts from contacts api and send to tag-input for autocomplete 2015-10-07 17:32:35 +01:00
Henry Oswald
a73b2ceb37 Merge branch 'connect-failed' 2015-10-07 11:30:48 +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
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
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
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
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
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
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
Henry Oswald
53dc0b63c8 v1 of enago 2015-08-04 10:45:19 +01:00
Henry Oswald
3e55aef25a show error if socket io fails to connect. Not tested yet. 2015-07-31 15:42:47 +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
e454d2f059 don't allow renaming in client if user is not owner 2015-05-28 12:59:02 +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
f385a7a4b5 open chat links in new window 2015-04-28 16:20:24 +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
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
Brian Gough
0684fa36fd upgrade pdfjs to version 1.0.1040 2015-03-31 14:53:27 +01: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
bb61dfe34a Show nice error page if socket.io could not be loaded 2015-03-09 13:57:13 +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
James Allen
766bfbf5ef Provide easy way out of track-changes 2015-02-18 17:50:14 +00:00
James Allen
b44e9b1dcb Move template front end code to module 2015-02-10 13:02:43 +00:00
James Allen
e4b77a2563 Merge branch 'dropbox-module' 2015-02-10 11:38:32 +00:00
Henry Oswald
08420a305a autolink chat messages 2015-02-07 16:15:33 +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
3aad31069c Always show chat name or email 2015-02-05 13:05:57 +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
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
265ad4439c Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng 2014-12-05 14:43:01 +00:00
Brian Gough
b388c587e5 remove debugging log for pdf featureswitch 2014-12-04 16:42:28 +00:00
James Allen
4020c2f760 Update wrong synctex tooltip 2014-12-03 11:01:41 +00:00
James Allen
31ee8eea8b Show sync panel for everyone except anonymous users 2014-12-03 10:09:40 +00:00
Brian Gough
5053536fff load the compatibility library from the correct version of pdf.js 2014-12-01 15:41:17 +00:00
Brian Gough
25bebe1104 support old and new pdf viewers depending on feature switch 2014-12-01 14:35:12 +00:00
Brian Gough
3fd8bfb221 make the pdf viewer directive conditional depending on user feature switch 2014-12-01 11:47:56 +00:00
Brian Gough
175de30967 Merge branch 'master' into pdfng 2014-12-01 10:09:04 +00:00
Brian Gough
57b09e1d60 started making pdf viewer conditional - work in progress 2014-11-28 16:59: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
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
James Allen
e559c72491 Connect to configurable websocket service 2014-11-17 13:38:44 +00:00
James Allen
a59a2dcf39 Make sure to send description before publishing 2014-11-07 10:20:29 +00:00
Henry Oswald
36136a99ca fixed escaping of html 2014-10-20 15:46:42 +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
fc4bc08fc2 added upgrade to get faster compiles message to timeout 2014-10-17 16:01:26 +01:00
James Allen
cfb3969b88 Fix alignment in left menu 2014-10-13 14:45:45 +01:00
James Allen
8f7dff1518 Don't show empty sync menu list for collaborators 2014-10-08 15:57:56 +01:00
James Allen
128c672edd Merge branch 'github-sync'
Conflicts:
	package.json
2014-10-08 12:13:37 +01:00
James Allen
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +01:00
Henry Oswald
de6135c777 added missing translations 2014-09-30 11:41:47 +01:00
Henry Oswald
a0174c649b added a couple of missing translations 2014-09-26 16:35:57 +01:00
Henry Oswald
d5f816598d fixed incorrect message showed in pubic modal 2014-09-20 09:20:36 +01:00
James Allen
e973a66482 Allow client side module code injection 2014-09-08 17:33:30 +01:00
Henry Oswald
6a4ddd937b Merge pull request #104 from watercrossing/fixSpace
Add missing white space
2014-09-02 10:34:08 +01:00
watercrossing
81b543bbaa Add space at end of line 2014-09-01 20:14:49 +01:00
Henry Oswald
97b118c2ac added in couple of missing translations 2014-08-24 17:12:22 +01:00
Henry Oswald
e144f9c19a changed key for profile complete 2014-08-21 12:48:55 +01:00
Henry Oswald
dd8ca9ca0e changed key Actions -> actions 2014-08-21 12:45:19 +01:00
Henry Oswald
daec56359f rename != delete tooltip 2014-08-21 04:41:06 +01:00
Henry Oswald
c51c0c1cf2 fixed misconfig translate string 2014-08-20 14:40:27 +01:00
Henry Oswald
3cd43ddd86 found sneaky missing translations 2014-08-20 14:31:44 +01:00
Henry Oswald
21f288fbe5 missed off few tooltips in translation 2014-08-20 13:47:45 +01:00
James Allen
156c6ec4b6 Add PDF viewer label in 2014-08-19 14:40:10 +01:00
Henrique Dias
e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
James Allen
ac4b3663cb CSS tweaks to i18n stuff 2014-08-14 16:33:01 +01:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
James Allen
6bfefea5cb Show PDF button in toolbar if file tree is closed in PDF flat view 2014-08-12 13:18:22 +01:00
James Allen
93f2969be5 Change style on file rename input to avoid weird Chrome behaviour 2014-08-12 12:46:05 +01:00
James Allen
5b3bf5c956 Spaces after error titles 2014-08-12 12:30:07 +01:00
Henry Oswald
f452f0ee19 don't escpae html on delete modal 2014-08-11 08:01:39 +01:00
Henry Oswald
da307318d9 fixed unescaped content 2014-08-07 16:11:43 +01:00
Henry Oswald
9c6f0faff6 Merge branch 'i18n'
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
2014-08-07 14:46:17 +01:00
Henry Oswald
a337b8e848 fixed jade error in track changes 2014-08-07 14:31:03 +01:00
Henry Oswald
ecd5d5274c Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-07 13:56:17 +01:00
Henry Oswald
c961cea514 fixed some bits 2014-08-07 13:56:04 +01:00
James Allen
07a2955341 Add in timeout documentation link to error message 2014-08-05 17:16:34 +01:00
James Allen
0111d699a3 Move sort click action to just the header text, not select all input 2014-08-05 17:10:24 +01:00
Henry Oswald
cb685f5ea6 done loads of more pages 2014-07-31 17:07:43 +01:00
James Allen
be725c50ba Make right click on menus behave like native right click 2014-07-31 14:20:56 +01:00
James Allen
bc2147993a Show project path in Dropbox folder 2014-07-31 13:04:55 +01:00
James Allen
e1c14b0cf8 Mask iframe so resizer can go over native PDF 2014-07-31 13:04:55 +01:00
Henry Oswald
270c92c2a2 converted project list page
added missing js files
2014-07-30 17:18:45 +01:00
Henry Oswald
9631d4da98 much simpler version of interpolation 2014-07-30 16:06:53 +01:00
Henry Oswald
7344f745e4 example of interpolation working 2014-07-30 16:04:26 +01:00
Henry Oswald
1a8c3d17b2 working example of directive for i18n new project button 2014-07-30 15:05:13 +01:00
Henry Oswald
bdf1fed462 jquery translations work 2014-07-30 14:22:36 +01:00
Henry Oswald
48f019236e added first translations 2014-07-29 15:33:31 +01:00
Henry Oswald
39173fe583 Merge branch 'i18n'
Conflicts:
	app/coffee/infrastructure/Server.coffee
	app/views/project/list.jade
	package.json
2014-07-29 13:44:10 +01:00
Henry Oswald
f821c38a9f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-07-29 10:55:29 +01:00
Henry Oswald
dff74cf5cb hide dropbox in left menu if you are not the admin 2014-07-29 10:55:22 +01:00
James Allen
25205e3dda Update to official mathjax cdn 2014-07-29 10:37:43 +01:00
James Allen
fc7753d49d Add in download PDF button 2014-07-28 17:24:43 +01:00
James Allen
a5267184ab Don't use dark theme yet 2014-07-28 15:57:06 +01:00
James Allen
4ff9fe33b6 Use a dark editor surround if the theme is dark 2014-07-28 15:06:26 +01:00
James Allen
ce47f75058 Show timedout errors properly 2014-07-28 10:22:27 +01:00
Henry Oswald
d7814e354b replace underscore with space in template names 2014-07-25 12:20:08 +01:00
James Allen
0938186868 Don't show system messages in editor 2014-07-24 14:04:26 +01:00
James Allen
5c18f4fe02 Sexy project list resizing 2014-07-24 14:02:14 +01:00
Henry Oswald
e60c67d7e4 moved the left hand pdf link to the top 2014-07-23 14:44:44 +01:00
James Allen
2218acdc3b Add close buttons to modals 2014-07-23 11:26:45 +01:00
James Allen
96e99a5cc0 Minor project list tweaks 2014-07-23 11:12:12 +01:00
James Allen
532ec5e756 Make project list look better on a smaller screen 2014-07-23 11:08:55 +01:00
James Allen
c099b8e9de Add hotkeys modal 2014-07-22 14:38:32 +01:00
James Allen
688842de3c Allow full screen PDF 2014-07-22 13:33:01 +01:00
James Allen
b5cfe06645 Don't show options that don't make sense for anonymous users 2014-07-21 16:10:21 +01:00
James Allen
1d6314a2c1 add Ctrl-Enter hotkey 2014-07-21 15:39:15 +01:00
James Allen
3468460ed6 Show progress before any js loads 2014-07-21 15:11:54 +01:00
James Allen
2b85ebf8ec Allow root doc to be set 2014-07-21 15:09:19 +01:00
Henry Oswald
82914b6fe5 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-21 13:14:08 +01:00
James Allen
98d601fb66 Only show synctex controls when pdf layout is open 2014-07-21 12:30:34 +01:00
James Allen
1cf508356c Show 'no messages' state in chat 2014-07-21 12:19:13 +01:00
James Allen
4151f5d85f Disable chat for anonymous users 2014-07-21 11:56:49 +01:00
James Allen
6212b1c375 Append header tooltips to body 2014-07-21 11:38:19 +01:00
Henry Oswald
57ad5e4182 - migrated event tracking to new pages/angular
- hooked up the search field on projects to search on keypress
2014-07-21 11:35:05 +01:00
Henry Oswald
0868ce9cc7 send user details on modal dismiss. Role uses same autocomplete lib as institution 2014-07-18 14:08:53 +01:00
Henry Oswald
533b51146e Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-18 13:20:40 +01:00
Henry Oswald
175882dc67 changed role to datalist because im fed up of not being able to fix it. Datalist are not styled but its not that bad 2014-07-18 13:20:35 +01:00
James Allen
b532461232 Style project sorting with a cleaner look 2014-07-18 12:20:12 +01:00
James Allen
462403bb4f Finger print Ace files 2014-07-18 12:08:56 +01:00