|
|
ba52dd9fa7
|
Merge remote-tracking branch 'upstream/develop' into pleroma2
|
2017-08-24 06:26:58 +00:00 |
|
|
|
6998897a34
|
Limit the number of feed entries (Can solve resub problems)
|
2017-08-23 23:01:37 +00:00 |
|
rabuzarus
|
d990f9b32f
|
Merge pull request #3648 from annando/develop
Issue 3645: Avoid problems with boolean values
|
2017-08-23 22:59:01 +02:00 |
|
|
|
2293757a36
|
Just some empty lines
|
2017-08-23 20:33:32 +00:00 |
|
|
|
e533572ca3
|
Issue 3645: Avoid problems with boolean values
|
2017-08-23 19:40:42 +00:00 |
|
Michael Vogel
|
f83ad77624
|
Merge pull request #3647 from tobiasd/20170823-en
update EN US and GB variations
|
2017-08-23 15:37:11 +02:00 |
|
|
|
277465fa1f
|
update EN US and GB variations
|
2017-08-23 14:53:37 +02:00 |
|
|
|
b378f5fb01
|
The "hub" url now contains the nickname
|
2017-08-23 05:01:15 +00:00 |
|
|
|
e607a9dcda
|
Our user feeds now look more like OStatus
|
2017-08-22 10:18:07 +00:00 |
|
|
|
fdc8190567
|
Merge pull request #3642 from annando/pleroma
Compatibility with pleroma added
|
2017-08-22 08:40:36 +02:00 |
|
|
|
51dca9b034
|
Compatibility with pleroma added
|
2017-08-21 20:21:04 +00:00 |
|
|
|
c9daecb80d
|
Merge pull request #3640 from annando/better-smiley-support
Preparation for Unicode Emojis
|
2017-08-21 06:54:15 +02:00 |
|
|
|
85c49060e2
|
Preparation for Unicode Emojis
|
2017-08-20 19:47:00 +00:00 |
|
|
|
db5b42579b
|
Merge pull request #3638 from annando/issue-3560-2
When "local_search" is activated, point all hashtags to the local server
|
2017-08-19 12:21:37 +02:00 |
|
|
|
17b05c9ad9
|
Hash tag links now do a redir
|
2017-08-19 09:22:50 +00:00 |
|
|
|
f8946c9e0a
|
When "local_search" is activated, then point all hashtags to the local server
|
2017-08-18 22:12:40 +00:00 |
|
|
|
5c5db12706
|
Merge pull request #3635 from annando/better-dfrn-status
DFRN: Improved delivery status handling
|
2017-08-16 07:44:34 +02:00 |
|
|
|
e10bb40e1a
|
Added logging
|
2017-08-16 04:53:15 +00:00 |
|
|
|
791fc1d8b3
|
DFRN: Improved delivery status handling
|
2017-08-16 04:08:57 +00:00 |
|
Michael Vogel
|
23c4e934e9
|
Merge pull request #3634 from tobiasd/20170815-de
DE translations
|
2017-08-15 21:17:40 +02:00 |
|
|
|
33b3ad991c
|
DE translations
|
2017-08-15 19:54:08 +02:00 |
|
|
|
0abdb26507
|
Merge pull request #3633 from annando/dba-bugfix
Further database corrections
|
2017-08-15 13:30:34 +02:00 |
|
|
|
6c9953809a
|
Improved position of "close"
|
2017-08-15 10:10:09 +00:00 |
|
|
|
a0567d4081
|
dbm::is_result now checks whether a dba:... call returns at least one result
|
2017-08-15 06:08:26 +00:00 |
|
|
|
d2b7a44299
|
Merge pull request #3631 from annando/1708-libertree
Shared posts to Libertree now look better.
|
2017-08-15 07:44:53 +02:00 |
|
|
|
dd08e22bea
|
Merge pull request #3632 from annando/bugfix-3630
Bugfix for PR 3630
|
2017-08-15 07:41:30 +02:00 |
|
|
|
3290ccc779
|
Now some more stuff is fixed
|
2017-08-14 21:46:58 +00:00 |
|
|
|
4f6f47f714
|
Now the bugfix really should work
|
2017-08-14 20:58:02 +00:00 |
|
|
|
2d99e86b12
|
Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value
|
2017-08-14 20:17:17 +00:00 |
|
|
|
3c59eefa22
|
Shared posts to Libertree now look better.
|
2017-08-14 19:16:28 +00:00 |
|
|
|
cdc41d6018
|
Merge pull request #3630 from annando/dba-2
Several more replaced database calls
|
2017-08-14 10:46:40 +02:00 |
|
|
|
796cee6273
|
Cleaning code
|
2017-08-14 05:52:36 +00:00 |
|
|
|
b3e20b1685
|
New database version
|
2017-08-14 05:49:49 +00:00 |
|
|
|
1fa82581b6
|
Avoid warning
|
2017-08-14 05:47:25 +00:00 |
|
|
|
217a8ce6ee
|
Events now work again
|
2017-08-14 05:05:32 +00:00 |
|
|
|
0ac725dc47
|
Some more updated queries
|
2017-08-12 22:15:16 +00:00 |
|
|
|
41a81624a2
|
Now deletions will also work with complicated queries
|
2017-08-12 18:07:47 +00:00 |
|
rabuzarus
|
509c247a41
|
Merge pull request #3628 from tobiasd/20170818-messages
regenerated master messages.po file
|
2017-08-12 18:49:17 +02:00 |
|
|
|
89017d4e6c
|
DBA: The condition can now be a complex string
|
2017-08-12 13:54:29 +00:00 |
|
|
|
1d8c91c478
|
Restructured "dba::exists" function
|
2017-08-12 08:55:50 +00:00 |
|
|
|
0fb7793bfa
|
regenerated master messages.po file
|
2017-08-12 09:43:28 +02:00 |
|
|
|
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 |
|
|
|
0babc2c96e
|
Merge pull request #3626 from annando/issue-3616
Issue 3616: Don't create notifications for forum accounts
|
2017-08-12 07:52:14 +02:00 |
|
|
|
e6db0f12aa
|
Merge pull request #3625 from annando/issue-3615
Issue 3615: Probing sometimes returned an empty "addr" field
|
2017-08-12 07:51:00 +02:00 |
|
|
|
3b67ef3e9c
|
wrong url
|
2017-08-12 07:46:37 +02:00 |
|
|
|
51f6c46923
|
Issue 3616: Don't create notifications for forum accounts
|
2017-08-12 05:08:45 +00:00 |
|
|
|
7052da745c
|
Issue 3615: Probing sometimes returned an empty "addr" field
|
2017-08-11 21:50:46 +00:00 |
|
|
|
4ada71081f
|
No timeout problem anymore in preview.
|
2017-08-11 20:25:02 +00:00 |
|
|
|
556cc0cc4c
|
And some more changed lines
|
2017-08-11 19:26:08 +00:00 |
|
