Commit graph

20708 commits

Author SHA1 Message Date
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
James Allen
5fc139db00 Return version numbers of updates 2014-03-06 11:00:49 +00:00
Oliver Matthews
b73d7f23c3 don't log doc contents if file is unchanged. 2014-03-06 10:53:59 +00:00
James Allen
aadce232a1 Use version numbers for sorting and querying, not dates 2014-03-06 10:45:51 +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
Henry Oswald
e8b245e857 check that res has not already been sent before sending catch 500 2014-03-05 18:13:40 +00:00
James Allen
bf21305c68 Add in basic list of changes in track changes view 2014-03-05 17:55:47 +00:00
Henry Oswald
2f22563d59 changed key for templates to put /v/ in for version 2014-03-05 17:39:27 +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
James Allen
2e1307bd82 Doc is always one version ahead of latest op version 2014-03-05 16:31:38 +00:00
Henry Oswald
32f9e33f71 removed heap analytics for the time being 2014-03-05 15:59:48 +00:00
James Allen
3660253fd4 Add in /updates end point to get updates 2014-03-05 15:59:40 +00:00
Henry Oswald
64257a7b2c testing out new google analytics 2014-03-05 15:45:24 +00:00
James Allen
a46963a349 Refactor arguments to MongoManager.getUpdatesBetweenDates 2014-03-05 15:06:46 +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
James Allen
188d620ce1 Log out and put the last update back when an error occurs 2014-03-05 13:22:38 +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
1e1c14e5fe Merge pull request #11 from cwoac/FSPersistorManager
Fs persistor manager - merge from cwoac
2014-03-05 10:39:26 +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
James Allen
e4d8cc7a11 Add in acceptance tests for getting a diff 2014-03-04 15:27:03 +00:00
Oliver Matthews
f920fd0b16 match refactor_config on cwoac/sharelatex 2014-03-04 15:24:50 +00:00
Oliver Matthews
957df0eb04 Don't dump streams to log files. 2014-03-04 14:45:32 +00:00
Henry Oswald
711e95a82a delete converted file when finished to clean up 2014-03-04 14:30:52 +00:00
James Allen
8b71d222d4 Create DiffManager.getDiff 2014-03-04 14:05:17 +00:00
James Allen
1d1dcdfa2f Add in methods for retrieving updates and doc version 2014-03-04 13:02:48 +00:00
Henry Oswald
94a6504635 cranked up kill to child processes to killSignal: "SIGKILL" 2014-03-04 12:44:16 +00:00
James Allen
5d45e191f3 Don't crash when logging out error 2014-03-04 12:39:02 +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
James Allen
20d70859aa Create buildDiff function 2014-03-03 17:39:59 +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
James Allen
8d044b7f13 Fix acceptance tests 2014-03-03 13:36:05 +00:00
James Allen
ba2c4768d0 Use port 3015 by default 2014-03-03 13:31:10 +00:00
James Allen
c15df4c2aa Add in /status end point 2014-03-03 13:14:01 +00:00
Henry Oswald
dd22f1f7a1 added redis connection settings into rate limiter 2014-03-03 11:46:40 +00:00
Oliver Matthews
40e2cb1c6d fix tabbing 2014-03-01 15:23:11 +00:00
Oliver Matthews
88cc89a0d1 filter /s from key ids 2014-03-01 15:10:47 +00:00
James Allen
e0402692cf Add in diff generating functions 2014-03-01 13:31:34 +00:00
James Allen
76cdd5cf98 Delete only the updates that were processed, not a full batch 2014-03-01 11:42:31 +00:00
James Allen
86195ce7c3 Add in load throttling based on a redis key 2014-02-28 19:09:29 +00:00
James Allen
3d70f9126e Flush track changes api every 50 updates 2014-02-28 18:29:05 +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
James Allen
d1e18d82aa Add simple benchmark script 2014-02-26 17:35:10 +00:00
James Allen
77c5a27e12 Set up acceptance tests in TravisCI 2014-02-26 16:54:35 +00:00
James Allen
3570e8f408 Use grunt forever to run service daemonized for acceptance testing on travis 2014-02-26 16:44:13 +00:00
James Allen
53db11466b Fix YAML 2014-02-26 16:39:58 +00:00
James Allen
cef17a7fbc Experiment with acceptance tests in Travis 2014-02-26 16:36:53 +00:00
James Allen
6e9485c0c4 Add README and LICENSE 2014-02-26 16:29:14 +00:00
James Allen
1e7fc3dc29 Add Travis CI 2014-02-26 16:27:09 +00:00
James Allen
834f41eea1 Remove Rakefile 2014-02-26 16:17:26 +00:00
James Allen
ad18c1d5a5 Add Gruntfile 2014-02-26 16:17:15 +00:00
James Allen
f3192da87f Tell track changes api to flush doc when flushing doc to mongo 2014-02-26 15:56:52 +00:00
Oliver Matthews
7c5634044f Allow selection of FS persistor manager. Only require the chosen persistor manager. 2014-02-26 15:15:03 +00:00
Christopher Adams
2b5e369b98 Fix example request URL and JSON 2014-02-26 10:13:09 -05:00
Oliver Matthews
ff96f37b2d unit test passing version of FSPersistorManager 2014-02-26 15:10:55 +00:00
Christopher Adams
d829f83226 Correct installation task from compile to install 2014-02-26 10:09:18 -05:00
James Allen
dfd3ec993b Ensure version is still returned from redis 2014-02-26 14:49:52 +00:00
James Allen
a21f8a8004 Add acceptance test for batch processing 2014-02-26 12:44:13 +00:00
James Allen
80af34895b Refactor and improve acceptance tests 2014-02-26 12:38:47 +00:00
James Allen
d27872c9bd Get acceptance tests running 2014-02-26 12:11:45 +00:00
Oliver Matthews
53bcdccc04 change the method for assuming s3 2014-02-26 11:58:48 +00:00
Oliver Matthews
e0f0bfb0ea revert settings.persistorManager 2014-02-26 11:49:15 +00:00
James Allen
45fe6978af Add in /doc/<doc-id>/flush endpoint 2014-02-26 11:34:56 +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
James Allen
65360a9a2b Continue to process raw updates until redis is empty 2014-02-26 11:18:26 +00:00
James Allen
8405a37c2c Add a lock around processing updates 2014-02-26 10:55:20 +00:00
Oliver Matthews
4b5f9ad4fb make s3 chosen if no config option specified
rename *wrapper  to FilestoreManager
remove ToS3 from filestore commands
rename configuration option for filestore.
add details of interface to FilestoreWrapper.coffee for reference.
remove api comments
rename settings.filestoreManager to settings.persistorManager
2014-02-26 10:24:51 +00:00
Henry Oswald
c9af5e5420 Renamed fsWrapper to PersistorManager
not 100% happy with that still but its the best I can see so far
2014-02-26 09:15:37 +00:00
Henry Oswald
49ffeb633d fix where cacheWarm param is read from and improved some logging 2014-02-26 09:06:47 +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
f33a3bde3e Create processUncompressedUpdates method 2014-02-25 16:48:42 +00:00
Henry Oswald
d41eca68a2 Merge pull request #8 from cwoac/localfs
Allow multiple backends
2014-02-25 16:37:16 +00:00
James Allen
34d3847fe4 Add Redis Manager for fetching and deleting uncompressed ops 2014-02-25 16:27:14 +00:00
Oliver Matthews
5f87dfb3bf add unit tests for fsWrapper
make other unit tests no longer depend on fsWrapper
2014-02-25 15:52:30 +00:00
James Allen
8ae9bcd60f Ensure that updates are compressed in continuous incrementing order 2014-02-25 12:28:15 +00:00
James Allen
c723fbb789 Remove fold all command which interferes with typing } on Danish keyboards 2014-02-25 10:58:35 +00:00
Oliver Matthews
c43533b5cb move test wrapper into fsWrapper where appropriate 2014-02-25 10:54:51 +00:00
Oliver Matthews
f68080d56c create mixin to allow switching of backend 2014-02-25 09:10:22 +00:00
James Allen
de783bf5b0 Pull out MongoManager module and add tests 2014-02-24 17:43:27 +00:00
James Allen
b13f70eadb Push ops into uncompressedHistoryOps list 2014-02-24 16:52:12 +00:00
James Allen
6f19f46d96 Create method for pushing uncompressed ops into redis 2014-02-24 16:40:29 +00:00
James Allen
9cf883e59f Merge branch 'master' into remove_mongo_doc_ops 2014-02-24 16:17:30 +00:00
James Allen
7a977ca597 Don't store ops in Mongo, just keep them in redis with a timeout 2014-02-24 16:13:36 +00:00
James Allen
0dea22a8e9 Add in Travis CI badge 2014-02-24 14:45:00 +00:00
James Allen
64fec8aed7 Update README.md 2014-02-24 14:44:03 +00:00
James Allen
86e42ce1de Update README.md 2014-02-24 14:43:33 +00:00
James Allen
6b450a45a7 Update .travis.yml 2014-02-24 14:42:36 +00:00
James Allen
49feb6b839 Update .travis.yml 2014-02-24 14:40:42 +00:00
James Allen
55edef6d3d Update .travis.yml 2014-02-24 14:37:38 +00:00
James Allen
4d6d4eb6a2 Create .travis.yml 2014-02-24 14:27:06 +00:00
James Allen
4756b488ee Create .travis.yml 2014-02-24 14:26:38 +00:00
James Allen
1a7d2643c0 Create .travis.yml 2014-02-24 14:24:44 +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
45437c6006 change repo URL from git+ssh:// to git+https:// 2014-02-21 23:10:26 +08:00
goodbest
aa9f8882ee change repo URL from git+ssh:// to git+https:// 2014-02-21 23:09:38 +08:00
goodbest
b4482ab41f change repo URL from git+ssh:// to git+https:// 2014-02-21 23:08:19 +08:00
James Allen
07d858e5c3 Use https git URLs instead of SSH 2014-02-21 15:04:41 +00:00
Anton Ilin
0a94441998 Typo fix
Should be "downloaded" not "downlaoded" :)
2014-02-21 14:29:06 +02: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
Henry Oswald
159670a3d4 reduced timeout to 20 seconds 2014-02-20 11:45:51 +00:00
Henry Oswald
99e15dc12f upped https connections to 300 and added debug logging 2014-02-19 21:03:03 +00:00
Henry Oswald
fada5ecaf4 converted get stream to use knox, test to see if it is more robust 2014-02-19 20:56:45 +00:00
Henry Oswald
3f54688ec8 added max sockets to s3 wrapper, getting some ETIMEDOUT under laod, may be cause 2014-02-19 18:39:25 +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
Henry Oswald
b24ae77f4c call callback when error returned from getign status of file 2014-02-19 15:26:00 +00:00
Henry Oswald
0a2ce3b869 fixed missleading log file 2014-02-19 15:24:29 +00:00
Henry Oswald
90ad2c24c6 call the callback when no response is returned from s3 when checking if file exists 2014-02-19 14:58:36 +00:00
Henry Oswald
960b46dda0 increased timeout to 4 mins.... 2014-02-19 14:48:16 +00:00
Henry Oswald
b85017759e added more logging 2014-02-19 14:48:16 +00:00
Henry Oswald
531b83a032 added more logging 2014-02-19 14:48:15 +00:00
Henry Oswald
d0600a4b64 changed optimisation to optipng and added timeouts to conversions 2014-02-19 14:48:15 +00:00
Henry Oswald
f63cdb3515 changed thumbnail and preview to be smaller 2014-02-19 14:48:15 +00:00
James Allen
f77906e01e Create README.md 2014-02-19 14:48:15 +00:00
James Allen
5d86dfacd7 Create LICENSE 2014-02-19 14:48:15 +00:00
Henry Oswald
f99a6dc39b changed file converted to use child process with nice 2014-02-19 14:48:12 +00:00
James Allen
9d66fcf715 Use sqlite in development 2014-02-18 17:41:25 +00:00
James Allen
d249158676 Don't try to fingerprint plans.css 2014-02-18 17:37:39 +00:00
James Allen
53929197dd Create LICENSE 2014-02-18 17:23:36 +00:00
James Allen
b45a9968b3 Create README.md 2014-02-18 17:23:12 +00:00
James Allen
e4eca94cdb Update README.md 2014-02-18 17:11:52 +00:00
James Allen
70c6b0b8da Create LICENSE 2014-02-18 17:09:54 +00:00
James Allen
df4516ce95 Update README.md 2014-02-18 17:08:26 +00:00
James Allen
85275a9373 Create README.md 2014-02-18 16:58:21 +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
Henry Oswald
1ff5a5adb8 changed error log message 2014-02-17 18:50:28 +00:00
Henry Oswald
5b49ec1144 don't exit on error 2014-02-17 16:32:28 +00:00
Henry Oswald
7501046ebc improved logging 2014-02-17 16:31:33 +00:00
James Allen
110e623a0d Point npm modules at github 2014-02-17 15:09:53 +00:00
James Allen
ff7f2eae04 Use master branch of logger-settings module 2014-02-17 15:09:12 +00:00
James Allen
8e8d25e185 Point custom npm modules to github 2014-02-17 15:08:46 +00:00
James Allen
51b7d8d837 Point settings and logger to github 2014-02-17 15:07:12 +00:00
James Allen
27251a1df1 Install custom npm modules from github 2014-02-17 15:06:53 +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
fb02e40423 Standardize grunt file 2014-02-14 16:46:08 +00:00
James Allen
3199aad601 Initial open source commit 2014-02-14 16:39:05 +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
8771817cdf Fix unit tests 2014-02-13 11:11:53 +00:00
James Allen
73c652fb2c Update a missed setting 2014-02-13 11:08:40 +00:00
James Allen
414b669a2c Point every redis connection to the new config 2014-02-13 10:36:26 +00:00
James Allen
5587ac0acb Fix up smoke tests 2014-02-13 09:33:39 +00:00
James Allen
46b36839e2 Initial open source commit 2014-02-12 17:27:43 +00:00
James Allen
a5d816272e Remove unused DocumentUpdater.js file 2014-02-12 10:52:53 +00:00
James Allen
e1a7d4f24a Initial open sourcing 2014-02-12 10:40:42 +00:00
James Allen
8715690ce9 Intial open source comment 2014-02-12 10:23:40 +00:00
James Allen
d040e7c410 Add acceptance tests for multiple appends 2014-01-27 18:20:38 +00:00
James Allen
d4295c2023 Create HttpController for HTTP requestS 2014-01-27 18:09:37 +00:00
James Allen
5dea123b13 Get append end point working with a simple acceptance test 2014-01-27 17:51:09 +00:00
James Allen
533b8e59a3 Big refactor to use better names and separation of concerns 2014-01-27 16:26:58 +00:00
James Allen
8a0aa55c91 Refactor to take doc ops from an HTTP request from doc updater 2013-09-03 17:17:27 +01:00
James Allen
dab2781e87 Do two passes better 2013-08-23 14:58:00 +01:00
James Allen
dbee4a57fb Compress doc ops in two passes 2013-08-23 14:35:13 +01:00
James Allen
bef05c31f4 No need to print the entire history each time 2013-08-09 13:54:30 +01:00
James Allen
7a3b78da43 Return when calling callback 2013-08-09 13:51:02 +01:00
James Allen
07f078b527 Don't insert a null update if there are no updates or raw updates 2013-08-09 13:46:03 +01:00
James Allen
fe503010aa Pop and set history in batches for speed 2013-08-09 13:27:35 +01:00
James Allen
3ab45c2a35 Handle if two updates cancel each other 2013-08-09 12:36:17 +01:00
James Allen
54c7959647 Match if both user ids are null/undefined 2013-08-09 12:26:23 +01:00
James Allen
64eb794c02 Compress all docs using compressHistory script 2013-08-09 11:36:19 +01:00
James Allen
c5e7f14ba1 Factor methods out into ConversionManager 2013-08-09 11:10:19 +01:00
James Allen
7e96933cf2 Initial commit of script for compressing one docs history 2013-08-08 16:42:14 +01:00
Charley Peng
3f6e240401 adding callback on error 2007-03-01 16:53:59 +11:00