Michael Vogel
e746c4955b
Added an option to configure the hostname manually. And there was a problem when APC wasn't present.
2013-08-11 21:19:26 +02:00
Michael Vogel
d92a348cf0
- Using APC to store config values (when present)
...
- Enabling interlacing for pictures
2013-08-09 18:28:50 +02:00
Michael Vogel
6576aae938
If APC is enabled then store config data there
2013-08-06 00:20:16 +02:00
Michael Vogel
741b932cc9
Merge remote-tracking branch 'upstream/master'
2013-08-05 20:32:02 +02:00
Matthew Exon
11163c6fb3
Allow calls to fetch_url to specify a cookiejar file, for sites that refuse to deliver content without setting a cookie
2013-08-05 10:59:22 +08:00
Fabrixxm
3f36d375e2
hex tag filter: look at entire string
2013-08-04 03:12:17 -04:00
Fabrixxm
50233ba290
remove debug code
2013-08-03 15:18:41 -04:00
Fabrixxm
11d1c1ae8e
add tag to term table. fix "#xNNNN" tag filter.
2013-08-03 15:12:50 -04:00
fabrixxm
f1090b6d8c
Merge pull request #747 from zered/solve_741
...
Solving the "Disallow public access to addons listed in the apps menu" h...
2013-08-02 09:57:17 -07:00
fabrixxm
462f19ccf2
Merge pull request #745 from mexon/redirect_fix
...
Appending URLs in case of redirect is incorrect
2013-08-02 08:43:01 -07:00
Fabrixxm
cccdb2e5e7
api: `api_status_show()
` returns correct post id
2013-07-29 10:48:30 -04:00
Matthew Exon
6a38705567
Replicate redirect URL building logic for post requests
2013-07-29 22:34:09 +08:00
Matthew Exon
eb9bd03ef8
If the header returns an absolute path as a redirect, don't simply append the path to the old URL, remove the old absolute path first.
...
For example, original URL:
http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html
Redirect from header:
/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
Incorrect result:
http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
Correct result after this patch:
http://www.theregister.co.uk/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
2013-07-29 10:15:39 +08:00
Michael Vogel
7770317f1e
Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.
...
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.
2013-07-28 20:38:48 +02:00
Zered
a6fae9a0db
Solving the "Disallow public access to addons listed in the apps menu" has no effect bug
...
Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook)
Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged
2013-07-24 03:53:10 +02:00
Michael Vogel
4dcd00cf4b
Lockfile for onepoll, removing old smarty3 cache files.
2013-07-19 23:38:23 +02:00
Fabrixxm
00df3ef5a7
Fixes #712
2013-07-11 03:34:49 -04:00
fabrixxm
c9604b776c
stupid typo
2013-07-08 14:21:49 +02:00
Fabrixxm
cd35beb947
should fix #728
2013-07-08 04:52:14 -04:00
fabrixxm
8b9ae53242
Merge pull request #713 from annando/master
...
ejabberd and friendica
2013-07-05 12:40:30 -07:00
Michael Vogel
edf8bde581
Complete oStatus conversations: Changed from file_get_contents to fetch_url
2013-06-27 22:27:59 +02:00
Fabrixxm
4748b6c4c3
remove unneeded logger function
2013-06-27 09:58:39 -04:00
Fabrixxm
0a1697d13a
add pubsubhubbub support to feed contacts
2013-06-27 09:51:13 -04:00
friendica
9ae4c1fb32
ignore hex escapes as numeric tags
2013-06-26 04:58:54 -07:00
friendica
bfc9cfb82f
put tags in items
2013-06-26 04:02:04 -07:00
Michael Vogel
16737298b4
Merge remote-tracking branch 'upstream/master'
2013-06-22 18:31:28 +02:00
Michael Vogel
e4ce383f2f
It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install.
2013-06-22 17:34:52 +02:00
friendica
407473f2ce
Merge https://github.com/friendica/friendica into pull
2013-06-21 05:02:43 -07:00
friendica
1c10cf1ad7
-- #039 ; is not a tag
2013-06-21 05:00:30 -07:00
fabrixxm
5cdeef22ea
pager: fix stupid typo
2013-06-19 14:28:39 +02:00
fabrixxm
e3bb058e9f
Merge pull request #697 from annando/master
...
API can now fetch posts from a single thread
2013-06-17 05:09:54 -07:00
Michael Vogel
e246c53b45
API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.
2013-06-16 13:42:43 +02:00
Michael Vogel
e7aa2b99a1
OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it
...
API: It is now possible to fetch only posts from one thread.
2013-06-16 13:28:04 +02:00
Fabrixxm
faa510befc
move html from paginate functions to template
2013-06-13 08:12:15 -04:00
friendica
efce5ae1b9
Merge https://github.com/friendica/friendica into pull
2013-06-12 21:42:20 -07:00
friendica
2464915817
don't try to parse empty xml with simplepie, throws conversion warning
2013-06-12 21:41:07 -07:00
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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