Commit graph

20839 commits

Author SHA1 Message Date
Winston Li
6f5b316c52 Rejecting all pushes. 2014-11-03 09:31:06 +00:00
Winston Li
af39d0d8d0 Removed JDK info from build.xml. 2014-11-02 20:03:51 +00:00
Winston Li
5c2e461b2b Ant working locally. Copied JUnit .jars into project. 2014-11-02 19:57:55 +00:00
Winston Li
abe140c9e7 Changed deps to all in build.xml. 2014-11-02 19:16:15 +00:00
Winston Li
b1de769fc3 Changed generated ant .xml file to build.xml. 2014-11-02 19:13:27 +00:00
Winston Li
e3a6530918 Made .travis.yml file. 2014-11-02 19:01:32 +00:00
Winston Li
4f1c28e8c2 Refactored package names. 2014-11-02 18:47:54 +00:00
Winston Li
2d8580f02b Class and package refactoring with unit tests. 2014-11-02 18:41:18 +00:00
Winston Li
c2fea2ee06 Created classes. 2014-11-02 17:26:55 +00:00
Winston Li
c075a62e95 Marked test directory as test sources root. 2014-11-02 17:20:54 +00:00
Winston Li
535c54b5a5 Initial test server. 2014-11-02 17:15:31 +00:00
Winston Li
f5143e547a Added Jetty .jar to project and created .gitignore for out/ directory. 2014-11-02 16:56:35 +00:00
Winston Li
d1ef703af0 Added jgit.http.server javadocs. 2014-11-01 19:37:18 +00:00
Winston Li
905af06917 Added jgit.http.server jar to project. 2014-11-01 19:35:59 +00:00
Winston Li
2df4f1b0e0 Added JGit library and its JavaDocs. 2014-11-01 16:42:00 +00:00
Winston Li
7039dc36e3 Added initial ant build files. 2014-11-01 16:21:10 +00:00
Winston Li
c63c32c5e3 Idea project. 2014-11-01 16:11:26 +00:00
Winston Li
dcf5055f5a Create README.md 2014-11-01 16:02:46 +00:00
Winston Li
9f38a40cd2 Initial commit 2014-11-01 16:02:22 +00:00
Henry Oswald
ccae47979f added chinese flags under cn 2014-10-31 13:21:04 +00:00
Henry Oswald
30100f2a07 fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync 2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4 wiki will try and get spanish version of page then fall back to english if it is not there 2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050 added file ref null check 2014-10-31 10:50:20 +00:00
Henry Oswald
0f4d9771aa added null check to where we insert elements into a project 2014-10-31 10:37:44 +00:00
Henry Oswald
d428e7e5b4 handle a null in the file refs list
this seems to happen now and then when there is networking issues
2014-10-31 10:34:21 +00:00
Henry Oswald
4f590d7acb added chinese flags in 2014-10-30 11:52:45 +00:00
Henry Oswald
14d32af6bf allow ace to scoll off screen 2014-10-30 08:33:54 +00:00
Henry Oswald
56efefd6d4 renamed variable 2014-10-30 08:33:18 +00:00
James Allen
a39c356014 Update acceptance tests for new knitr, and remove markdown 2014-10-29 10:59:32 +00:00
James Allen
5216526191 Force mimetype of output files to be safe 2014-10-28 12:07:26 +00:00
James Allen
ca664e0063 Get subscription status correctly for showing upgrade/bonus link 2014-10-27 15:00:46 +00:00
James Allen
2a69e185ce Append spell check menu to body so it isn't hidden by PDF view resizer 2014-10-27 14:51:28 +00:00
James Allen
184189fa3f Disable hotkeys for layout panels since they interfere with text editing 2014-10-27 14:47:06 +00:00
James Allen
f1ddff4061 Only ignore hidden files from Dropbox, not GitHub 2014-10-27 14:39:20 +00:00
Henry Oswald
f4be1884d3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-27 11:23:50 +00:00
Henry Oswald
011bdc4617 explicitly set the file types to delete
the wild card version can get mixed up with app.del  '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
James Allen
2debba6bbc Update PGP key 2014-10-24 11:55:30 +01:00
Henry Oswald
0a123418ac insert ref data into uni page 2014-10-23 14:13:40 +01:00
Henry Oswald
fab0dc5cbc change button to a 2014-10-23 11:51:35 +01:00
Henry Oswald
b067e0d0a4 fixed email us button on templates 2014-10-23 11:18:04 +01:00
Henry Oswald
0f8519f619 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-21 14:57:52 +01:00
James Allen
d64577fb9d Update README.md 2014-10-21 14:20:53 +01:00
Henry Oswald
c60f11519f added ga logging of starting free trial again 2014-10-21 14:06:53 +01:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
James Allen
281c4eb4e3 Style tweaks for uni site 2014-10-21 13:39:47 +01:00
Henry Oswald
4bd0708029 put the compile group on the session so proxied requests are sent to the correct place
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4 Revert "priority compiles are proxyed to the priority servers"
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d priority compiles are proxyed to the priority servers 2014-10-20 17:48:00 +01:00
Henry Oswald
36136a99ca fixed escaping of html 2014-10-20 15:46:42 +01:00
Henry Oswald
0a7bc1c5f1 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
Conflicts:
	app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee
2014-10-20 14:25:26 +01:00