Commit Graph
1946 Commits
Author SHA1 Message Date
Alasdair Smith 0114ed362f Swap out email templates based on brand prefix 2017-12-21 10:26:14 +00:00
Alasdair Smith 1fc527ff48 Fix OL auto-linking styles 2017-12-21 09:59:19 +00:00
Alasdair Smith 9657108146 Add OL themed email templates 2017-12-20 17:53:45 +00:00
Alasdair Smith 7f7916f5b1 Clean up whitespace 2017-12-20 17:52:49 +00:00
Alasdair Smith b1f656826e Remove unnecessary & incorrect title 2017-12-20 14:10:05 +00:00
Paulo Reis 0a0c6c6c0c Merge branch 'master' into pr-style-v2-chatpane 2017-12-20 09:50:49 +00:00
James Allen 339b7ec14f Merge branch 'ja-allow-importing-without-history' 2017-12-19 15:06:17 +00:00
James AllenandGitHub 1d89a535a1 Merge pull request #208 from sharelatex/ja-front-end-history
Add in web front end that supports v2 history; Fixes #168
2017-12-19 15:00:34 +00:00
James AllenandGitHub 0a4febfce6 Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only
only hash the static content when minified is on
2017-12-19 15:00:15 +00:00
James Allen 731cd57250 Make intermediate argument signature clearer 2017-12-19 13:59:06 +00:00
James Allen 5463b608ad Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history 2017-12-19 13:59:06 +00:00
James Allen 8311101ec0 Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps 2017-12-19 13:58:47 +00:00
James Allen 50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen 4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
Henry Oswald 70298ba65c only hash the static content when minified is on 2017-12-19 13:13:31 +00:00
Paulo Reis cb83e2c1b2 Tone down chat colors. 2017-12-19 10:52:23 +00:00
Hayden Faulds ac36de9629 make ProjectEntityHandler._clean* argument signatures consistent 2017-12-18 15:15:36 +00:00
Hayden Faulds 938caed4f7 set userId when deleting entities via the tpds 2017-12-18 15:15:36 +00:00
Hayden Faulds ca15fdb6eb pass userId to EditorHttpController.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds 5f6686ed3b pass userId to ProjectEntityHandler.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds 2ac74b9adc pass userId into _clean methods in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds 475e84b039 version entity deletions in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds 81c061c6a7 acceptance test moving entities 2017-12-18 15:15:36 +00:00
Hayden Faulds e5e75a8ccb update DocumentUpdaterHandler.updateProjectStructure to support entity deletions 2017-12-18 15:15:36 +00:00
Henry Oswald 7aaf08da48 added no-cache endpoint 2017-12-15 13:38:34 +00:00
Henry OswaldandGitHub 7693d274b7 Merge pull request #209 from sharelatex/ho-hash-static
Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified
2017-12-15 09:52:23 +00:00
Henry Oswald bf276b0814 ripped file fingerprinting out 2017-12-14 12:11:13 +00:00
Henry Oswald cbf656518f remove versioned files from fingerprinting 2017-12-14 11:24:47 +00:00
Paulo Reis 36c79979bd More color adjustments. 2017-12-14 11:24:06 +00:00
Paulo Reis c03ce6fdf7 Configure chat messages colors per brand. 2017-12-14 11:24:05 +00:00
Paulo Reis e47b20390b Add per brand UI specific chat message styles. 2017-12-14 11:24:05 +00:00
Henry Oswald 288af6772a write hashes for all files we fingerprint 2017-12-14 10:59:46 +00:00
Henry Oswald 490c56c692 libs -> libraries
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald 716b309208 remove todo statments 2017-12-13 16:50:18 +00:00
Alasdair Smith 4a9c9c563a Merge branch 'master' into as-autocompile-rollout-60 2017-12-13 14:44:31 +00:00
Henry Oswald dd6bd3b91e Merge branch 'master' into ho-hash-static 2017-12-13 14:25:32 +00:00
Henry Oswald 88334959d7 added remove extension 2017-12-13 14:13:45 +00:00
Henry Oswald 65efbbce53 seems to work now. 2017-12-13 13:06:38 +00:00
Alasdair SmithandGitHub 60b00d2b94 Merge pull request #196 from sharelatex/as-clean-up-failed-import
Add unsupported file type error
2017-12-13 10:31:02 +00:00
Henry Oswald 80e6a660be wip, this does not work minified yet
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
Alasdair Smith 5c62ac4f8a Change error type for consistency 2017-12-12 12:59:10 +00:00
Paulo Reis 59e675797e Merge branch 'master' into pr-style-v2-resizers 2017-12-11 15:55:50 +00:00
Paulo Reis 0652fc62a0 Configure resizer cursors for v2. 2017-12-11 15:33:00 +00:00
James Allen 53dc8cddfc Refactor captcha into middleware and angular service 2017-12-11 12:58:55 +00:00
James Allen 83086e4a79 Add recaptch to share endpoint 2017-12-11 11:57:59 +00:00
Henry Oswald 314dcd1901 added null checks to mandrill 2017-12-11 11:48:31 +00:00
Alasdair Smith 89bdb6eff9 Increase autocompile rollout to 60% 2017-12-11 11:45:53 +00:00
Henry Oswald bd7e2d956d add mandrill as email option 2017-12-11 11:05:04 +00:00
Alasdair Smith 6198491e5f Add unsupported file type error 2017-12-08 11:31:44 +00:00
Nate StemenandGitHub d224e09b5e Merge pull request #192 from sharelatex/ns-remove-labels
removing labels service
2017-12-07 09:38:00 -05:00