bb84e2098d
Merge branch 'master' into timeline
...
Conflicts:
plume-models/src/instance.rs
src/routes/instance.rs
2019-09-18 18:30:17 +02:00
Trinity Pointard
7e0f9677f0
Merge remote-tracking branch 'origin/master' into timeline
2019-09-13 12:03:17 +02:00
Trinity Pointard
29d2815209
Merge branch 'master' into timeline
2019-09-13 11:51:26 +02:00
Trinity Pointard
e03e3fa511
cargo fmt
2019-08-13 14:03:55 +02:00
Trinity Pointard
12a952f016
reduce code duplication by macros
2019-08-13 12:27:59 +02:00
Trinity Pointard
98904c9ec5
fix reviewed stuff
2019-07-28 18:15:22 +02:00
Trinity Pointard
e746b595c9
Merge branch 'master' into timeline
2019-07-23 10:37:50 +02:00
Trinity Pointard
fdd4132522
revert translations
2019-07-23 10:36:51 +02:00
Baptiste Gelez
07d788b0f3
Forgot to run cargo fmt once again
2019-07-07 22:03:57 +02:00
Baptiste Gelez
e1a225afbd
Use Kind::Like and Kind::Reshare when needed
2019-07-07 21:48:21 +02:00
Baptiste Gelez
5ee87ef6f2
Fix the tests ? + fmt
2019-06-25 08:48:28 +01:00
Baptiste Gelez
cb6c0a6493
Fix the test (for real this time ?)
2019-06-24 21:50:44 +01:00
Baptiste Gelez
6987b8f405
Fix tests
2019-06-24 21:29:02 +01:00
Baptiste Gelez
aea9f99f4f
Try to fix the migration
2019-06-24 20:20:24 +01:00
Baptiste Gelez
91cf1b5926
Cargo fmt
2019-06-24 19:12:37 +01:00
Baptiste Gelez
aa521b58d2
Use the new timeline system
...
- Replace the old "feed" system with timelines
- Display all timelines someone can access on their home page (either their personal ones, or instance timelines)
- Remove functions that were used to get user/local/federated feed
- Add new posts to timelines
- Create a default timeline called "My feed" for everyone, and "Local feed"/"Federated feed" with timelines
@fdb-hiroshima I don't know if that's how you pictured it? If you imagined it differently I can of course make changes.
I hope I didn't forgot anything…
2019-06-24 18:55:34 +01:00
Baptiste Gelez
7957de2042
Make the main crate compile + FMT
2019-06-22 19:12:29 +01:00
Baptiste Gelez
72bc84a045
Add a more complex test for Timeline::matches, and fix TQ::matches for TQ::Or
2019-06-22 18:34:59 +01:00
Baptiste Gelez
caaec076d7
Merge branch 'timeline' of github.com:Plume-org/Plume into timeline
2019-06-22 16:03:15 +01:00
Trinity Pointard
87f6637d05
Merge branch 'master' into timeline
2019-06-15 22:48:28 +02:00
Trinity Pointard
08cefa8395
add test for language filtering
2019-05-26 09:29:10 +02:00
Trinity Pointard
0f74891f87
add test for matching direct lists and keywords
2019-05-19 18:13:33 +02:00
Trinity Pointard
aad1609afa
add tests for timelines
2019-05-19 10:25:26 +02:00
Trinity Pointard
cf165c4e28
Merge branch 'master' into timeline
...
and fix deprecation warning from ructe
2019-05-18 22:17:41 +02:00
Trinity Pointard
4dafdb8a25
Merge branch 'master' into timeline
2019-05-10 20:16:38 +02:00
Trinity Pointard
5280c1de3c
cargo fmt
2019-05-10 20:13:20 +02:00
Trinity Pointard
22747f8cf8
add tests for timeline creation failure
2019-05-10 20:05:40 +02:00
Trinity Pointard
457f832061
fix tests
2019-05-05 08:47:00 +02:00
Trinity Pointard
2c0ef71fe4
Merge branch 'master' into timeline
2019-05-04 17:37:05 +02:00
Trinity Pointard
fd9f3162a9
remove timeline order
2019-05-01 12:08:53 +02:00
Trinity Pointard
7eb1d5cbbd
cargo fmt
2019-05-01 11:53:43 +02:00
Trinity Pointard
cd73f4f200
add some tests for timeline
...
add an int representing the order of timelines (first one will be on
top, second just under...)
use first() instead of limit(1).get().into_iter().nth(0)
remove migrations from build artifacts as they are now compiled in
2019-05-01 11:49:04 +02:00
Trinity Pointard
c96e53e793
don't use diesel for migrations
...
not sure how it passed the ci on the other branch
2019-04-29 17:28:48 +02:00
Trinity Pointard
53dd1e63a5
Merge branch 'master' into timeline
2019-04-29 16:38:02 +02:00
Baptiste Gelez
a15633f956
WIP: interface for timelines
2019-04-28 23:13:00 +01:00
Baptiste Gelez
eec8b3480c
Update .po files
2019-04-28 22:44:13 +01:00
Baptiste Gelez
1f70cafecd
Merge branch 'master' into timeline
2019-04-28 22:42:55 +01:00
Trinity Pointard
afc17f1dfa
add timeline creation error message when using unexisting lists
2019-04-25 23:52:18 +02:00
Trinity Pointard
09671816a1
add lang support
2019-04-25 23:22:19 +02:00
Trinity Pointard
d006de8f2f
add function to list lists used by query
...
will make it easier to warn users when creating timeline with unknown lists
2019-04-25 22:55:21 +02:00
Trinity Pointard
b3ff0401b0
cargo fmt
2019-04-25 14:06:50 +02:00
Trinity Pointard
b38a1c13dc
add keywords for including/excluding boosts and likes
2019-04-25 13:29:39 +02:00
Trinity Pointard
65c47c24fe
Merge branch 'master' into timeline
2019-04-23 22:26:57 +02:00
Trinity Pointard
7a92b4f5ce
Merge branch 'master' into timeline
2019-04-23 20:33:12 +02:00
Trinity Pointard
2e08029649
add support for lists in query executor
2019-04-17 19:38:25 +02:00
Trinity Pointard
51e57601a1
add more tests for lists
2019-04-17 16:19:02 +02:00
Trinity Pointard
2086ce7ee4
Add some constraint to db, and fix list test
...
and refactor other tests to use begin_transaction
2019-04-17 15:20:04 +02:00
Trinity Pointard
701ec1f274
try to add some tests
2019-04-16 20:21:09 +02:00
Trinity Pointard
5b2f046acc
cargo fmt
2019-04-15 09:56:35 +02:00
Trinity Pointard
9d8b4da5a6
end adding lists
...
still miss tests and query integration
2019-04-14 15:08:08 +02:00
Trinity Pointard
4226295bad
add sqlite migration
2019-04-14 13:15:42 +02:00
Trinity Pointard
f55113f823
begin adding support for lists
...
also run migration before compiling, so schema.rs is up to date
2019-04-13 22:55:19 +02:00
Trinity Pointard
c009cbac6d
add rejection tests for parse
2019-04-12 11:36:10 +02:00
Trinity Pointard
9902893280
add tests for timeline query parser
2019-04-12 00:07:54 +02:00
Trinity Pointard
6a321465bb
add error reporting for parser
2019-04-11 22:35:01 +02:00
Trinity Pointard
9e7b06015a
fmt
2019-04-11 20:54:24 +02:00
Trinity Pointard
ff75bf4048
fix some bugs with parser
2019-04-11 20:45:27 +02:00
Trinity Pointard
2112288817
Begin adding support for timeline
2019-04-11 20:14:41 +02:00