Commit graph

3890 commits

Author SHA1 Message Date
Michael
c12075a005 Merge remote-tracking branch 'upstream/develop' into network-page 2017-09-15 06:42:33 +00:00
Tobias Diekershoff
0384e875a2 Merge pull request #3702 from annando/new-dba
The old database function is now replaced with a wrapper
2017-09-15 08:31:25 +02:00
Michael
c3589dc043 Added documentation 2017-09-14 06:10:33 +00:00
Michael
c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
Michael
92537d6926 Rearranged code 2017-09-13 09:20:08 +00:00
Michael
a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +00:00
Michael
3dcd281de4 Rearranged code 2017-09-12 11:04:59 +00:00
Michael
c636b0a6b2 We can now unfollow a contact without deleting it 2017-09-12 06:08:24 +00:00
Michael
4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
Michael
637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael
d25670a4e6 "remote self" should work now 2017-09-06 16:20:14 +00:00
Michael
b1668ffdda Address instead of url 2017-09-01 19:32:12 +00:00
Michael
88fb02db8d Small correction 2017-08-31 12:10:17 +00:00
Michael
0e8104b172 Links to profiles in mails mow show the profile address and "redir" always works 2017-08-31 12:01:44 +00:00
Michael
5f33f28b9e Display hadn't shown public items that weren't known to the user 2017-08-30 20:20:01 +00:00
Michael
5ab697e726 Removed unused template variable 2017-08-30 06:20:01 +00:00
Michael
02179e9419 Some missing tab 2017-08-30 06:16:31 +00:00
Michael
04f286dca2 Support for JSON based webfinger 2017-08-30 05:34:37 +00:00
Michael
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Michael
c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael
21b239cbc7 Documentation was updated. (Reference to poormancron removed) 2017-08-25 02:49:25 +00:00
Michael
6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
Michael
2293757a36 Just some empty lines 2017-08-23 20:33:32 +00:00
Michael
b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
Michael
e607a9dcda Our user feeds now look more like OStatus 2017-08-22 10:18:07 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
Michael
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael Vogel
adf06e9c81 Merge pull request #3627 from tobiasd/20170812-invite
wrong url
2017-08-12 09:33:14 +02:00
Tobias Diekershoff
3b67ef3e9c wrong url 2017-08-12 07:46:37 +02:00
Michael
05393a6faa Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-11 16:24:33 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
d352a290fe Parameter wasn't replaced 2017-08-11 08:55:07 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Tobias Diekershoff
e6e8ebbac5 Merge pull request #3622 from annando/new-dba
Enhanced dba functions, several replaced database calls
2017-08-11 08:11:20 +02:00
Tobias Diekershoff
e89e008565 missing bracket 2017-08-10 10:31:45 +02:00
Michael
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Tobias Diekershoff
6504156508 add a switch to the Markdown parser for using hard line breaks (issue 3592) 2017-08-09 16:04:53 +02:00
Tobias Diekershoff
ee6956a91a else is sufficient here 2017-08-03 07:23:05 +02:00
Tobias Diekershoff
0c8c69371c no global directory URL defined? 2017-08-03 07:22:29 +02:00
Tobias Diekershoff
6cf951c930 use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:48:01 +02:00
Tobias Diekershoff
7034d6efbd use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:47:09 +02:00