Michael Vogel
111495423c
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
2013-03-14 23:15:15 +01:00
Michael Vogel
e200040c5b
Merge remote-tracking branch 'upstream/master'
2013-03-07 20:20:12 +01:00
Michael Vogel
5d3613c8bc
Vier: The change from blue to black in links is now faded as well.
2013-03-07 19:34:54 +01:00
Fabrixxm
a92ef6f0fe
remove authentication from api help/test. fix issue 552.
...
identi.ca don't ask for auth on help/test.
2013-03-07 08:16:53 -05:00
Michael Vogel
c40c61c106
OStatus conversations: Fixed a bug when a message hadn't got an id.
...
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
2013-03-06 23:23:04 +01:00
Michael Vogel
421d484839
Merge remote-tracking branch 'upstream/master'
2013-03-04 00:05:17 +01:00
Michael Vogel
8e1d253568
OStatus conversation: now the creation date of the item is store with the conversation
...
vier: The link color and the color of the top bar is changed.
2013-03-03 23:44:50 +01:00
friendica
1c55b0b359
Merge pull request #639 from annando/master
...
Community/Open Graph
2013-03-03 12:07:52 -08:00
Michael Vogel
00888a73bb
OStatus conversation: Prevent posting loops
2013-03-03 17:58:35 +01:00
Zach Prezkuta
0187283709
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
friendica
f07df4f667
merge
2013-03-02 15:46:54 -08:00
friendica
59c03edbc9
fix util/config
2013-03-02 15:44:00 -08:00
friendica
0433263866
Merge https://github.com/friendica/friendica into pull
2013-02-26 17:33:47 -08:00
friendica
5205a374ee
block injection vector
2013-02-26 17:33:18 -08:00
fermionic
cf677a3003
Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports
...
run limit_body_size on imported emails, which don't go through consume_feed
2013-02-24 07:13:21 -08:00
521ccc38c6
Merge pull request #625 from tobiasd/master
...
make sure conv_as->items is an array or don't proceed
2013-02-23 23:27:21 -08:00
Zach Prezkuta
fcab22b80f
run limit_body_size on imported emails, which don't go through consume_feed
2013-02-23 10:06:59 -07:00
Zach Prezkuta
4db50a3ecb
admin option to disable post content in email notifications for the site
2013-02-23 09:31:34 -07:00
c2b49f2588
make sure conv_as->items is an array or don't proceed
2013-02-23 12:42:55 +01:00
friendica
280b72b9e6
Merge https://github.com/friendica/friendica into pull
2013-02-21 16:43:01 -08:00
friendica
615b060352
rev update
2013-02-21 16:42:34 -08:00
Michael Vogel
c90272e2ae
supressing warning when importing items. Speeding up community. Changed query for the search.
2013-02-20 21:47:36 +01:00
Michael Vogel
7e154d5e4c
plugin: orphaned hooks weren't deleted.
...
update: fixing update job for tags.
2013-02-17 18:05:30 +01:00
Michael Vogel
93143702ed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
2013-02-17 12:35:40 +01:00
Michael Vogel
3e58060b30
API: beautify the output of repeated items
...
Vier: Birthday reminder looks better
2013-02-15 20:14:45 +01:00
Zach Prezkuta
399e8cd8e4
don't change to string in prune_deadguys()
2013-02-09 17:52:29 -07:00
friendica
6242f9a147
add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication.
2013-02-07 23:43:55 -08:00
fermionic
a0e18a0ff8
Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify
...
move mb_strlen call out of for loop definition
2013-02-06 21:38:15 -08:00
Zach Prezkuta
c886927a52
use mb_ereg_replace for xmlify and unxmlify
2013-02-06 22:30:27 -07:00
Zach Prezkuta
18f71c1050
parsing multi-byte strings with xmlify
2013-02-06 00:37:15 -07:00
Zach Prezkuta
774a78dbde
better unicode support in xmlify
2013-02-05 23:02:13 -07:00
friendica
2e6446371a
Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page
...
fix bug that wouldn't show posts to a user who was in an allowed group
2013-02-05 17:36:06 -08:00
friendica
70f02053e1
Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks
...
allow themes to use plugin hooks
2013-02-05 17:21:42 -08:00
Zach Prezkuta
6152cbd5ac
add support for more file attachment types
2013-02-04 22:15:16 -07:00
Zach Prezkuta
439974a5d5
allow themes to use plugin hooks
2013-02-04 20:53:53 -07:00
Zach Prezkuta
09a2786882
fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions
2013-02-04 20:27:30 -07:00
Zach Prezkuta
b6bc7daadf
move mb_strlen call out of for loop definition
2013-02-04 20:17:56 -07:00
Michael Vogel
c9307eb96a
OStatus conversation are now checked every 30 minutes for new answers.
2013-02-04 00:57:23 +01:00
zottel
c0af9b2938
Reset network when showing a contact's posts
...
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
2013-02-01 09:12:37 +01:00
Zach Prezkuta
22c962f1fa
remove deprecated call by reference
2013-01-29 18:44:42 -07:00
Michael Vogel
2350aa54eb
OStatus-Conversation auto completion works now.
...
Some performance issues added as well.
2013-01-30 01:31:27 +01:00
Zach Prezkuta
2635c59c83
don't block private posts to logged in users on the local hub
2013-01-27 22:42:36 -07:00
friendica
a5ac69c65e
Merge pull request #591 from fermionic/20130126-javascript-free-theme
...
Decaf mobile: an (almost) Javascript-free theme
2013-01-27 19:11:36 -08:00
friendica
38238972b5
really nitty permission tweaking
2013-01-27 18:10:26 -08:00
Michael Vogel
9967c9892d
only change parents when parents are changed.
2013-01-28 01:22:00 +01:00
Michael Vogel
e668fece10
ostatus auto completion now seems to work.
2013-01-28 01:16:51 +01:00
Michael Vogel
bc972e16ce
New function to complete threads from ostatus postings
2013-01-27 23:25:04 +01:00
Michael Vogel
2cb576d305
Bugfixing after adding timestamps
2013-01-27 13:57:44 +01:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Michael Vogel
fdee002f73
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
