Commit graph

19237 commits

Author SHA1 Message Date
Brian Gough
8bc5f53562 Merge pull request #253 from sharelatex/per-user-containers-part-1
Per user containers part 1
2016-06-10 09:40:00 +01:00
Henry Oswald
e06581541e Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image 2016-06-09 18:30:02 +01:00
Henry Oswald
1519329dac move left_footer and co to bottom of settings file 2016-06-09 18:29:27 +01:00
Henry Oswald
240280a0ae get rid of config commands 2016-06-09 16:59:57 +01:00
ShareLaTeX
289c234889 Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image 2016-06-09 15:52:36 +00:00
Henry Oswald
7d5382f668 don't instal config with grunt 2016-06-09 16:43:18 +01:00
Henry Oswald
342ab43c6b point to texlive 2016 2016-06-09 16:22:27 +01:00
Henry Oswald
a40360feaf allow header and footer to be configured via env vars 2016-06-09 16:21:54 +01:00
Brian Gough
feeed9faaf Merge pull request #39 from sharelatex/per-user-containers-part-1
Per user containers part 1
2016-06-09 15:17:35 +01:00
ShareLaTeX
dad3a74a7f add grunt cut task 2016-06-09 11:36:00 +00:00
Marc Egea i Sala
d143baf489 Add more logging to commit action (#16) 2016-06-09 10:26:22 +01:00
James Allen
9ff3026807 Merge branch 'master' into ja_redis_cluster 2016-06-09 10:00:58 +01:00
James Allen
48a92b28e5 Don't run redis commands in parallel for easier consistency reasoning 2016-06-09 09:54:13 +01:00
Henry Oswald
307f21287f Merge branch 'master' of https://github.com/sharelatex/sharelatex 2016-06-08 17:03:34 +01:00
Henry Oswald
2fa60e86f3 removed old files no longer used 2016-06-08 17:03:19 +01:00
James Allen
c823e06912 Don't run redis commands in parallel for easier consistency reasoning 2016-06-08 16:42:09 +01:00
James Allen
c6605ed5f0 Fix misapplied arguments to multi commands 2016-06-08 16:41:58 +01:00
James Allen
437e885812 Lock down to specific async version 2016-06-08 16:21:56 +01:00
Brian Gough
47574d7c7e Merge pull request #252 from sharelatex/per-user-containers-part-0
Per user containers part 0
2016-06-08 15:55:17 +01:00
Shane Kilkelly
42f2b262c2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:41:38 +01:00
Henry Oswald
895af7c07a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-08 15:36:20 +01:00
Henry Oswald
ed17bd026d added delete user script in grunt 2016-06-08 15:36:08 +01:00
Shane Kilkelly
ad6e9e039d Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-08 15:31:24 +01:00
Shane Kilkelly
6ca2e2204b If user is in beta program, show link to opt-out page on the settings page. 2016-06-08 15:31:14 +01:00
Shane Kilkelly
8f1fec8c4f Add opt-out action to beta page 2016-06-08 15:11:39 +01:00
Brian Gough
6c244eb2f4 Merge pull request #251 from sharelatex/fix-download-urls
fix filename of downloaded pdf files
2016-06-08 14:33:12 +01:00
James Allen
b4936f62af Check that return values from different redis backends match 2016-06-08 12:18:37 +01:00
Shane Kilkelly
58d7d7bf74 Re-work wording of beta opt-in page. 2016-06-08 11:38:14 +01:00
Shane Kilkelly
90dac348ff refine beta opt-in workflow. 2016-06-08 11:04:44 +01:00
Shane Kilkelly
20485cbfed Merge branch 'sk-beta-program' 2016-06-08 10:34:03 +01:00
Shane Kilkelly
009fa79589 remove trailing parens. 2016-06-08 10:33:21 +01:00
James Allen
ef43e2b325 Configure backend database as redis cluster 2016-06-07 18:38:32 +01:00
James Allen
1db6f8f159 Pull out rclient into RedisBackend that supports sending requests to multiple rclients 2016-06-07 17:58:18 +01:00
Henry Oswald
989c178546 use process id so link process to smoke test 2016-06-07 14:47:51 +01:00
Henry Oswald
f0dc5d6f86 add random string to smoke tests to avoid collision 2016-06-07 14:39:01 +01:00
Shane Kilkelly
0dfd80d307 Use css to add the beta symbol to the beta-label 2016-06-07 14:04:02 +01:00
Shane Kilkelly
8c9d15a3e4 Tweak style of the beta-feature-badge class. 2016-06-07 13:42:27 +01:00
Shane Kilkelly
2598661c4c Use correct title for Beta Opt-in page 2016-06-07 13:42:06 +01:00
Shane Kilkelly
618d3ee269 fix missing require 2016-06-07 13:41:50 +01:00
Shane Kilkelly
d8f1e8ec93 Add basic BetaProgram feature. 2016-06-07 11:15:56 +01:00
Marc Egea i Sala
cb2e12d3b0 Merge pull request #15 from overleaf/handler-refactor
Put API handlers into their own namespace
2016-06-07 07:57:07 +01:00
Henry Oswald
4029b76d9e - make system messages default tab in admin panel
- add manage site tab to dropdown
2016-06-06 16:11:26 +01:00
Henry Oswald
a297c07bbb added null check into response.outputFiles? 2016-06-06 14:56:34 +01:00
Henry Oswald
79929eae73 Merge branch 'clsichecks' 2016-06-06 14:34:22 +01:00
Henry Oswald
b0743a3c2a added realtime to list of repos 2016-06-06 14:25:51 +01:00
Shane Kilkelly
fdacf13782 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-06-06 13:12:31 +01:00
Shane Kilkelly
4e63a3c7bd Move betaProgram flag up to top-level of user object 2016-06-06 13:12:24 +01:00
Henry Oswald
829b37cd74 set user email on session again on change email 2016-06-06 10:50:45 +01:00
Henry Oswald
2339cda318 added contentful uni pages as fallback 2016-06-06 09:28:53 +01:00
John Lees-Miller
4fb9cbdf19 Restore a removed logging statement 2016-06-03 16:45:16 +01:00