Commit graph

9390 commits

Author SHA1 Message Date
ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00
d283ed4f51 EO: update to the strings 2014-09-06 12:07:45 +02:00
6ddfaaae82 DE: update to the strings 2014-09-06 12:07:13 +02:00
e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
582b90613b CS: update to the strings 2014-09-06 12:05:25 +02:00
fe8a5a93b4 BG: update to the strings 2014-09-06 12:04:23 +02:00
hauke
9a8d106414 fixed contact action button bar, typo correction 2014-09-06 11:49:31 +02:00
fabrixxm
325f2b1697 fix avatars urls on profile import 2014-09-06 11:29:24 +02:00
hauke
5f9845d235 make vagrant connect to the outside world on ubuntu 2014-09-06 10:39:23 +02:00
fabrixxm
6679d18826 Merge pull request #1100 from tugelbend/master
bug fix #1097
2014-09-06 10:35:40 +02:00
hauke
191595766d removed old comment that is no longer true 2014-09-06 00:14:25 +02:00
hauke
0349127473 bug fix #1097 2014-09-05 23:57:17 +02:00
7eef05e4f5 Merge pull request #1098 from Beanow/release/profile-editor-improvements
Profile editor improvements
2014-09-05 22:20:31 +02:00
7ae14def8f Merge pull request #1095 from annando/master
Ignore notifications (feature request #847) - database structure update should work now
2014-09-05 22:18:53 +02:00
Beanow
992684c362 Merge branch 'feature/edit-profile-improvements' into develop 2014-09-04 23:58:22 +02:00
Michael Vogel
e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel
08df06ce60 Removed the obsolete update functions 2014-09-04 02:46:43 +02:00
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
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
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