bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8916 commits 4 branches 0 tags 133 MiB
Commit graph

2681 commits

Author SHA1 Message Date
fabrixxm
910f56b698 acl_automention: fix warning in include/config.php 2014-01-06 10:58:39 +01:00
Michael Vogel
3b32505d14 API: Bugfix that wrong contact data was sent 2014-01-05 16:57:05 +01:00
Michael Vogel
aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel
b4c3f02538 API: Several improvements to make the api more compatible 2014-01-05 16:12:03 +01:00
Michael Vogel
28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm
b0e8dbc4da Merge pull request #864 from fabrixxm/acl_automention 
Acl automention
 2014-01-03 06:09:12 -08:00
fabrixxm
ad5a47aecf add fetaure switch for acl-automention 2014-01-03 14:40:43 +01:00
tobiasd
18ce32633b Merge pull request #876 from annando/master 
API: Show shared messages as repeated messages, improvements with nick names
 2014-01-03 01:00:21 -08:00
Michael Vogel
fa431e84c2 API: Show shared messages as repeated messages, improvements with nick names 2014-01-02 22:29:44 +01:00
fabrixxm
68030a79cd api: fix call-time pass-by-reference error 2014-01-02 19:12:26 +01:00
tobiasd
0c0419bc95 Merge pull request #873 from annando/master 
API: Bugfix: Wrong contact ids with direct messages
 2014-01-01 01:30:11 -08:00
Michael Vogel
c463fab8b8 API: Sending direct messages now works again. Some more things to make Friendica work better with AndStatus 2013-12-29 17:54:37 +01:00
Michael Vogel
b0a1f4e1b9 API: Bugfix: Wrong contact ids with direct messages 2013-12-27 14:11:13 +01:00
fabrixxm
7b5018fb76 Merge pull request #872 from annando/master 
API: Supporting twidere, better supporting of the network field in the item table
 2013-12-27 00:15:44 -08:00
Michael Vogel
4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Michael Vogel
a96d6f835c API: Supporting twidere 2013-12-27 01:48:43 +01:00
fabrixxm
230ce659bd Merge pull request #866 from annando/master 
API: reworked
 2013-12-26 02:12:27 -08:00
Michael Vogel
a0360ec976 API: Add the network name to the application name 2013-12-23 14:06:53 +01:00
Michael Vogel
165a201ca7 API: Added better error handling, make some more api calls similar to statusnet 2013-12-20 23:07:11 +01:00
Michael Vogel
9cfa60fe15 API: reply-to-Values should be all correct now. "since_id" now works with mails. 2013-12-19 06:58:11 +01:00
Fabrixxm
9a94c35120 acl selector add and remove mentions when a forum is selected. 2013-12-18 10:18:26 -05:00
Fabrixxm
9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
Michael Vogel
5130b19f5e API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus) 2013-12-15 23:00:47 +01:00
Michael Vogel
5d3ebcc2cf Bugfix of the bugfix :) 2013-12-10 21:16:13 +01:00
Michael Vogel
eca9431909 Bugfix: Problem with page switching with the old pager solved 2013-12-10 15:45:26 +01:00
Michael Vogel
7e5c8ab91c Keeping an offset for page switching: This helps so that you don't see old messages 2013-12-10 00:13:19 +01:00
Michael Vogel
d20d2f74ae Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms 2013-12-08 20:10:28 +01:00
Michael Vogel
bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel
3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread 2013-12-08 14:49:24 +01:00
Michael Vogel
1d19e056e7 Sorting plugins after priority and name (better for the configuration page) 2013-12-02 20:28:30 +01:00
Michael Vogel
e875a104ce dangerous values in usernames for shared messages from diaspora are now encoded. 2013-12-02 20:26:57 +01:00
Michael Vogel
3331e71e8e disable the output of the "posted" value in shares when item cache is enabled. 2013-12-02 20:25:43 +01:00
Michael Vogel
4f38969148 Optional parameter for parseurl to only fetch data from meta information 2013-12-02 20:24:41 +01:00
Michael Vogel
e0cf2c5167 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
	mod/settings.php
 2013-12-02 00:33:46 +01:00
Michael Vogel
6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00
Mats Sjöberg
1234282b8b Use the push value in the push_subscribers table as a push tries counter as well. 2013-11-21 21:44:18 +02:00
Mats Sjöberg
2859ce1483 Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work. 2013-11-21 21:44:18 +02:00
Mats Sjöberg
19de78e511 Fixed subscription problem with new GNU Social. 2013-11-21 19:41:06 +01:00
Fabrixxm
0414e0a316 More "relocate": 
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
 2013-11-13 06:07:49 -05:00
fabrixxm
3964d86020 Merge pull request #817 from annando/master 
SQL: Query for showing group posts is improved, order by comment date now is working again
 2013-11-11 01:51:58 -08:00
Michael Vogel
7ba1416e64 SQL: Query for showing group posts is improved, order by comment date now work again 2013-11-08 08:11:39 +01:00
tobiasd
7d1a6cc1d6 Merge pull request #803 from annando/master 
SQL performance and reduction of database warnings
 2013-11-07 01:03:31 -08:00
maase2
787db1f7d6 Update Contact.php 
Add the delete option for a contact.
 2013-11-05 22:06:23 +01:00
Michael Vogel
0b31aa963d Bugfix: There were speed problems with inifinite scroll on firefox 2013-11-03 13:47:59 +01:00
Michael Vogel
eaefcf9de7 All subqueries in tag searches are now reformed. Further SQL improvements 2013-11-03 02:07:44 +01:00
Michael Vogel
759015e5fd Removed many "limit 1" at update and delete queries since they were superflous und generated massiv logfile entries 2013-11-02 16:13:11 +01:00
Michael Vogel
53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Michael Vogel
5eeccd519a BBCode: When converting to HTML for the connectors, then videos are now converted in a regular link (there were problems with some vanishing video links) 2013-11-02 10:46:25 +01:00
Michael Vogel
661664550d Repeated items that are transmitted to text based networks now contain the address and name of the original poater. 2013-10-20 12:26:27 +02:00
Michael Vogel
f1154cfdd5 Bugfix: Links were ignored sometimes. (Due to a missing default value) 2013-10-19 07:11:50 +02:00
Michael Vogel
e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel
680524f446 Detecting twitter profiles. This is added for the twitter import 2013-10-15 00:44:46 +02:00
Michael Vogel
59b64ece25 Preparations for the upcoming bidirectional twitter sync. 2013-10-12 08:29:39 +02:00
Michael Vogel
2d1b261fad Speed improvements of queries 2013-10-05 12:30:10 +02:00
Michael Vogel
d126924ae0 Vimeo videos are now embedded via SSL. 2013-10-02 22:17:56 +02:00
Michael Vogel
34d0eb709b Merge remote-tracking branch 'upstream/master' 2013-09-15 19:39:22 +02:00
Michael Vogel
d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
fabrixxm
4487515d0c Merge pull request #764 from fabrixxm/bug729 
Fix bug #729
 2013-09-08 23:39:36 -07:00
Tobias Diekershoff
7ab366b9c3 Check for user name in deleted user list and unset account expiration before importing the account (Bug #760) 2013-09-09 08:33:47 +02:00
Fabrixxm
3ebc5d1c80 update error message to login one 2013-09-06 12:30:10 -04:00
Fabrixxm
be3111dc6f add error control for openid on registration. fix #729 2013-09-06 12:22:53 -04:00
fabrixxm
51d934ee70 Merge pull request #758 from annando/master 
Better use of APC,  	Preparations for the pumpio synchronisation, fix youtube for firefox
 2013-09-06 07:55:03 -07:00
Michael Vogel
55b79e0891 Always embed the SSL version of youtube to avoid problems with Firefox. 2013-09-04 07:39:03 +02:00
Michael Vogel
9a1a666f24 Some changes to let pumpio react similar to facebook. 2013-09-04 00:01:00 +02:00
Michael Vogel
34e7206ba4 Preparations for the pumpio synchronisation. 2013-08-28 08:56:48 +02:00
Michael Vogel
209343d883 If "remove_multiplicated_lines" is set then some more linefeeds in lists are removed. 2013-08-24 14:54:07 +02:00
fabrixxm
da9f20f389 Merge pull request #749 from mexon/fetch_url_cookies 
Allow calls to fetch_url to specify a cookiejar file
 2013-08-23 10:01:43 -07:00
Tobias Diekershoff
20d35439a4 passing more then one argument to the crypt tag is parsed now as well 2013-08-20 11:47:11 +02:00
Michael Vogel
694ca8fc57 Code cleanup 2013-08-12 11:14:02 +02:00
Michael Vogel
e75f88d7fe Further redoings 2013-08-12 11:12:00 +02:00
Michael Vogel
ed33d28e61 redoing the change concerning the hostname. 2013-08-12 11:09:11 +02:00
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
tobiasd
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
tobiasd
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
tobiasd
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
Tobias Diekershoff
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
Michael - piratica.eu
2c93067682 Performance: Adding several variables for performance measuring. 2013-01-26 16:46:43 +01:00
friendica
f542653230 suppress duplicate comment notifications 2013-01-23 17:46:46 -08:00
friendica
d074656f26 Merge https://github.com/friendica/friendica into pull 2013-01-23 17:08:21 -08:00
friendica
b3b0a9de24 die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
Tobias Diekershoff
1f36ebdb2b add display_item hook back around l. 686 to the conversation 2013-01-22 08:11:13 +01:00
Michael - piratica.eu
cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica 
Conflicts:
	include/poller.php
 2013-01-20 14:17:09 +01:00
Michael - piratica.eu
7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
Michael Vogel
4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Zach Prezkuta
bf26af5ac6 insidious set_config bug 2013-01-18 23:38:49 -07:00
Michael Vogel
82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +01:00
friendica
30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta
2a8e5032e0 run check_config() in a separate process 2013-01-14 16:58:32 -07:00
Michael Vogel
452ff19d73 Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this. 2013-01-13 18:51:48 +01:00
Michael Vogel
5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. 2013-01-13 17:13:01 +01:00
Michael Vogel
158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Michael Vogel
8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. 
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
 2013-01-13 09:37:15 +01:00
friendica
8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
friendica
ceaedb41e4 Merge pull request #582 from fermionic/20130112-various-fixes 
Various fixes
 2013-01-12 12:24:51 -08:00
Zach Prezkuta
7f19018cd4 fix leak 2013-01-12 06:56:45 -07:00
Zach Prezkuta
1507ec37a4 give post a chance to arrive before rejecting photos from Diaspora 2013-01-12 06:52:15 -07:00
Zach Prezkuta
74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta
609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta
5f1ef732e0 remove now-unnecessary line in text.php 2013-01-10 21:48:33 -07:00
Zach Prezkuta
bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
Michael Vogel
61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Michael Vogel
82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica
4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica
07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica
a5755b59a8 preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 2013-01-04 15:21:05 -08:00
friendica
88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
Thomas Willingham
a8ea3d6e48 We haven't Got Zot 2013-01-03 20:18:43 +00:00
friendica
e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
Michael Vogel
e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel
ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
friendica
215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
friendica
4b2de6fdf2 if snautofollow - make all SN contacts writable 2012-12-29 02:51:15 -08:00
friendica
f962ecdd64 Merge https://github.com/friendica/friendica into pull 2012-12-29 02:36:19 -08:00
friendica
05996457f9 receiving post from archived Diaspora contacts 2012-12-29 02:35:41 -08:00
Zach Prezkuta
e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Michael Vogel
6f6b1f95c8 vier: With IE there are no borders around images anymore 
bbcode: Multiple new lines are now reduced
 2012-12-28 11:31:30 +01:00
Fabrixxm
b620b6e608 api: add 'allow_api' to user authenticated via oauth 2012-12-27 10:20:51 -05:00
fermionic
d3c54438df Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas 
revert unnecessary variable name changes
 2012-12-26 09:44:27 -08:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
fermionic
7e9730089f Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas 
20121225 smarty includes like friendicas
 2012-12-25 11:08:06 -08:00
Zach Prezkuta
e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Michael Vogel
5bc6896671 The caches are now cleared only once an hour. 2012-12-25 12:52:30 +01:00
Zach Prezkuta
f0f8d0f687 delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
fermionic
a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta
53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
friendica
a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel
b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel
7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel
a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel
0a29927e6d Mail: real threading now works with outgoing mails. 2012-12-19 16:31:06 +01:00
Michael Vogel
a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel
c22f65bafa repeated items from ostatus and diaspora are now using the share-element. 
Some design changes to repeated items in "vier".
 2012-12-19 12:18:52 +01:00
Michael Vogel
9ab34f8857 mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header. 2012-12-18 00:47:55 +01:00
Michael Vogel
fc816feb6d mailimport: Bug that prevented mails to be imported 2012-12-17 21:39:52 +01:00
Michael Vogel
4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Michael Vogel
a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel
9c0de28622 bbcode: New element "share" for shared content 
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
 2012-12-17 03:01:40 +01:00
friendica
0f1592547e Merge https://github.com/friendica/friendica into pull 2012-12-16 17:59:15 -08:00
friendica
3f63a69d7a divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
Michael Vogel
d253d59668 vier: Added Delegations and optical changes. 2012-12-15 14:39:37 +01:00
Michael Vogel
46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
Fabrixxm
71751ecb8c template_processor: add filter support to variables 2012-12-14 10:10:33 -05:00
friendica
6b36863dd8 prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists - 
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
 2012-12-13 21:02:14 -08:00
friendica
376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica
8b5288d0f7 Merge pull request #540 from Leberwurscht/master 
Cross site request forgery hole
 2012-12-03 13:40:29 -08:00
tobiasd
23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Leberwurscht
945afec656 fix CSRF hole in API 2012-12-01 01:26:54 +01:00
friendica
b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
friendica
32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
friendica
5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica
226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta
a536a4e657 local stuff leaked 2012-11-22 09:21:21 -07:00
Zach Prezkuta
04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
friendica
9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica
868bdc9b6a php warning 2012-11-22 03:19:05 -08:00
friendica
0840c8365a always check for valid dfrn_id before auto_redir 2012-11-21 15:56:00 -08:00
friendica
4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00