Fabrixxm
bea89c17fe
uimport: set contacts 'avatar-date' to zero. should fix issue #692
2013-06-12 03:51:53 -04:00
Michael Vogel
323186864e
Merge remote-tracking branch 'upstream/master'
2013-06-08 12:30:36 +02:00
Michael Vogel
a2cef94d8b
ostatus completion of threads now works with longer threads well.
2013-06-08 12:28:19 +02:00
friendica
8fe82d35d4
Merge https://github.com/friendica/friendica into pull
2013-05-28 04:53:27 -07:00
friendica
b60e42d2fa
provide bbcode translation for imported red zmg tag (img tag with zot-id)
2013-05-28 04:52:22 -07:00
2b09b8ae17
make red# available as a smilie
2013-05-27 08:34:12 +02:00
friendica
3381afab3d
Merge https://github.com/friendica/friendica into pull
2013-05-20 17:37:23 -07:00
friendica
a1c4d0ca93
fix include paths when started via cmdline
2013-05-20 17:36:29 -07:00
Michael Vogel
0723933c1c
removing of hashtag addresses is now hidden behind a configuration
2013-05-19 11:08:08 +02:00
Michael Vogel
03c489150c
Merge remote-tracking branch 'upstream/master'
2013-05-17 08:08:34 +02:00
Michael Vogel
d4240a265b
When converting to HTML, hashtag addresses are now removed (only when the message is exported)
2013-05-15 22:20:06 +02:00
Zach Prezkuta
35358baac9
update to v4.0.0; point to local host of SWF
2013-05-11 10:55:09 -06:00
fermionic
3a13aba62e
Merge pull request #674 from fermionic/20130503-basic-video-support
...
basic video playback support using VideoJS
2013-05-11 08:33:36 -07:00
friendica
ef4ebd8546
remove stub code
2013-05-09 01:17:11 -07:00
friendica
3339f55310
Merge https://github.com/friendica/friendica into pull
2013-05-09 01:15:40 -07:00
friendica
2c8d33a6e2
rev update
2013-05-09 01:15:22 -07:00
fabrixxm
2da4f8268e
fix smarty3 folder not writable message
2013-05-08 11:34:30 +03:00
Fabrixxm
4bf41b8e5d
check if view/smarty3 folder is writable by webserver
2013-05-08 03:26:20 -04:00
Zach Prezkuta
fec4581f34
basic video playback support using VideoJS
2013-05-03 18:17:56 -06:00
friendica
886c3d1472
bad checkin
2013-05-02 22:19:16 -07:00
friendica
cc8a4fbf16
Merge pull request #672 from cpfeiffer/email-notification-sitename-fix
...
fix reading sitename config
2013-04-29 22:41:32 -07:00
Carsten Pfeiffer
5ee19401c4
pgettext needs dba.php for q()
2013-04-29 22:51:08 +02:00
friendica
1d358fe6de
system support for complete blocking
2013-04-28 21:02:53 -07:00
friendica
61a0f9c196
bug #540 and hush up a couple of log messages that are way too verbose
2013-04-28 04:30:20 -07:00
Carsten Pfeiffer
7f6a7af2b3
fix reading sitename config
2013-04-27 21:40:40 +02:00
friendica
1ed6a2bd3d
rev update
2013-04-25 02:36:52 -07:00
Fabrixxm
d36292c532
template: set smarty3 as default template engine in theme info array.
...
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
2013-04-23 03:35:31 -04:00
Fabrixxm
6fddd1cbbf
template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir
2013-04-23 03:35:31 -04:00
Fabrixxm
ddf1caf0fd
template engine rework
...
- use smarty3 as default engine
- new pluggable template engine system
2013-04-23 03:27:52 -04:00
Fabrixxm
dd02b7bd00
drop items to group pages if no mentions in it. should fix bug 557
2013-04-19 09:55:07 -04:00
960d1d99b2
invalid arguments for a foreach loop found
2013-04-17 17:32:31 +02:00
Fabrixxm
659d0cc1b8
uimport remove db scheme version check
2013-04-08 09:03:31 -04:00
Fabrixxm
1442fecd14
uimport: fix file formatting
2013-04-02 09:44:19 -04:00
Fabrixxm
13e315e004
uimport: check table columns before import
2013-04-02 09:16:24 -04:00
Matthew Exon
5b158dbcfb
Make the content type available after calling fetch_url
2013-04-01 12:36:43 +08:00
cda327a368
Merge pull request #658 from annando/master
...
Mail importing problems, a small "vier" change
2013-03-30 01:46:13 -07:00
Michael Vogel
f7fbac2e2b
Merge remote-tracking branch 'upstream/master'
2013-03-29 11:22:10 +01:00
friendica
74954e6c68
Merge pull request #656 from fabrixxm/master
...
phpdocs for include/text.php
2013-03-27 19:44:24 -07:00
Matthew Exon
c3621407d1
Remove debug line added by mistake
2013-03-28 10:29:27 +08:00
Matthew Exon
10b68ef837
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself
2013-03-28 09:49:10 +08:00
Fabrixxm
1a8bdf8ae8
more phpdocs
2013-03-27 10:28:56 +01:00
Fabrixxm
a161b86d1f
add phpdoc
2013-03-27 05:11:40 -04:00
e7c705c9a1
Merge pull request #654 from mexon/filter_var
...
Use filter_var instead of parse_url to validate URLs, since the latter r...
2013-03-26 11:31:11 -07:00
fermionic
04a255e393
Merge pull request #652 from mexon/edited_timestamp
...
items.php edited timestamp logic
2013-03-24 07:30:07 -07:00
Matthew Exon
c7cfc6b170
Use filter_var instead of parse_url to validate URLs, since the latter returns true even for invalid URLs, in particular the empty string
2013-03-21 16:27:12 +08:00
Matthew Exon
6edc52f78f
Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items.
2013-03-20 09:00:12 +08:00
friendica
00aab4039d
Merge https://github.com/friendica/friendica into pull
2013-03-19 03:31:37 -07:00
friendica
17cb682ed0
rm addon.old
2013-03-19 03:30:50 -07:00
fermionic
1a49c841d8
Merge pull request #649 from mexon/redirect_fix
...
Restore redirect functionality removed by change 452ff19d
2013-03-18 18:06:41 -07:00
friendica
133ef9155d
don't allow deleted accounts to appear on "manage" page
2013-03-18 17:31:21 -07:00
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
Matthew Exon
c53bdfb163
Restore redirect functionality removed by change 452ff19d
2013-03-14 14:09:42 +08:00
fermionic
3399b1ccf6
Merge pull request #648 from mexon/mailstream-prerequisites
...
Mailstream prerequisites
2013-03-10 15:34:54 -07:00
fermionic
91a6a1cb25
Merge pull request #646 from annando/master
...
OStatus conversations, "vier" and diaspora android client
2013-03-10 15:24:27 -07:00
Matthew Exon
720a44bb0b
The post_remote_end hook was being called with an escaped version of the item, not very useful. This change moves the hook to the end of item_store and gets all data fresh from the database.
2013-03-09 15:57:50 +08:00
Matthew Exon
4df162d929
Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work.
2013-03-09 15:57:40 +08: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
