Michael Vogel
|
307beb47fd
|
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
include/ostatus.php
|
2015-12-22 11:25:37 +01:00 |
|
Fabrixxm
|
7f76c3dd41
|
Merge branch 'master' into develop
|
2015-12-22 10:50:52 +01:00 |
|
|
Michael Vogel
|
7ee1eb2978
|
Code clean up.
|
2015-12-20 10:44:03 +01:00 |
|
|
Michael Vogel
|
33f354a68c
|
Bugfix for the maximum load check in worker.
|
2015-12-16 00:14:53 +01:00 |
|
|
Michael Vogel
|
6e03477598
|
Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.
|
2015-12-15 23:26:58 +01:00 |
|
|
Michael Vogel
|
f42a7a3469
|
Just one more place where we had forgotten to use the bbcode function for the about text
|
2015-12-15 00:11:19 +01:00 |
|
|
Michael Vogel
|
d077dbbcde
|
Bugfix: The bbcode conversion of the profile was inconsistent
|
2015-12-14 23:53:35 +01:00 |
|
|
Michael Vogel
|
2e0ebcd1c8
|
The "about" in feed has to be rendered as HTML
|
2015-12-14 23:02:49 +01:00 |
|
|
Michael Vogel
|
b9abfd24f0
|
Rearrangements
|
2015-12-14 22:39:52 +01:00 |
|
rabuzarus
|
e61d6e030e
|
fix account_type
|
2015-12-14 14:12:56 +01:00 |
|
|
Michael Vogel
|
bc8f753900
|
Only optical stuff
|
2015-12-14 00:42:36 +01:00 |
|
|
Michael Vogel
|
a1a7bce603
|
Completely reworked delivery process.
|
2015-12-14 00:39:20 +01:00 |
|
|
Michael Vogel
|
e0b53aa0ac
|
OStatus: Make sure that mentions are always accepted
|
2015-12-13 14:10:18 +01:00 |
|
|
Michael Vogel
|
15063c8d5b
|
Code cleanup and first steps for a better comment distribition with DFRN and OStatus
|
2015-12-13 12:15:45 +01:00 |
|
|
Michael Vogel
|
169088b243
|
Maybe this solves the slapper problems ...
|
2015-12-13 12:12:32 +01:00 |
|
Tobias Diekershoff
|
b0f55ca9f2
|
Merge pull request #2176 from annando/1512-warning
Bugfix: Notice because of undefined constant
|
2015-12-13 10:22:13 +01:00 |
|
|
Michael Vogel
|
143e1a4a83
|
Bugfix: Warning because of undefined constant
|
2015-12-13 09:43:47 +01:00 |
|
|
Michael Vogel
|
ec9b1b7afd
|
There is now a fragmentation level for the table optimisation
|
2015-12-12 17:46:24 +01:00 |
|
|
Michael Vogel
|
02022b62a4
|
Some more work to make reshares work.
|
2015-12-12 10:41:42 +01:00 |
|
|
fabrixxm
|
e44b831a21
|
Merge pull request #2156 from gerhard6380/develop
new API calls for managing contact groups
|
2015-12-11 12:37:26 +01:00 |
|
|
Michael Vogel
|
6dd39760ac
|
Support for real repeated messages
|
2015-12-10 18:16:16 +01:00 |
|
|
Michael Vogel
|
45f4af66e7
|
OStatus: Basic support for groups, new function to detect reshared items
|
2015-12-10 01:10:54 +01:00 |
|
|
fabrixxm
|
f97e20acd3
|
add support to schema modification with multi-column primary key
|
2015-12-08 10:35:08 +01:00 |
|
|
Michael Vogel
|
a2fa791bbd
|
Always include the direct parent in the mentions
|
2015-12-07 23:35:33 +01:00 |
|
|
fabrixxm
|
f359731fc1
|
Merge pull request #2159 from annando/1512-worker-processes
Better control for the number of workers
|
2015-12-07 23:20:02 +01:00 |
|
|
Michael Vogel
|
88da58ed3e
|
OStatus: Deactivated The resharing until it is tested completely.
|
2015-12-07 23:06:28 +01:00 |
|
root
|
e1c6d80c01
|
change api/user/group_* to api/friendica/group_*
|
2015-12-07 22:18:55 +01:00 |
|
|
Michael Vogel
|
bfc0857953
|
OStatus: Send even Friendica comments to OStatus
|
2015-12-07 21:52:42 +01:00 |
|
Gerhard Seeber
|
8128a28a6c
|
new API calls for managing contact groups
|
2015-12-07 19:38:11 +01:00 |
|
|
Tobias Diekershoff
|
d944b65253
|
Merge pull request #2151 from annando/1512-misconfigured-friendica
Workaround for misconfigured Friendica servers with probe_url
|
2015-12-07 06:37:37 +01:00 |
|
|
Michael Vogel
|
6b0b9481cb
|
Bugfix for pull request #2147 (Fix for issue #2122)
|
2015-12-06 20:05:57 +01:00 |
|
|
Michael Vogel
|
fbbba6828b
|
Some better logging
|
2015-12-06 20:04:33 +01:00 |
|
|
Michael Vogel
|
d06717798b
|
Code beautification
|
2015-12-06 18:57:23 +01:00 |
|
|
Michael Vogel
|
f880bdd33b
|
Workaround for misconfigured Friendica servers
|
2015-12-06 18:52:19 +01:00 |
|
|
Michael Vogel
|
9f8da37c99
|
Move the process check at the beginning of the script
|
2015-12-06 16:40:31 +01:00 |
|
|
Michael Vogel
|
54085508e5
|
Double check for maximum number of workers
|
2015-12-06 16:28:28 +01:00 |
|
|
Michael Vogel
|
7c7baa77d6
|
probe_url: Only cache successful results
|
2015-12-06 12:15:31 +01:00 |
|
|
Michael Vogel
|
b57ae80206
|
Issue 2122: Make sure to always return the correct number of entries
|
2015-12-05 23:05:48 +01:00 |
|
|
Tobias Diekershoff
|
a8ab1bc947
|
Merge pull request #2146 from annando/1512-ostatus-picture-posts
Enhancements to picture posts to OStatus
|
2015-12-05 06:47:31 +01:00 |
|
root
|
37a70d3204
|
modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0.
|
2015-12-04 19:49:09 +00:00 |
|
|
Michael Vogel
|
25c2e219ee
|
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
|
2015-12-04 07:07:34 +01:00 |
|
|
Tobias Diekershoff
|
7ac7caef08
|
Merge pull request #2136 from annando/1512-diaspora-retractions
Support for a new Diaspora command for post retraction
|
2015-12-04 06:54:55 +01:00 |
|
|
Tobias Diekershoff
|
eaf975faae
|
Merge pull request #2130 from annando/1512-contact-rework
Some more contact rework
|
2015-12-04 06:53:29 +01:00 |
|
|
Michael Vogel
|
37bd03422b
|
The preview picture can now be remote or local
|
2015-12-04 06:50:23 +01:00 |
|
|
Michael Vogel
|
540d217134
|
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
|
2015-12-04 06:05:12 +01:00 |
|
|
Michael Vogel
|
f82ce0de66
|
Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts
|
2015-12-04 06:00:56 +01:00 |
|
|
Michael Vogel
|
bb45112544
|
OStatus: Picture posts are reformatted
|
2015-12-04 05:57:33 +01:00 |
|
|
rabuzarus
|
d94b96e546
|
ping: docu fix
|
2015-12-03 22:51:00 +01:00 |
|
|
rabuzarus
|
4b7f080c46
|
ping: further work
|
2015-12-03 22:42:53 +01:00 |
|
|
rabuzarus
|
c0406918ec
|
ping: cleanup
|
2015-12-03 17:15:49 +01:00 |
|
|
Fabrixxm
|
95508bf4bb
|
Allow multicolunn primary keys in dbstructure
|
2015-12-03 16:39:20 +01:00 |
|
|
Michael Vogel
|
1a170c8743
|
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
mod/contacts.php
mod/crepair.php
|
2015-12-03 14:38:04 +01:00 |
|
|
Michael Vogel
|
24f1a24208
|
Support for a new Diaspora command for post retraction
|
2015-12-03 08:35:47 +01:00 |
|
|
rabuzarus
|
3af7cff281
|
remove unneeded function page_type_translate()
|
2015-12-03 00:08:43 +01:00 |
|
|
rabuzarus
|
d963cdfe48
|
photos-albms widget: add some classes
|
2015-12-02 20:01:22 +01:00 |
|
|
rabuzarus
|
cd7ec72b20
|
unify hcard and vcard: make $pdesc available in hcard&vcard
|
2015-12-01 19:47:23 +01:00 |
|
rabuzarus
|
39b37281a7
|
Merge develop into 3011_hcard_vcard
|
2015-12-01 18:34:13 +01:00 |
|
|
rabuzarus
|
89c5989cfb
|
unify hcard and vcard
|
2015-12-01 18:31:08 +01:00 |
|
|
Michael Vogel
|
107204f405
|
Diaspora comments/likes: The contact id and the network is now taken from the contact
|
2015-12-01 15:36:32 +01:00 |
|
|
Tobias Diekershoff
|
146f386e37
|
Merge pull request #2126 from annando/1511-duplicates
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
|
2015-12-01 06:07:18 +01:00 |
|
|
Michael Vogel
|
712b3c7593
|
Merge pull request #2121 from rabuzarus/3011_viewcontactstitle
make viewcontacts part of the profile tab
|
2015-11-30 23:29:35 +01:00 |
|
|
Michael Vogel
|
b0898cc461
|
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
|
2015-11-30 23:13:56 +01:00 |
|
|
Michael Vogel
|
0278e60664
|
Merge pull request #2104 from rabuzarus/2611_contacts_directory
display contact information in contact and directory according to the…
|
2015-11-30 18:07:35 +01:00 |
|
|
rabuzarus
|
2ce64c2496
|
change shortcut for viewcontacts + shortcut docu
|
2015-11-30 16:23:03 +01:00 |
|
|
fabrixxm
|
2753e62483
|
Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
|
2015-11-30 14:45:23 +01:00 |
|
|
rabuzarus
|
45c2a4868e
|
make viewcontacts part of the profile tab
|
2015-11-30 03:25:23 +01:00 |
|
|
Michael Vogel
|
42d903dd68
|
Redesign of the contact pages, new tab for contact statuses
|
2015-11-29 23:22:05 +01:00 |
|
|
Tobias Diekershoff
|
f45a8f1a03
|
Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
|
2015-11-29 23:19:12 +01:00 |
|
|
Tobias Diekershoff
|
d3d0647ff8
|
Merge pull request #2108 from annando/1511-optimize-tables
Optimize tables on a daily base that are written very often
|
2015-11-29 23:18:06 +01:00 |
|
|
Tobias Diekershoff
|
93fd6dce84
|
Merge pull request #2111 from annando/issue-1925
Issue 1925 - display nickname@hostname.com
|
2015-11-29 19:48:08 +01:00 |
|
|
Tobias Diekershoff
|
3f2a55c267
|
Merge pull request #2118 from annando/1511-supported-networks
Only show supported networks in sidebar and contact list
|
2015-11-29 16:03:10 +01:00 |
|
|
Michael Vogel
|
2fabde5d2d
|
Added the old Facebook addon for addon check
|
2015-11-29 13:42:31 +01:00 |
|
|
Michael Vogel
|
8b23e77171
|
Only show supported networks in sidebar and contact list
|
2015-11-29 13:37:24 +01:00 |
|
|
Michael Vogel
|
1cd06df5fa
|
Bugfix: Only show the feed link for local profiles
|
2015-11-29 12:02:14 +01:00 |
|
|
Michael Vogel
|
583a2f709b
|
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
|
2015-11-29 10:25:44 +01:00 |
|
|
Michael Vogel
|
00cc409461
|
The photo menu now respects if the local users differs from the contact owner
|
2015-11-29 09:35:35 +01:00 |
|
|
Tobias Diekershoff
|
b67f33f6d5
|
Merge pull request #2109 from annando/1511-duplicated-tags-diaspora
Avoid duplicated tags in postings to Diaspora
|
2015-11-29 08:42:10 +01:00 |
|
|
Tobias Diekershoff
|
be40fb8186
|
Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
|
2015-11-29 08:40:39 +01:00 |
|
|
rabuzarus
|
f5597da059
|
forumlist - mark selected forum as selected
|
2015-11-28 23:52:12 +01:00 |
|
|
rabuzarus
|
a3059d02d4
|
group_side - unify look with forumlist
|
2015-11-28 20:09:28 +01:00 |
|
|
Michael Vogel
|
cd16eb14af
|
Show the name instead of the nick in the feed
|
2015-11-28 19:42:18 +01:00 |
|
|
Michael Vogel
|
25c0c5d4ad
|
Issue 1925 - display nickname@hostname.com
|
2015-11-28 18:49:37 +01:00 |
|
|
Michael Vogel
|
388847e1f3
|
Issue 1779: There is now an atom feed link under the connect link on the profile page
|
2015-11-28 18:11:34 +01:00 |
|
|
Michael Vogel
|
3f66e0a9f6
|
Automatically optimize tables that are smaller than a definable size
|
2015-11-28 15:43:25 +01:00 |
|
|
Michael Vogel
|
a34dbf76a4
|
Maybe it would take too long to optimize the photo table on larger systems
|
2015-11-28 14:35:59 +01:00 |
|
|
Michael Vogel
|
1c64090217
|
Avoid duplicated tags
|
2015-11-28 14:29:14 +01:00 |
|
|
Michael Vogel
|
c3068c8925
|
Optimize tables on a daily base that are written very often
|
2015-11-28 13:19:09 +01:00 |
|
|
Michael Vogel
|
32fa5d185c
|
Before the comparism the entities must be removed
|
2015-11-28 10:28:14 +01:00 |
|
|
Michael Vogel
|
59242d7932
|
Forgotten file
|
2015-11-28 07:37:56 +01:00 |
|
|
Michael Vogel
|
643e228d6b
|
Bookmark links are now looking again like bookmark links
|
2015-11-28 07:37:02 +01:00 |
|
|
rabuzarus
|
9189971cb8
|
display contact information in contact and directory according to the other contact related pages
|
2015-11-28 02:56:36 +01:00 |
|
|
Michael Vogel
|
79092f149c
|
Requests for soapbox and freelove accounts are automatically accepted
|
2015-11-28 01:03:26 +01:00 |
|
|
Michael Vogel
|
a9b2b48d08
|
Some small improvements to the OStatus export
|
2015-11-27 23:16:54 +01:00 |
|
|
Tobias Diekershoff
|
5fe8ae514b
|
Merge pull request #2102 from annando/1511-unseen-forums
Bugfix: Now the unseen counter for forums work
|
2015-11-27 22:17:17 +01:00 |
|
|
Michael Vogel
|
3b6d3d1ade
|
Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
|
2015-11-27 21:35:46 +01:00 |
|
|
Michael Vogel
|
75710df61a
|
Bugfix: Now the unseen counter works.
|
2015-11-27 21:18:54 +01:00 |
|
|
Michael Vogel
|
9c37fc320e
|
Merge pull request #2095 from rabuzarus/unread_forums
count unread forum items for forumlist widget (ping.php)
|
2015-11-27 16:28:21 +01:00 |
|
|
Michael Vogel
|
b1a9e9b6d4
|
OStatus: Commented out some "to-do" stuff
|
2015-11-27 08:09:19 +01:00 |
|
|
Michael Vogel
|
b45ca80656
|
Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
|
2015-11-27 07:30:03 +01:00 |
|
|
Michael Vogel
|
fa8b4738ee
|
Bugfix: There was an endless loop in the probe_url function ...
|
2015-11-26 21:58:01 +01:00 |
|