Commit graph

8068 commits

Author SHA1 Message Date
Henry Oswald
c68f2661a8 uri encode email and project names used in shared url 2014-03-24 15:23:50 +00:00
James Allen
66eb5e22f6 Always load font-awesome 2014-03-24 13:30:56 +00:00
James Allen
8a4dbf6618 Group changes by day for more concise display 2014-03-24 12:22:54 +00:00
Henry Oswald
49b5d99a0a Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-24 10:54:14 +00:00
Henry Oswald
f15f358878 increase saving alert message from 1 second to 3 seconds 2014-03-24 10:53:37 +00:00
James Allen
dc2dfaa66c Flush project to track changes when leaving 2014-03-22 09:34:43 +00:00
Henry Oswald
8b706d6934 added some more event tracking in for google analytics 2014-03-21 18:33:53 +00:00
Henry Oswald
af659e7690 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-21 17:49:25 +00:00
Henry Oswald
4988fc4136 setup second plans page with free trial using google analytics experiements 2014-03-21 17:49:20 +00:00
James Allen
2581af0cda Handle deleted files semi-gracefully 2014-03-21 14:48:26 +00:00
James Allen
5f8ed42006 Show blank diff for files that haven't changed 2014-03-21 14:31:04 +00:00
James Allen
2a3e7ba9f3 Move restore button and logic into diff view 2014-03-21 14:31:04 +00:00
Henry Oswald
63a5f2bf44 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-21 12:20:58 +00:00
Henry Oswald
2cca6c3775 changed event tracking to work correctly, only certain json attrs are allowed 2014-03-21 12:20:33 +00:00
Henry Oswald
3e3b1d3f5b remove codemirror.css 2014-03-21 11:36:14 +00:00
James Allen
70da673bed Move track changes activation into old history place 2014-03-20 16:45:39 +00:00
James Allen
237f738650 Allow changing between files while in diff view mode 2014-03-20 16:30:52 +00:00
James Allen
b99eaecf82 Load history view using mainAreaManager 2014-03-20 16:30:52 +00:00
James Allen
9fa80ad757 Load diff for selected doc 2014-03-20 16:30:52 +00:00
James Allen
c0686b6592 Load entire project history into change list view 2014-03-20 16:30:52 +00:00
Henry Oswald
04bdde4d0d added logging around publishing templates and changed another templates-api -> templates 2014-03-20 12:53:23 +00:00
Henry Oswald
69904e2acd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-20 08:52:17 +00:00
Henry Oswald
7310f94511 fire ga events on renames/deletes 2014-03-20 08:52:04 +00:00
Henry Oswald
4f577b5467 add events around upgrade process 2014-03-20 08:18:15 +00:00
James Allen
7d50c9c7aa Use different color schemes for dark or light editor schemes 2014-03-19 11:23:27 +00:00
James Allen
d5f130ad07 Improve more change messages and make them clickable 2014-03-19 10:53:05 +00:00
James Allen
1398d85626 Improve date format in change list 2014-03-19 10:53:05 +00:00
James Allen
a8ca388146 Allow shift-click to select multiple versions 2014-03-19 10:53:05 +00:00
Henry Oswald
3c9f6e0ce0 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-18 15:09:50 +00:00
Henry Oswald
87167841d0 set holding account to false when registered 2014-03-18 15:09:44 +00:00
Henry Oswald
069efaba1b dont show publish area if it is an open user 2014-03-18 15:08:09 +00:00
Henry Oswald
8cb21ee2f9 adds compile function to grunt file for tpds worker and background jobs worker 2014-03-18 15:07:16 +00:00
Henry Oswald
fc2b42400f Merge pull request #54 from cwoac/nodemailer-passthrough
Nodemailer passthrough
2014-03-18 13:09:14 +00:00
James Allen
ea0b0c2ec2 Fine tune logging 2014-03-17 12:50:30 +00:00
James Allen
9010557a75 Update snippets 2014-03-17 12:50:24 +00:00
James Allen
14bf20e087 Fix broken sharing page when not the owner of a project 2014-03-15 11:56:18 +00:00
James Allen
a99783edc7 Log more information in the client side errors 2014-03-14 17:23:50 +00:00
James Allen
5efd19ffc4 Update the styling and workflow around publishing a template 2014-03-14 14:42:38 +00:00
James Allen
7b2eef22a9 remove console.log debugging line 2014-03-14 12:25:25 +00:00
James Allen
498e0d4787 Fix unit tests 2014-03-14 11:56:15 +00:00
James Allen
4c76b88a2d Log out incoming and outgoing real-time updates 2014-03-14 11:51:19 +00:00
James Allen
745d112d2b Report client side ShareJs error back to server and log them out 2014-03-14 11:14:33 +00:00
James Allen
6701de796e Resize diff view on editor view port change 2014-03-14 10:20:00 +00:00
James Allen
b3096fc74e Show helpers to make navigating around diffs easier 2014-03-13 17:32:39 +00:00
Henry Oswald
9a86f24bf7 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-13 17:10:15 +00:00
Henry Oswald
b4c5f6f253 don't show the template area for non owners 2014-03-13 17:10:06 +00:00
James Allen
df706da7e0 Add history entry into context menu for docs 2014-03-13 14:32:30 +00:00
James Allen
81fcafb476 Make track changes a feature flag 2014-03-13 13:58:57 +00:00
James Allen
7aab6c4c0b Add in dropdown and context menu for files 2014-03-13 13:01:04 +00:00
Henry Oswald
4864eeba0a check if files exist before fingerprinting them issue #75 on sharelatex 2014-03-13 12:38:16 +00:00
Henry Oswald
c237d04456 fingerprint brand/plans.css 2014-03-13 10:06:33 +00:00
Henry Oswald
f7545393f2 fix bad logging on email sender 2014-03-12 23:37:54 +00:00
Henry Oswald
fa6065b298 changed logging which was causing error, reading _id on null 2014-03-12 23:37:10 +00:00
Henry Oswald
b7104a82e9 added null check when filtering elements 2014-03-12 22:44:15 +00:00
Henry Oswald
e7f8d11e45 added checks on error and response status code for smoke tests to make them easier to follow in logs 2014-03-12 22:29:44 +00:00
Henry Oswald
d20286febd stop response sending twice if compile takes a long time when testing 2014-03-12 21:56:58 +00:00
Henry Oswald
52cb1a4dcd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-12 21:33:27 +00:00
Henry Oswald
77aadf1845 plans.css trying to fingerprint wrong file 2014-03-12 21:33:15 +00:00
James Allen
451ff14e65 Improve track changes css 2014-03-12 17:13:38 +00:00
James Allen
05443b85da Automatically show a sensible diff to start 2014-03-12 17:09:11 +00:00
James Allen
e0da6da4c6 Improve hover info in diff 2014-03-12 16:46:20 +00:00
Oliver Matthews
efbb17a3b9 move all parameter handling to nodemailer. 2014-03-12 15:38:40 +00:00
James Allen
be64b510e8 Support the new update format from the track changes api 2014-03-11 18:01:14 +00:00
James Allen
da9fa28612 Remove mention of Dropbox in external update dialog 2014-03-11 12:16:51 +00:00
James Allen
1a9c86417c Add question mark to restore modal 2014-03-11 12:14:52 +00:00
James Allen
afb8bb6a42 Add in restore button to track changes 2014-03-11 12:14:52 +00:00
Henry Oswald
e364fd9c5f moved id for cancel selector to correct button 2014-03-11 11:47:24 +00:00
Henry Oswald
260c5210a6 changed ga tracking created -> subscribed, fixed indentation on cancel sub events 2014-03-11 11:22:03 +00:00
Henry Oswald
92c68177a6 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-10 15:08:04 +00:00
Henry Oswald
70fcac19a6 added message of failed login/register into google analytics 2014-03-10 15:07:54 +00:00
James Allen
417d76ab3f Create (hopefully) more intuitive change selector 2014-03-10 14:59:01 +00:00
James Allen
ceca16e507 Remove double quote from end of array snippet 2014-03-10 14:59:01 +00:00
Henry Oswald
21ec74e51c hooked up the recurly config to recurly.js correctly 2014-03-09 10:23:37 +00:00
Henry Oswald
eeee980bd2 removed ab testing from main.coffee 2014-03-09 10:14:58 +00:00
Henry Oswald
3d0bd34b50 added event tracking to subscription cretion/cancelation 2014-03-09 09:56:58 +00:00
Henry Oswald
e7602321e9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf fixed has subscription check causing bad redirects
subscription != recurlySubscription
2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208 converted all analytics to use new google analytics, removing mixpanel
and heap. Not tracking subscriptions or cancelations yet.
2014-03-08 19:00:26 +00:00
Henry Oswald
39cecfa5d8 fixed our -> out in about page 2014-03-08 18:09:02 +00:00
James Allen
adc42f7cf6 Remove logging line 2014-03-07 14:48:38 +00:00
James Allen
9c20d1d604 Fix momentjs in project list view 2014-03-07 14:41:01 +00:00
Oliver Matthews
8989284e10 move from node-ses to nodemailer 2014-03-07 14:08:21 +00:00
James Allen
a0b02d85f5 Load changes in batches of 25 2014-03-07 13:31:30 +00:00
James Allen
9851321429 Merge branch 'track_changes_integration' 2014-03-07 13:17:30 +00:00
James Allen
548d7d98a4 Allow history view to be closed 2014-03-07 13:05:59 +00:00
James Allen
e0cd9ba163 Improve the description above each change 2014-03-07 12:54:08 +00:00
James Allen
ebe4e5b1d8 Show consistent colors for different users 2014-03-07 12:00:31 +00:00
James Allen
36faedeeb3 Make the history entries pretty 2014-03-07 11:24:11 +00:00
James Allen
be8035faa8 Include names in view 2014-03-06 18:13:07 +00:00
James Allen
9329213d94 Allow multiple diffs to be selected 2014-03-06 16:32:18 +00:00
James Allen
1a91036bb6 Show nice diffs using ace and markers 2014-03-06 14:08:12 +00:00
Henry Oswald
7efa51fb62 Merge pull request #51 from cwoac/reduce_doclines_logging
don't log doc contents if file is unchanged.
2014-03-06 12:50:52 +00:00
Henry Oswald
38d3bbb556 changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future 2014-03-06 12:28:07 +00:00
Henry Oswald
92928c35ab removed old email tempaltes 2014-03-06 11:53:24 +00:00
Oliver Matthews
b73d7f23c3 don't log doc contents if file is unchanged. 2014-03-06 10:53:59 +00:00
Henry Oswald
5fc620dc10 move when template publish status is refreshed to avoid loop 2014-03-06 10:13:24 +00:00
Henry Oswald
f5e802a7d1 added null check for email property #ugly 2014-03-06 09:51:19 +00:00
Henry Oswald
9ae85abb74 got my email null check the wrong way around 2014-03-05 22:57:28 +00:00
Henry Oswald
e433eca157 added null checks into email sender for from address 2014-03-05 22:37:55 +00:00
James Allen
bf21305c68 Add in basic list of changes in track changes view 2014-03-05 17:55:47 +00:00
James Allen
8bf12f3286 Wrap editor in wrapper div and remove orchard CSS 2014-03-05 16:55:03 +00:00
James Allen
0468cbc300 Add in proxy to track changes api 2014-03-05 16:31:52 +00:00
Henry Oswald
32f9e33f71 removed heap analytics for the time being 2014-03-05 15:59:48 +00:00
Henry Oswald
64257a7b2c testing out new google analytics 2014-03-05 15:45:24 +00:00
Henry Oswald
1842a65b83 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-05 15:05:43 +00:00
Henry Oswald
ffe690afa3 hooked up lifetime emails 2014-03-05 14:56:52 +00:00
Henry Oswald
a9327cb7c5 replyTo is overridable when sending email 2014-03-05 13:33:41 +00:00
Henry Oswald
274682a83d deleted email manager 2014-03-05 12:07:09 +00:00
Henry Oswald
3431cf9070 share project email uses new email sender 2014-03-05 12:06:28 +00:00
Henry Oswald
8ba1a08245 hooked up password reset to use new email sending 2014-03-05 11:57:57 +00:00
Henry Oswald
3c18cc5553 email sending options are configurable from settings 2014-03-05 11:31:40 +00:00
Henry Oswald
5bacb2d784 added settings check on sending lifcycle emails out 2014-03-05 11:22:52 +00:00
Henry Oswald
eb92e5832b renamed email templator -> email builder 2014-03-05 11:22:34 +00:00
James Allen
f781001280 Don't return current prefix in auto-complete list 2014-03-05 11:16:33 +00:00
James Allen
06831e555e Add in some basic snippets 2014-03-05 11:06:12 +00:00
James Allen
d221e336f0 Match auto complete font size to editor font size 2014-03-05 11:06:12 +00:00
James Allen
934f3cbcd8 Use Ace's built in auto-completer 2014-03-05 11:06:12 +00:00
Henry Oswald
360fac9510 setup basic new email feature which is tested, not linked up to real
events yet
2014-03-04 18:10:06 +00:00
Henry Oswald
67e9d0724d increased auto compile limits 2014-03-04 15:29:45 +00:00
Henry Oswald
149b51ddc6 put published date on template publishing area 2014-03-03 23:04:30 +00:00
Henry Oswald
413ef7440f added a republish button to templates 2014-03-03 22:55:12 +00:00
Henry Oswald
07fe9c36a9 use window.csrftoken for adding user to group subscription 2014-03-03 17:58:26 +00:00
Henry Oswald
a0805f97e0 added bulk removing of users to group admin panel 2014-03-03 17:48:48 +00:00
Henry Oswald
c991625a27 added uni message to plans page back in 2014-03-03 16:41:59 +00:00
Henry Oswald
99dc141693 deleteing user account cancels any subscription 2014-03-03 16:22:55 +00:00
Henry Oswald
fe026b4b0b changed templates port to 3007 which is line with elsewhere 2014-03-03 16:19:52 +00:00
Henry Oswald
dd22f1f7a1 added redis connection settings into rate limiter 2014-03-03 11:46:40 +00:00
Henry Oswald
ff8320bce0 added new rate limit file based on redback. converetd auto compile to
use it.
2014-02-28 17:59:54 +00:00
Henry Oswald
aa0d26d5ab Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-27 17:35:48 +00:00
Henry Oswald
303a0e985b improved the publish button process so it talks to the templates-api and lets the user know what is going on 2014-02-27 17:35:35 +00:00
Henry Oswald
cfe13af6ff Merge pull request #45 from chid/crash-fix
add proper error handlers to the UserController class
2014-02-26 11:21:23 +00:00
Henry Oswald
cad8e0eb1c Update bonus.jade - remove extra comma 2014-02-26 08:52:57 +00:00
Charley Peng
fa80b0c3d2 fixing incorrectly written variable 2014-02-26 08:58:51 +11:00
James Allen
c723fbb789 Remove fold all command which interferes with typing } on Danish keyboards 2014-02-25 10:58:35 +00:00
James Allen
2c69cbbb78 Add travis badge 2014-02-24 14:14:09 +00:00
James Allen
11b908f276 Install grunt-cli before running install 2014-02-24 14:05:09 +00:00
James Allen
ace74c8d7c Create .travis.yml 2014-02-24 13:50:55 +00:00
palkan
283338a26d fix log wrap 2014-02-24 13:24:01 +04:00
James Allen
128c982ba2 Add open source banner to footer 2014-02-22 11:26:36 +00:00
James Allen
c824c2e7b7 Use siteUrl for share links, not hardcoded www.sharelatex.com 2014-02-22 11:09:10 +00:00
James Allen
ca1ebd0413 Take default features from settings 2014-02-22 10:50:59 +00:00
goodbest
b4482ab41f change repo URL from git+ssh:// to git+https:// 2014-02-21 23:08:19 +08:00
Henry Oswald
029077fe6e downloading a file now sets the filename in header correctly 2014-02-20 22:33:12 +00:00
Henry Oswald
6f4c2a409c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-20 21:26:35 +00:00
Henry Oswald
a9c48d666d fixed broken delete effect due to project id quotes being rendered twice for some unknow reason 2014-02-20 21:26:26 +00:00
James Allen
e9abd875db Protect against infinite loops with clients send remote changes back to server 2014-02-19 17:16:32 +00:00
James Allen
d249158676 Don't try to fingerprint plans.css 2014-02-18 17:37:39 +00:00
James Allen
2c8be16daa Update REAME with license info 2014-02-18 16:15:30 +00:00
James Allen
00d54ef977 Remove plans.less form Gruntfile 2014-02-18 16:15:20 +00:00
James Allen
01dba44238 Remove proprietary icons and stylesheets 2014-02-18 15:55:32 +00:00
James Allen
51b7d8d837 Point settings and logger to github 2014-02-17 15:07:12 +00:00
Henry Oswald
347671c89b Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-02-14 18:13:33 +00:00
Henry Oswald
65f849aad0 fixed bug where file uploader was calling cb on read stream not write stream, race condition created. 2014-02-14 18:13:22 +00:00
James Allen
f4225d38cb Remove unused js files 2014-02-14 15:10:35 +00:00
James Allen
fd911c278f Move copyright images into brand directory 2014-02-14 11:44:09 +00:00
James Allen
4ec7deb7d6 Move plans.css to brand folder 2014-02-14 11:36:06 +00:00
James Allen
3c110ea250 Organise social icons 2014-02-14 11:27:37 +00:00
James Allen
77b7b69a61 Fix formatting in README 2014-02-13 18:19:51 +00:00
James Allen
5ea231dea6 Sort iconshock icons into directory and add credit 2014-02-13 18:18:05 +00:00
James Allen
6eff979e2a Move nide images into one folder 2014-02-13 15:35:44 +00:00
James Allen
e3a2c6ce49 Organise pictos icons 2014-02-13 15:10:49 +00:00
James Allen
754ecaca3c Group Fam Fam silk icons together with readme.txt 2014-02-13 15:00:55 +00:00
James Allen
7fb0dadbfd Remove unneeded image files 2014-02-13 14:47:29 +00:00
Henry Oswald
b46f320882 linked to my twitter on about page 2014-02-13 14:32:07 +00:00
Henry Oswald
3c98dfec90 add Monendra to security acknowledgements list 2014-02-13 14:31:23 +00:00
James Allen
768fd20850 Allow NewletterManager to be called without a callback 2014-02-13 12:37:23 +00:00
James Allen
8715690ce9 Intial open source comment 2014-02-12 10:23:40 +00:00
Charley Peng
3f6e240401 adding callback on error 2007-03-01 16:53:59 +11:00