Commit graph

355 commits

Author SHA1 Message Date
Magnus Hoff
342f996c8e Eliminate one weird install step by using tar instead of xz directly 2017-11-30 12:16:42 +01:00
Magnus Hoff
7dd5c046b7 Merge branch 'proper_html_handling' 2017-11-29 22:52:42 +01:00
Magnus Hoff
c780450dc3 Grammar 2017-11-29 16:52:31 +01:00
Magnus Hoff
1953baddbd Strike out brew install instructions, due to bug 2017-11-29 16:46:48 +01:00
Magnus Hoff
7e930a5df1 Words 2017-11-29 15:47:23 +01:00
Magnus Hoff
861765c85a Add brew formula 2017-11-29 15:45:03 +01:00
Magnus Hoff
b8be70ad27 Add link to documentation for enabling authentication. For #29 2017-11-29 14:31:01 +01:00
Magnus Hoff
74d2c18943 Use heuristic to guess that we hit a login redirect on saving 2017-11-29 12:53:41 +01:00
Magnus Hoff
2e406f4480 Handle authorization problems when saving article with JS 2017-11-24 17:26:46 +01:00
Magnus Hoff
af358fe22c Tweak 2017-11-24 12:20:02 +01:00
Magnus Hoff
fc7bf4cac1 Update USAGE in README 2017-11-22 14:48:06 +01:00
Magnus Hoff
afa48f5f85 Link to wiki page on making backups 2017-11-21 16:36:14 +01:00
Magnus Hoff
f261d66a3a Link to systemd install instructions 2017-11-21 14:14:57 +01:00
Magnus Hoff
98a8dd8aca Tweak print style for <pre> 2017-11-21 11:55:52 +01:00
Magnus Hoff
07c3f4204f Always update body text when editing, it could be changed server-side due to merging 2017-11-21 09:57:59 +01:00
Magnus Hoff
0f835fa312 Update tests 2017-11-20 16:48:31 +01:00
Magnus Hoff
a09aa4b601 Expose merge conflicts in the JavaScript editor. This fixes #23 2017-11-20 16:37:52 +01:00
Magnus Hoff
b685139d5b Implement merge conflict handling for the noscript case #23 2017-11-20 16:07:33 +01:00
Magnus Hoff
bf9716ccb8 Propagate rebase conflicts out from state object 2017-11-20 15:08:34 +01:00
Magnus Hoff
bfca5d6e78 Rebase title edits, #23 2017-11-20 13:12:36 +01:00
Magnus Hoff
b862ad8c73 Add test for rebasing over multiple revisions 2017-11-20 12:41:14 +01:00
Magnus Hoff
e92eab2c8f Automatically rebase edits to historic revisions, for #23 2017-11-20 12:37:44 +01:00
Magnus Hoff
9be9575639 Cleanup, obsolete attribute 2017-11-20 11:16:27 +01:00
Magnus Hoff
8519480fe4 Use build.rs to properly trigger rebuilds when env vars change, for #44 2017-11-20 10:26:35 +01:00
Magnus Hoff
83b011b9c9 Add more build info. This fixes #44 2017-11-20 10:19:49 +01:00
Magnus Hoff
88b3df21c2 Refactor build information and add more information #44 2017-11-20 10:12:10 +01:00
Magnus Hoff
990f570a31 Tests for article merging 2017-11-17 16:17:05 +01:00
Magnus Hoff
1eff18e659 Implement high level merge function 2017-11-17 16:13:48 +01:00
Magnus Hoff
dfefe78b2b Resolve output from tree-way diff chunks 2017-11-17 15:32:45 +01:00
Magnus Hoff
34ca3e424d Remove Chunk categorization from MergeIterator 2017-11-17 12:41:09 +01:00
Magnus Hoff
1985677474 Cleanup, refactor 2017-11-16 16:38:50 +01:00
Magnus Hoff
f6818f5a7f Maintain state in slices instead of indices 2017-11-16 16:31:24 +01:00
Magnus Hoff
ed5db344fb Emit slices instead of indices 2017-11-16 16:21:49 +01:00
Magnus Hoff
b48816e143 Borrow instead of move 2017-11-16 15:52:32 +01:00
Magnus Hoff
29a6ec6725 Cleanup, more descriptive names 2017-11-16 15:43:45 +01:00
Magnus Hoff
df39e658cd Start implementing merge, for #23 2017-11-16 15:38:45 +01:00
Magnus Hoff
d241da35fb More tests 2017-11-16 10:44:55 +01:00
Magnus Hoff
2665fb3b8a Add a test for State 2017-11-15 16:27:28 +01:00
Magnus Hoff
7b485f87b9 Refactor State, centralizing db connection and cpu pool handling 2017-11-15 15:58:33 +01:00
Magnus Hoff
59e1ca8fb4 Cleanup 2017-11-15 15:12:17 +01:00
Magnus Hoff
403158ddda Split entry point into main.rs and lib.rs.
This might enable some integration tests
2017-11-15 15:06:18 +01:00
Magnus Hoff
b2e8b45100 Avoid copyright notice for MPL2-licensed dependencies
The license does not include a copyright notice
2017-11-14 16:14:28 +01:00
Magnus Hoff
334b17ae56 Add license and attribution for musl 2017-11-14 14:48:52 +01:00
Magnus Hoff
efd1cc4b5c Update license-hound 2017-11-14 14:39:48 +01:00
Magnus Hoff
3521fd76b3 Add license information for missing crates 2017-11-14 14:37:31 +01:00
Magnus Hoff
1911a914ef Generate license attributions from JSON
JSON is mainly generated by cargo-license-hound
2017-11-14 13:06:50 +01:00
Magnus Hoff
f2ad17b33f Split codegen crate into modules 2017-11-14 11:40:28 +01:00
Magnus Hoff
249e428107 Rename proc macro helper crate 2017-11-14 11:35:13 +01:00
Magnus Hoff
21905b3506 Cleanup 2017-11-14 11:29:31 +01:00
Magnus Hoff
43f8ec439e "Hide" editor pages from search engines
They are essentially duplicates of the article pages
2017-11-14 11:21:41 +01:00