Michael Vogel
|
24b3befc4d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
update.php
|
2014-09-04 02:29:12 +02:00 |
|
|
Michael Vogel
|
56f0af2067
|
The "ignore" feature can be disabled and enabled, the value will now be retrieved.
|
2014-09-04 01:27:28 +02:00 |
|
|
Michael Vogel
|
e32e458cb8
|
Added new file for ignoring threads
|
2014-09-04 01:04:43 +02:00 |
|
|
Michael Vogel
|
0e2376b457
|
Updated font awesome to new version
|
2014-09-04 01:01:39 +02:00 |
|
|
Michael Vogel
|
7eeb320085
|
It is now possible to ignore threads.
|
2014-09-04 00:58:52 +02:00 |
|
fabrixxm
|
f17e6f534f
|
Merge pull request #1093 from annando/master
Added an alternate link to the profile in the atom feeds (feature request #925)
|
2014-09-03 09:59:51 +02:00 |
|
|
Michael Vogel
|
73904bfa03
|
Added an alternate link to the profile in the atom feeds (feature request #925)
|
2014-09-03 09:52:31 +02:00 |
|
 Tobias Diekershoff
|
ae2094487b
|
Merge pull request #1092 from annando/master
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct text.
|
2014-09-03 07:44:17 +02:00 |
|
|
Michael Vogel
|
500dbecfe7
|
Fix for issue #1060 (Missing Entries in Archive Dropdown)
|
2014-09-03 01:43:04 +02:00 |
|
|
Michael Vogel
|
dd908c8415
|
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages.
|
2014-09-03 01:03:23 +02:00 |
|
friendica
|
910293729c
|
Merge https://github.com/friendica/friendica into pull
|
2014-09-02 01:09:23 -07:00 |
|
|
friendica
|
3e0a84afa9
|
so this is why my db updates were reverted ;-)
|
2014-09-02 01:08:50 -07:00 |
|
|
fabrixxm
|
e21b653614
|
Merge pull request #1090 from annando/master
dbstructure: Delete indexes before the database structure is changed
|
2014-09-02 08:28:15 +02:00 |
|
|
friendica
|
7673579afc
|
Merge https://github.com/friendica/friendica into pull
|
2014-09-01 21:46:40 -07:00 |
|
|
friendica
|
9464af0eef
|
resize the item guid field for protocol compatibility - it's getting truncated.
|
2014-09-01 21:45:34 -07:00 |
|
|
Michael Vogel
|
7144d22cc1
|
If a picture was too small it got cropped
|
2014-09-02 02:36:04 +02:00 |
|
|
Michael Vogel
|
961440e48f
|
Cutting the text has to be made UTF-8 aware as well.
|
2014-09-02 02:14:16 +02:00 |
|
|
Michael Vogel
|
b66a031b34
|
The plaintext conversion had issues with counting the text size of posts with german umlauts
|
2014-09-02 01:31:31 +02:00 |
|
|
Michael Vogel
|
150310ea3a
|
dbstructure: Delete indexes before the database structure is changed
|
2014-09-01 23:41:21 +02:00 |
|
|
fabrixxm
|
d376e3d545
|
Merge pull request #1089 from annando/master
Remote-Self is now working fine/contact page instead of remote profile when contact is added
|
2014-09-01 17:04:29 +02:00 |
|
|
Michael Vogel
|
2b182b2dcf
|
After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile)
|
2014-09-01 16:55:16 +02:00 |
|
|
Michael Vogel
|
23c4c39a1f
|
remote-self: "origin" and "last-child" need to be set as well.
|
2014-09-01 15:28:31 +02:00 |
|
|
Michael Vogel
|
3e9e682723
|
remote-self: Moved some functionality from other place into the "item_store" function
|
2014-09-01 14:40:29 +02:00 |
|
|
Michael Vogel
|
e35c55dd3b
|
Remote-self: It is now possible to chose between two different modes of mirroring.
|
2014-09-01 14:00:21 +02:00 |
|
|
Michael Vogel
|
522b9edffe
|
remote-self: Seting the author name to the owner name
|
2014-09-01 09:59:58 +02:00 |
|
|
Michael Vogel
|
c81df2c005
|
Remote-self is now working immediately
|
2014-08-31 23:52:25 +02:00 |
|
|
Tobias Diekershoff
|
6d9e513349
|
Merge pull request #1088 from annando/master
Bugfix: It was impossible to add groups.
|
2014-08-30 09:36:31 +02:00 |
|
|
Michael Vogel
|
ea0f75a315
|
Bugfix: It was impossible to add groups.
|
2014-08-30 02:08:33 +02:00 |
|
|
fabrixxm
|
070581f793
|
Merge pull request #1086 from annando/master
Bugfix: Connecting with other users works again/Some more profile optimizing
|
2014-08-28 09:16:26 +02:00 |
|
|
Michael Vogel
|
4d3e3eb4d1
|
Bugfix: connecting with other users now works again.
|
2014-08-28 01:15:40 +02:00 |
|
|
Michael Vogel
|
5468b9b2a5
|
oembed: Prevent empty links
|
2014-08-28 01:14:46 +02:00 |
|
|
Michael Vogel
|
b4e8ec2806
|
bbcode: mask "[" and "]" for attachments.
|
2014-08-28 01:11:43 +02:00 |
|
|
Michael Vogel
|
4bdd905b3e
|
Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile.
|
2014-08-28 01:06:41 +02:00 |
|
|
friendica
|
03245e4a83
|
increase guid.guid field length for redmatrix-over-diaspora communications
|
2014-08-26 19:18:19 -07:00 |
|
|
Michael Vogel
|
4ad2bbddc7
|
If a post is a pure reshare, then show the profile of the original author on the display page.
|
2014-08-26 17:10:46 +02:00 |
|
|
fabrixxm
|
faf8afe65c
|
Merge pull request #1084 from annando/master
Displaying the author of a post on the "display" page/network page as default page after login
|
2014-08-26 08:39:56 +02:00 |
|
|
Michael Vogel
|
4976b1c153
|
BBCode: Add a linefeed between a picture and the following text. This is important for exports (e.g. to pumpio)
|
2014-08-25 23:40:18 +02:00 |
|
|
Michael Vogel
|
6aeaf0815f
|
If a message is transmitted to a network that requires shortening (Twitter, Statusnet, ADN), then the shortened link will be the link to the friendica post if it was a shared post.
|
2014-08-25 23:38:13 +02:00 |
|
|
Michael Vogel
|
69bb3ff637
|
Make the network page the new default page after login.
|
2014-08-25 23:34:29 +02:00 |
|
|
Michael Vogel
|
316f0a75cd
|
Showing the network name on the display page.
|
2014-08-25 16:17:49 +02:00 |
|
|
Michael Vogel
|
dd511ac70a
|
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
|
2014-08-25 14:09:56 +02:00 |
|
|
Michael Vogel
|
c5cc99c716
|
BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently
|
2014-08-25 14:08:26 +02:00 |
|
|
Michael Vogel
|
33b612a920
|
Bugfix: There was a JS error that prevented the work of the comment buttons
|
2014-08-25 14:07:11 +02:00 |
|
|
fabrixxm
|
1ead394a94
|
Merge pull request #1072 from annando/master
Less visible options when connecting a friendica contact
|
2014-08-22 10:01:49 +02:00 |
|
|
Michael Vogel
|
94d2557077
|
Vier: Some more design changes to "plus" style.
|
2014-08-21 01:00:56 +02:00 |
|
|
Michael Vogel
|
845805bf34
|
Provide a parent in the notification, so that threading of the notification mails is working.
|
2014-08-21 01:00:12 +02:00 |
|
|
Michael Vogel
|
53dcecd596
|
If a user is already connected to another user, then don't show the "connect" link on his profile.
|
2014-08-21 00:57:54 +02:00 |
|
|
Michael Vogel
|
d23d26f44d
|
Reduced options when adding a friendica contact and an address was provided via URL parameter.
|
2014-08-21 00:56:21 +02:00 |
|
|
Michael Vogel
|
716e0b073f
|
Notification by mail: Improvement for the threading of notifications, new headers to support filtering.
|
2014-08-21 00:53:01 +02:00 |
|
|
Michael Vogel
|
2769089120
|
bbcode: Don't use a preview picture in the "attachment" element if it is a video attachment.
|
2014-08-21 00:51:18 +02:00 |
|