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 |
|
Magnus Hoff
|
26fc263cd4
|
Reword about page. Add list of dependencies and licenses
|
2017-11-07 15:54:46 +01:00 |
|
Magnus Hoff
|
7ad2a2ad73
|
Add SIL Open Font License
|
2017-11-07 15:49:26 +01:00 |
|
Magnus Hoff
|
ce7c0893bc
|
Cleanup
|
2017-11-06 16:28:31 +01:00 |
|
Magnus Hoff
|
a796f299a4
|
Add link to diff view from article revision
|
2017-11-06 16:26:37 +01:00 |
|
Magnus Hoff
|
f9905e6548
|
Avoid generating invalid diff links in changes feed
|
2017-11-06 16:07:25 +01:00 |
|
Magnus Hoff
|
5acca0ddb7
|
Add links to the article before and after diff
|
2017-11-06 15:58:16 +01:00 |
|
Magnus Hoff
|
ac5ff0dbcc
|
Add link to article history from diff page
|
2017-11-06 15:52:51 +01:00 |
|
Magnus Hoff
|
bfd2acda4f
|
Get article revisions from database during diff lookup.
Diffs for missing revisions now cause 404-errors
|
2017-11-06 15:45:11 +01:00 |
|
Magnus Hoff
|
2e5b549ea8
|
Restructure the diff resource so it is only possible to see diffs between revisions of the same article
|
2017-11-06 15:09:21 +01:00 |
|
Magnus Hoff
|
c24c5a84d5
|
Generate links to diffs from changes feed
|
2017-11-06 13:37:46 +01:00 |
|
Magnus Hoff
|
9cb3da86e2
|
Also render diff of title
|
2017-11-06 13:06:32 +01:00 |
|
Magnus Hoff
|
2042e5e7fe
|
Style diff a little bit better
|
2017-11-06 12:55:13 +01:00 |
|
Magnus Hoff
|
4ae2637192
|
Fix print CSS to avoid extra blank page at the end
|
2017-11-03 00:35:29 +01:00 |
|
Magnus Hoff
|
73b5ffc719
|
Add CSS for print
|
2017-11-03 00:16:18 +01:00 |
|
Magnus Hoff
|
e563faf81a
|
Refactor lookup of license resources
|
2017-11-02 15:34:36 +01:00 |
|
Magnus Hoff
|
29a7d58b41
|
Use maplit for static hash map literal
|
2017-11-02 15:19:23 +01:00 |
|
Magnus Hoff
|
5ea9dbef71
|
Add BSD-3-Clause to list of licenses
|
2017-11-02 15:16:16 +01:00 |
|