Commit Graph
25726 Commits
Author SHA1 Message Date
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
John Lees-Miller 7cb82f3c18 Add tests for file content API 2016-06-03 16:22:10 +01:00
John Lees-Miller 42d1236063 Check for missing project before checking key 2016-06-03 16:11:31 +01:00
John Lees-Miller 1ac07526dc Reorganise postbacks and files under /api 2016-06-03 16:11:02 +01:00
Marc Egea i Sala 2a87513603 Merge pull request #14 from overleaf/performance-improvements
Build RepositoryObjectTreeWalker only once per commit
2016-06-03 15:46:32 +01:00
Marc Egea i Sala 34854b0184 Merge pull request #13 from overleaf/logging-fixes
Use logback to split logging streams
2016-06-03 15:46:06 +01:00
Marc Egea i Sala f4d4ce0da1 Build RepositoryObjectTreeWalker only once per commit 2016-06-03 15:40:48 +01:00
John Lees-Miller 7ed93bc2cc Log to temp file when running tests 2016-06-03 11:47:25 +01:00
John Lees-Miller 64b49904e4 Use logback so we can use two log streams
We want all logs on stdout, for debugging, and warnings and errors
on stderr, for remote monitoring. The SLF4J SimpleLogger can't seem
to do this, but logback does, and we can still use the same SLF4J
interface.
2016-06-03 11:47:25 +01:00
Shane Kilkelly 56c0604b96 upgrade to node 4.2.1 2016-06-03 10:58:53 +01:00
John Lees-Miller 4bd4ef47af Merge pull request #12 from overleaf/dependency-updates
Dependency updates and general housekeeping
2016-06-03 09:35:43 +01:00
Brian Gough 634c774592 make code clearer when compilation is per-user 2016-06-02 16:54:46 +01:00