886c3d1472
bad checkin
2013-05-02 22:19:16 -07:00
cc8a4fbf16
Merge pull request #672 from cpfeiffer/email-notification-sitename-fix
...
fix reading sitename config
2013-04-29 22:41:32 -07:00
5ee19401c4
pgettext needs dba.php for q()
2013-04-29 22:51:08 +02:00
1d358fe6de
system support for complete blocking
2013-04-28 21:02:53 -07:00
61a0f9c196
bug #540 and hush up a couple of log messages that are way too verbose
2013-04-28 04:30:20 -07:00
7f6a7af2b3
fix reading sitename config
2013-04-27 21:40:40 +02:00
1ed6a2bd3d
rev update
2013-04-25 02:36:52 -07:00
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
6fddd1cbbf
template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir
2013-04-23 03:35:31 -04:00
ddf1caf0fd
template engine rework
...
- use smarty3 as default engine
- new pluggable template engine system
2013-04-23 03:27:52 -04:00
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
659d0cc1b8
uimport remove db scheme version check
2013-04-08 09:03:31 -04:00
1442fecd14
uimport: fix file formatting
2013-04-02 09:44:19 -04:00
13e315e004
uimport: check table columns before import
2013-04-02 09:16:24 -04:00
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
74954e6c68
Merge pull request #656 from fabrixxm/master
...
phpdocs for include/text.php
2013-03-27 19:44:24 -07:00
c3621407d1
Remove debug line added by mistake
2013-03-28 10:29:27 +08:00
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
1a8bdf8ae8
more phpdocs
2013-03-27 10:28:56 +01:00
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
04a255e393
Merge pull request #652 from mexon/edited_timestamp
...
items.php edited timestamp logic
2013-03-24 07:30:07 -07:00
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
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
00aab4039d
Merge https://github.com/friendica/friendica into pull
2013-03-19 03:31:37 -07:00
17cb682ed0
rm addon.old
2013-03-19 03:30:50 -07:00
1a49c841d8
Merge pull request #649 from mexon/redirect_fix
...
Restore redirect functionality removed by change 452ff19d
2013-03-18 18:06:41 -07:00
133ef9155d
don't allow deleted accounts to appear on "manage" page
2013-03-18 17:31:21 -07:00
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
c53bdfb163
Restore redirect functionality removed by change 452ff19d
2013-03-14 14:09:42 +08:00
3399b1ccf6
Merge pull request #648 from mexon/mailstream-prerequisites
...
Mailstream prerequisites
2013-03-10 15:34:54 -07:00
91a6a1cb25
Merge pull request #646 from annando/master
...
OStatus conversations, "vier" and diaspora android client
2013-03-10 15:24:27 -07:00
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
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
e200040c5b
Merge remote-tracking branch 'upstream/master'
2013-03-07 20:20:12 +01:00
5d3613c8bc
Vier: The change from blue to black in links is now faded as well.
2013-03-07 19:34:54 +01:00
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
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
421d484839
Merge remote-tracking branch 'upstream/master'
2013-03-04 00:05:17 +01:00
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
1c55b0b359
Merge pull request #639 from annando/master
...
Community/Open Graph
2013-03-03 12:07:52 -08:00
00888a73bb
OStatus conversation: Prevent posting loops
2013-03-03 17:58:35 +01:00
0187283709
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
f07df4f667
merge
2013-03-02 15:46:54 -08:00
59c03edbc9
fix util/config
2013-03-02 15:44:00 -08:00
0433263866
Merge https://github.com/friendica/friendica into pull
2013-02-26 17:33:47 -08:00
5205a374ee
block injection vector
2013-02-26 17:33:18 -08:00
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
friendica
Carsten Pfeiffer
Fabrixxm
Tobias Diekershoff
Matthew Exon
Matthew Exon
fermionic
Michael Vogel