 Tobias Diekershoff
|
088837e1d1
|
Merge pull request #3606 from AndyHee/20170731-en_USGB_translations
Update US and GB Translations
|
2017-07-31 19:35:04 +02:00 |
|
 Andy H
|
fc3bb1ec70
|
Update US and GB Translations
|
2017-07-31 21:18:22 +07:00 |
|
|
Tobias Diekershoff
|
390e34d587
|
Merge pull request #3605 from annando/better-endless-scroll
Endless scroll now avoids showing the same items
|
2017-07-31 11:09:45 +02:00 |
|
 Michael
|
c98ae304c0
|
Endless scroll now avoids showing the same items
|
2017-07-31 06:04:37 +00:00 |
|
|
Tobias Diekershoff
|
8cb4a8d0c4
|
Merge pull request #3604 from annando/bugfix-acl
Bugfix: The ACL lookup had its problems after the last changes
|
2017-07-27 17:03:46 +02:00 |
|
|
Michael
|
57b4ea4759
|
Bugfix: The ACL lookup had its problems after the last changes
|
2017-07-27 14:02:25 +00:00 |
|
|
Tobias Diekershoff
|
83425a784b
|
Merge pull request #3603 from annando/fix-ostatus
Fix incomplete webfinger data for OStatus
|
2017-07-26 07:27:37 +02:00 |
|
|
Michael
|
955229e131
|
Fix incomplete webfinger data for OStatus
|
2017-07-25 21:46:14 +00:00 |
|
|
Tobias Diekershoff
|
f3f42ae3a2
|
Merge pull request #3602 from annando/1707-expiration
Bugfix: the expiration check in item_store now works again
|
2017-07-23 22:21:30 +02:00 |
|
Michael Vogel
|
95301fd58c
|
Merge pull request #3600 from tobiasd/20170723-doc
include the delete item page in the docs for the admin panel
|
2017-07-23 22:07:05 +02:00 |
|
|
Michael Vogel
|
11aa314f1b
|
Merge pull request #3601 from tobiasd/20170723-credits
regen credits
|
2017-07-23 22:06:39 +02:00 |
|
|
Michael
|
b266d7d6ff
|
Bugfix: the expiration check in item_store now works again
|
2017-07-23 19:59:29 +00:00 |
|
|
Tobias Diekershoff
|
b81499a7fc
|
regen credits
|
2017-07-23 19:54:08 +02:00 |
|
|
Tobias Diekershoff
|
7d97171eec
|
include the delete item page in the docs for the admin panel
|
2017-07-23 19:51:03 +02:00 |
|
|
Tobias Diekershoff
|
152eec4f2f
|
Merge pull request #3597 from annando/1707-acl-separator
In the acl there is now a separation between groups, forums and contacts
|
2017-07-23 10:27:40 +02:00 |
|
|
Tobias Diekershoff
|
2148a2bdb0
|
Merge pull request #3598 from annando/1707-expiration
Check general expiration time at item storing as well
|
2017-07-23 10:26:58 +02:00 |
|
|
Michael
|
2e704d79eb
|
In the acl there is now a separation between groups, forums and contacts
|
2017-07-23 06:49:31 +00:00 |
|
|
Michael
|
8d66909ba5
|
Check general expiration time at item storing as well
|
2017-07-23 05:51:55 +00:00 |
|
|
Tobias Diekershoff
|
dd0a1cf586
|
Merge pull request #3595 from annando/1707-realpath
Better use a wrapper
|
2017-07-22 09:32:29 +02:00 |
|
|
Michael
|
79fe249c54
|
Better use a wrapper
|
2017-07-22 06:43:04 +00:00 |
|
|
Tobias Diekershoff
|
541dd9ec39
|
Merge pull request #3594 from annando/1707-realpath
Use the realpath for the handling with (temporary) paths
|
2017-07-22 08:14:08 +02:00 |
|
|
Michael
|
5d7e1e1a15
|
Use the realpath for the handling with (temporary) paths
|
2017-07-22 05:50:25 +00:00 |
|
|
Michael Vogel
|
e854186134
|
Merge pull request #3591 from zotlabs/spammy_server_detection
reduce the number of network fetches for server detection of hubzilla…
|
2017-07-21 19:37:11 +02:00 |
|
|
Michael Vogel
|
0f67d82d05
|
Update socgraph.php
Two little style changes
|
2017-07-21 19:36:13 +02:00 |
|
zotlabs
|
a583bda5fc
|
reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes.
|
2017-07-19 17:56:40 -07:00 |
|
|
Tobias Diekershoff
|
6f661d50dc
|
Merge pull request #3590 from annando/1707-bugfixes
Fix crash with expiration, false logger constant, no empty postings
|
2017-07-19 17:06:01 +02:00 |
|
|
Michael
|
4a7ca0d44f
|
Fix crash with expiration, false logger constant, no empty postings
|
2017-07-19 05:51:39 +00:00 |
|
|
Tobias Diekershoff
|
f71bd4f1f7
|
Merge pull request #3587 from annando/1706-ostatus-attach
Attached picture from OStatus posts are now displayed
|
2017-07-17 22:38:56 +02:00 |
|
|
Michael
|
a5baba84af
|
Only show the attachment elements if there are one.
|
2017-07-17 19:49:58 +00:00 |
|
|
Michael
|
1c8e74edce
|
Attachments now look fine.
|
2017-07-17 19:38:15 +00:00 |
|
|
Michael
|
f65d6531ca
|
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
|
2017-07-15 10:36:56 +00:00 |
|
|
Tobias Diekershoff
|
a58f9b3aaa
|
Merge pull request #3585 from annando/bugfix-like-signature
Bugfix: Signatures for likes hadn't been stored
|
2017-07-15 08:22:27 +02:00 |
|
|
Michael
|
2bad626be6
|
Bugfix: Signatures for likes hadn't been stored
|
2017-07-15 04:03:50 +00:00 |
|
|
Michael
|
b49a36f949
|
The attached image has now a class
|
2017-07-15 04:02:12 +00:00 |
|
|
Michael Vogel
|
db0efc3fa8
|
Merge pull request #3584 from tobiasd/20170714-missingstring
there was a string not marked for translation
|
2017-07-14 22:48:27 +02:00 |
|
|
Tobias Diekershoff
|
b5f58d317e
|
there was a string not marked for translation
|
2017-07-14 15:21:08 +02:00 |
|
|
Michael
|
181947f774
|
Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Conflicts:
include/text.php
|
2017-07-13 20:38:18 +00:00 |
|
|
Tobias Diekershoff
|
86934119b1
|
Merge pull request #3580 from annando/issue-3571-2
Reworked "get_contact"
|
2017-07-13 08:34:59 +02:00 |
|
|
Tobias Diekershoff
|
3334e0332d
|
Merge pull request #3582 from annando/duplicate-error
Avoid duplicate database errors when storing the conversations
|
2017-07-13 08:30:20 +02:00 |
|
|
Tobias Diekershoff
|
e33a710d45
|
Merge pull request #3581 from annando/bugfix-markdown
Bugfix: Some special characters weren't converted correctly
|
2017-07-13 08:29:04 +02:00 |
|
|
Michael
|
4c7a197f4b
|
Avoid duplicate database errors when storing the conversations
|
2017-07-13 06:00:53 +00:00 |
|
|
Michael
|
beaa911bac
|
Bugfix: Some special characters weren't converted correctly
|
2017-07-13 05:57:37 +00:00 |
|
|
Michael
|
568abd537a
|
Fixed error reporting
|
2017-07-12 08:14:36 +00:00 |
|
|
Michael Vogel
|
cbca16de75
|
Merge pull request #3579 from tobiasd/20170712-de
DE translations
|
2017-07-12 08:29:10 +02:00 |
|
|
Tobias Diekershoff
|
8654b028ec
|
DE translations
|
2017-07-12 08:26:26 +02:00 |
|
|
Michael
|
69f20959ff
|
Update existing contact records with data from probing
|
2017-07-12 06:07:22 +00:00 |
|
|
Michael
|
a47e1e13d7
|
Process all data that we can fetch via probing
|
2017-07-12 05:56:35 +00:00 |
|
|
Michael
|
a8db1282e2
|
Merge remote-tracking branch 'upstream/develop' into issue-3571-2
|
2017-07-12 05:41:58 +00:00 |
|
|
Tobias Diekershoff
|
c54b7e84ab
|
Merge pull request #3578 from annando/probe-warning
Avoid "Invalid argument" warning in probing.
|
2017-07-12 07:21:31 +02:00 |
|
|
Michael
|
35b3723c4a
|
database logging now works for database errors
|
2017-07-11 19:14:49 +00:00 |
|