Commit graph

2662 commits

Author SHA1 Message Date
Henry Oswald
46374f39ff Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-15 12:08:16 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +01:00
Paulo Reis
d7e4009504 Small styling enhancements. 2016-06-15 10:48:40 +01:00
Paulo Reis
3310a3ea3f Change tooltip copy; get it from i18n catalogue. 2016-06-14 17:20:16 +01:00
Paulo Reis
a9e0185098 Added tooltip with keyboard shortcut in the recompile button. 2016-06-14 17:02:22 +01:00
Brian Gough
d6964feb2f Revert "enable per-user containers by default"
This reverts commit e80b8cd907605d9a7aad16496d49efff4bb08810.
2016-06-14 16:30:06 +01:00
Brian Gough
d0a273fac1 Merge pull request #257 from sharelatex/fix-synctex-position-calculation
Fix synctex position calculation
2016-06-14 15:07:48 +01:00
Brian Gough
77de4dd432 Merge pull request #258 from sharelatex/enable-per-user-container
enable per-user containers by default
2016-06-14 15:07:37 +01:00
Brian Gough
ed6c384b68 fix urls of downloaded files to those provided by clsi 2016-06-14 14:51:33 +01:00
Brian Gough
ecd9bed1c2 enable per-user containers by default 2016-06-14 14:21:56 +01:00
Brian Gough
991d3c7aa1 avoid exception when switching between full and split pdf view 2016-06-14 12:49:06 +01:00
Brian Gough
2840a7757f fix bug in synctex position calculation for syncToCode 2016-06-14 12:32:54 +01:00
Brian Gough
830d15136d fix missing variables in pdf sync 2016-06-14 08:49:08 +01:00
Paulo Reis
c815ba6ed2 Added Paulo Reis photo for the about page. 2016-06-13 15:34:16 +01:00
Henry Oswald
f9fdec8a15 whitelist /user/activate for non public access 2016-06-13 15:24:41 +01:00
Henry Oswald
84db5ec23a added logging and default calback 2016-06-13 13:38:30 +01:00
Henry Oswald
f3e48e332b explicit call to UserCreator.createNewUser 2016-06-13 13:38:17 +01:00
Henry Oswald
3bc3153490 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-06-13 13:24:04 +01:00
Henry Oswald
c52af1393e should be able to set first and last name via user details on registration 2016-06-13 13:21:44 +01:00
Brian Gough
49a7c3c27b Merge branch 'per-user-containers-part-2'
Conflicts:
	app/coffee/Features/Compile/ClsiManager.coffee
	app/coffee/Features/Compile/CompileController.coffee
	app/coffee/Features/Compile/CompileManager.coffee
2016-06-13 12:24:48 +01:00
Brian Gough
e6dcce21fd use build_id and user_id instead of build and user 2016-06-10 12:11:47 +01:00
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
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
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
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
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
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
Brian Gough
634c774592 make code clearer when compilation is per-user 2016-06-02 16:54:46 +01:00
Brian Gough
55a8e3cffe extend tests for per-user compiles 2016-06-02 15:48:13 +01:00
Brian Gough
ce1524cd07 remove unnecessary build id in query string
this is now in the url
2016-06-02 15:48:13 +01:00
Brian Gough
272625fbcc add per-user compilation in client
enabled only when query string includes isolated=true
2016-06-02 15:48:13 +01:00