serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
318 commits 10 branches 153 tags 1 MiB
Commit graph

186 commits

Author SHA1 Message Date
Magnus Hoff
c201bb4bc4 Add test page for themes 2018-07-10 08:46:51 +02:00
Magnus Hoff
963d70ff7a Add dynamic-assets feature to facilitate rapid feedback when working on the assets 2018-07-09 21:27:34 +02:00
Magnus Hoff
0b5bff6356 Refactor handling of generated unique names for resources 2018-06-24 23:00:35 +02:00
Magnus Hoff
38c70f7b25 Select persistent theme per page based on title 2018-06-17 21:25:35 +02:00
Magnus Hoff
e4629d8edb Refactor rendering of pages to centralize header layout. 
Convert all pages to new layout
 2018-06-17 10:43:47 +02:00
Magnus Hoff
0a48ff2a54 Factor choice of theme into Layout struct 2018-06-16 14:30:18 +02:00
Magnus Hoff
7e6fe36ea0 Serve articles with a random theme 2018-06-16 11:24:34 +02:00
Magnus Hoff
67ac61ee42 Add CSS defining color schemes/themes 2018-06-16 10:51:51 +02:00
Magnus Hoff
28c8422e6b Tweak full text search representation of documents 2018-06-13 23:13:38 +02:00
Magnus Hoff
d577eabc9b Port to stable diesel API for user defined sqlite functions 2018-06-13 22:46:53 +02:00
Magnus Hoff
a582d3a627 Merge branch 'master' into process_markdown_in_sqlite 2018-06-13 22:22:08 +02:00
Magnus Hoff
75e33b2766 Update to get rid of warnings that appeared when upgrading diesel. 
One warning remains: unused import: `EmbedMigrations`. This one has been fixed in diesel, but not yet released
 2018-06-13 22:03:55 +02:00
Magnus Hoff
d63ccd06b7 Cleanup 2018-05-12 14:36:52 +02:00
Magnus Hoff
c72ee90929 Return Result from main (requires Rust 1.26) 2018-05-12 14:34:09 +02:00
Magnus Hoff
b1e598cb17 Experimentally transform markdown for better presentation in full text search results 
For issue #37
 2018-01-19 16:49:26 +01:00
Magnus Hoff
e499a095c7 Use experimental Diesel branch for application defined sqlite functions 2018-01-19 16:47:40 +01:00
kyegupov
8b838ac8c9 Fix tests after diff bump; drive-by prettify diff tests (#56) 2017-12-17 17:14:39 +01:00
Magnus Hoff
6e3f1dab07 Upgrade to Diesel 1.0.0-beta1 2017-12-15 16:43:10 +01:00
Magnus Hoff
b7a7ae53ab Update to Diesel 0.99 
This fixes #49
 2017-12-15 16:29:24 +01:00
Magnus Hoff
2bf201e3fd Inject soft hyphen into commit hash so it works better on more screens 2017-11-30 13:24:13 +01:00
Magnus Hoff
7dd5c046b7 Merge branch 'proper_html_handling' 2017-11-29 22:52:42 +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
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