Commit graph

2077 commits

Author SHA1 Message Date
Michael Vogel 52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
Fabrixxm 0fb08e3642 nav: pass $baseurl to template 2012-06-29 05:29:29 -04:00
friendica 43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica 1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -07:00
friendica a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica 43d3721fa9 css smiley class 2012-06-28 16:42:40 -07:00
friendica d7f35c81db Merge https://github.com/friendica/friendica into pull 2012-06-28 16:05:28 -07:00
friendica de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
Zach Prezkuta cd9ce0ecb3 fix logic for nested lists--should be OR, not AND 2012-06-27 21:21:26 -06:00
Sebastian Egbers 587b081a38 moved api direct message formating to own function.
added same formating to direct reply message, when posting a new message.
2012-06-26 08:54:01 +02:00
Sebastian Egbers 0f0fb2e2f3 Merge branch 'master' of https://github.com/friendica/friendica 2012-06-26 08:33:41 +02:00
friendica a4b407eb54 stray s 2012-06-25 22:01:32 -07:00
friendica d32d0e2154 typos 2012-06-25 21:39:07 -07:00
friendica 78ede4744f add event titles to discovered birthday events 2012-06-25 21:37:38 -07:00
friendica 0f0ffce1b6 change required doco 2012-06-25 21:27:34 -07:00
friendica 359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
friendica 53f0aee82d Merge https://github.com/friendica/friendica into pull 2012-06-25 18:16:55 -07:00
friendica f1991a5952 propagate remote deletes 2012-06-25 18:15:56 -07:00
Zach Prezkuta 5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting 2012-06-25 19:03:03 -06:00
Zach Prezkuta 8bb7ab88fb Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
2012-06-25 19:03:03 -06:00
friendica f0b41709eb improve remote delete forwarding 2012-06-25 17:45:33 -07:00
friendica fad2679c7e Merge https://github.com/friendica/friendica into pull
Conflicts:
	include/bbcode.php
2012-06-25 16:05:42 -07:00
friendica b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Simon L'nu 939ebe16f8 fix typo and syntax error
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:49:36 -04:00
friendica cb450d3365 Merge pull request #360 from fermionic/more-nested-lists
allow nested [ol] and [ul] lists too
2012-06-25 14:20:16 -07:00
Zach Prezkuta fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
Zach Prezkuta 4293de7554 allow nested [ol] and [ul] lists too 2012-06-25 08:26:00 -06:00
Sebastian Egbers 8c251aebc7 fixed direct message reply in api call. 2012-06-25 16:25:34 +02:00
Sebastian Egbers af1d4bb632 modified api message reply to set title to conversion title, when replying. 2012-06-25 15:53:56 +02:00
Sebastian Egbers 020deedd7c Merge branch 'master' of https://github.com/friendica/friendica 2012-06-25 13:59:39 +02:00
friendica 7ea5917bf7 more service class functionality 2012-06-25 03:25:06 -07:00
friendica 35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica 7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
fermionic 49ecf58163 Merge pull request #357 from fermionic/fix-relayable-signature-handle
ok now I'm just making silly mistakes--take out premature function locki...
2012-06-23 21:29:52 -07:00
Zach Prezkuta 59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code 2012-06-23 22:28:28 -06:00
friendica 92a997365f Merge https://github.com/friendica/friendica into pull 2012-06-23 21:11:41 -07:00
friendica 1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
fermionic 642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle
use author handle instead of sender handle
2012-06-23 21:08:43 -07:00
Zach Prezkuta 0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta 5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
Zach Prezkuta 1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta 4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Max Weller cbf1cab0da Merge remote-tracking branch 'sebastian/master' 2012-06-23 22:59:03 +02:00
Max Weller e3c36dfd1d add reliable way to get server version 2012-06-23 22:52:50 +02:00
Max Weller 11b6beae06 make it selectable 2012-06-23 22:39:11 +02:00
Max Weller 111ace5abd I want HTML code! 2012-06-23 22:35:43 +02:00
Max Weller 9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects 2012-06-23 19:38:15 +02:00
Max Weller 2c992c5969 bugfix 2012-06-23 19:35:01 +02:00
Max Weller f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages 2012-06-23 19:29:58 +02:00
Max Weller d8a376666c modified direct_messages 2012-06-23 19:21:48 +02:00
Zach Prezkuta 90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06:00
friendica 7a346bc756 this is going to take some more debug before it can be roller out 2012-06-23 07:43:56 -07:00
friendica 63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica 1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica 49360b0a64 Merge https://github.com/friendica/friendica into pull 2012-06-23 05:47:31 -07:00
friendica 22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica 7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Michael Vogel a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Michael Vogel 7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta 9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta 7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Vasudev Kamath 6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Sebastian Egbers cd25c3b5dd added replyto and subject to direct messages. 2012-06-22 14:54:31 +02:00
Sebastian Egbers c14270ac64 modified conversion to use x function for parameter checking. 2012-06-22 13:35:36 +02:00
Max Weller 6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Max Weller 0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00
friendica 53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica 91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
Zach Prezkuta 73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
friendica bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica 0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
friendica 961c633773 Merge pull request #344 from ridcully/master
exclude_replies for twitter api
2012-06-20 01:01:55 -07:00
friendica b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica 1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
Zvi ben Yaakov (a.k.a rdc) ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) 6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -07:00
Sebastian Egbers eab3938471 added exclude_replies option to api call statuses/user_timeline. 2012-06-19 16:27:23 +02:00
Sebastian Egbers 43532b7414 added exclude_replies option to api call statuses/home_timeline. 2012-06-19 16:15:19 +02:00
friendica dbceef04e8 exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there 2012-06-18 20:21:54 -07:00
Zach Prezkuta 7cd516e34f fix some whitespace issues 2012-06-18 21:06:54 -06:00
Zach Prezkuta 42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica 341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
Thomas Willingham 371bdfb19d Typo breaking tag notifications 2012-06-18 22:00:18 +01:00
Michael 6eaca19f41 Merge branch 'master' of github.com:annando/friendica
Conflicts:
	include/oembed.php
2012-06-18 08:51:12 +02:00
Michael d53414a333 OEmbed: Don't output the width of images 2012-06-18 08:49:35 +02:00
Michael Vogel cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Zvi ben Yaakov (a.k.a rdc) 8af9fe8df7 Added missing backticks to navigation bar query 2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc) b0021a4637 Enabled Profile photo revisions to be displayed in navigation bar 2012-06-17 23:22:37 +03:00
Michael Vogel 3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica 7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
Hauke Zuehl cc7d849ce3 Merge remote branch 'upstream/master' 2012-06-16 19:49:04 +02:00
fermionic 950dacbbdd Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
Diaspora dont check more signatures than diaspora does
2012-06-16 09:49:19 -07:00
Zach Prezkuta 3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta 577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta 0ff86e28bb fix small typo for logging command in api.php 2012-06-16 10:25:46 -06:00
Zach Prezkuta 0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta 09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Hauke Zuehl f9a40ccbde Merge remote branch 'upstream/master' 2012-06-16 18:04:59 +02:00
Hauke Zuehl 1231dd72f0 Check if $rr exists 2012-06-16 15:07:23 +02:00
friendica 4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica 2efee75557 also mark for death if there isn't any xml to be found 2012-06-14 17:38:39 -07:00
friendica 267681844d poll even if contact hasn't responded recently, so we can update the termination status 2012-06-14 17:27:07 -07:00
friendica be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
friendica 79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica b0a0c1ef4d couple of little fixes to enotify positional params 2012-06-13 20:03:18 -07:00
friendica 7d8b087f4a fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them. 2012-06-13 19:59:20 -07:00
friendica 24bf4632af Merge https://github.com/friendica/friendica into pull 2012-06-13 16:25:57 -07:00
friendica 85876be48a Merge https://github.com/fabrixxm/friendica into pull
Conflicts:
	util/messages.po
2012-06-13 16:25:09 -07:00
friendica 36491462ba Merge pull request #333 from Erkan-Yilmaz/master
missing bracket
2012-06-13 16:21:15 -07:00
friendica d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
Erkan Yilmaz e8e1de3603 add missing bracket 2012-06-13 20:41:53 +02:00
fabrixxm feab17bfea enotify: fix stupid typo 2012-06-13 12:08:34 -04:00
fabrixxm 46cb8174fa enotify: rework strings to more easy to translate 2012-06-13 11:55:21 -04:00
friendica a424fecdae this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March 2012-06-12 22:52:34 -07:00
friendica bbdb8751e5 that was it 2012-06-12 21:39:39 -07:00
friendica 82ad881c85 think this will fix it 2012-06-12 21:38:10 -07:00
friendica d955813f22 tracking another edge case 2012-06-12 21:34:28 -07:00
friendica 08af43f396 edge case 2012-06-12 21:30:17 -07:00
friendica 920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 08b3126dae Merge https://github.com/friendica/friendica into pull 2012-06-12 02:48:00 -07:00
friendica 1dd52c20cf move parens to proper place 2012-06-12 02:47:05 -07:00
Michael Vogel a1c407e017 Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php" 2012-06-12 12:39:28 +03:00
friendica b6ff71acaa survive bad/un-parseable input to datetime_convert 2012-06-12 02:06:29 -07:00
friendica 645c2f9092 Merge pull request #331 from mexon/upstream
Add a hook for post-processing remote items
2012-06-12 00:52:36 -07:00
Matthew Exon 33a4e45f6b Add a hook for post-processing remote items after they've been stored in the database and have an ID 2012-06-12 07:58:12 +02:00
friendica b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica 24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica 75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica 09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica 3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
Vasudev Kamath 11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
friendica afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
Fabio Comuni 2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni 7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm 1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica 6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
friendica 5389efffa9 add email probe logging, limit typo check to main addon files and skip additional support files 2012-06-05 19:28:04 -07:00
Vasudev Kamath 12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Michael Vogel 0353410cd4 Merge remote branch 'upstream/master' 2012-06-04 08:09:15 +02:00
Michael Vogel 5de91c2a7c API: Only repeat items if there is a content 2012-06-04 08:08:45 +02:00
Zach Prezkuta 9920fb39e5 Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
2012-06-03 14:53:30 -06:00
Zach Prezkuta 06263f72a8 cleanup and logging 2012-06-03 14:53:30 -06:00
Zach Prezkuta cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta 77962aa79d Fix bugs in the retraction code
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Zach Prezkuta 1fe1ac022f Support relayable_retractions that are relayed to us by the top-level post owner 2012-06-03 14:53:29 -06:00
friendica daa4f5213f zrl's when visiting public photos at the source site 2012-06-03 01:53:11 -07:00
friendica 97576e3e33 doco 2012-06-02 23:22:02 -07:00
friendica 82cf664920 turn "follow" into a function 2012-06-02 23:12:20 -07:00
friendica d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica 3d39e6e594 bug #439 - remove web port number from notification email "from" address 2012-06-02 18:23:54 -07:00
friendica 4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica 608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica 29bdf432f0 fewer "bob smith to bob smith via wall-to-wall". 2012-06-02 00:40:38 -07:00
friendica c0b74b18fe Merge pull request #321 from beardy-unixer/master
BB code [quote=somebody] fix.
2012-06-01 21:48:23 -07:00
friendica 0165d5dd2c registration issue after re-factor 2012-06-01 15:42:13 -07:00
Thomas Willingham 7a5c85f628 [quote=somebody] was appearing as an extended spoiler tag. 2012-06-01 23:31:07 +01:00
friendica 93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
Zach Prezkuta d5116689af query using both id and parent 2012-05-31 19:45:58 -06:00
friendica f0cf0ebb48 prevent email from leaking in feeds 2012-05-30 19:11:01 -07:00
friendica 15c023a218 y didn't i think of this b4? 2012-05-30 17:22:51 -07:00
friendica e5a988f0b5 fix private photos that also have a size specification 2012-05-30 01:52:58 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica c58b0b9cbb prvgroup should see intros 2012-05-29 18:24:44 -07:00
friendica 514c994e6a possible sql injection in search 2012-05-29 17:14:35 -07:00
friendica 21d79e787e Merge https://github.com/friendica/friendica into pull
Conflicts:
	mod/search.php
2012-05-29 16:50:42 -07:00
friendica 419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
Simon 43c185ce04 Merge pull request #316 from annando/master
Speed improvements
2012-05-29 13:13:10 -07:00
Tobias Hößl dfef0ec84d Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning 2012-05-29 19:03:30 +00:00
Michael Vogel 8202355df9 Disabled logging of SQL statements 2012-05-29 16:16:37 +02:00
Michael Vogel 68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica 2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica 0241bd1fbf Provide backend option to only expire other peoples' conversations. 2012-05-28 23:24:10 -07:00
friendica f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
friendica ff0291c876 add plugin hooks to gender, sexpref, and marital selectors 2012-05-27 22:35:01 -07:00
friendica b752acd089 birthday in november,december bug 2012-05-27 21:36:20 -07:00
friendica 2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica 08941d4285 handle multiple underscores in D* links 2012-05-26 23:46:42 -07:00
friendica 73c61b6f96 allow force ssl on notifications 2012-05-26 16:11:51 -07:00
Michael Vogel 7f19d39b14 Doing negative caching for config values, special logfile for database optmisations 2012-05-26 15:41:23 +02:00
Michael Vogel a612b10b2a Deactivating the test output in db engine 2012-05-26 03:23:18 +02:00
Michael Vogel 4951210508 Speed optimisation by enabling the posibility of the MySQL fulltext engine 2012-05-26 03:21:07 +02:00
Michael Vogel a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
Simon L'nu 789063da39 add a placeholder attribute on search-text; dispy fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
friendica 61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica 3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica b43b680802 clear submanage, etc from session on logout 2012-05-22 18:05:58 -07:00
friendica 3ce06caeed cause of bogus wall-to-wall posts found 2012-05-22 03:55:11 -07:00
Tobias Diekershoff 30f3a16874 Merge branch 'master' of https://github.com/friendica/friendica 2012-05-22 11:57:19 +02:00
Tobias Diekershoff 5dad99888d fix setting array values to config items 2012-05-22 11:56:49 +02:00
friendica a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica 54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
friendica afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
Michael Vogel 8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Michael Vogel 9a940786c1 Merge remote branch 'upstream/master' 2012-05-19 14:04:24 +02:00
friendica 513ef2410d backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ 2012-05-19 02:42:11 -07:00
friendica 34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica 7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica 4f0e26759c bring in the *much better* xml parser from the original zot branch 2012-05-16 21:29:57 -07:00
Michael Vogel f2c0c40f6e Merge remote branch 'upstream/master' 2012-05-16 08:24:46 +02:00
Matthew Exon e574514e21 Allow plugins to modify the contact photo menu 2012-05-15 08:59:45 +08:00
friendica 3811fe288f rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00
Vasudev Kamath 10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
friendica 4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica 20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica 496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
Michael Vogel f2e648d62f Merge remote branch 'upstream/master' 2012-05-09 14:56:48 +02:00
friendica 53157bb954 send browser back to correct page (with query args) after posting 2012-05-09 04:18:01 -07:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
friendica a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
friendica 10812e0c19 make it optional to optimize the item table after expire 2012-05-08 15:33:01 -07:00
friendica f0b7a8ae35 finished dry run - now for real test 2012-05-07 18:36:28 -07:00
friendica 8a4e3cc370 don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration 2012-05-07 16:51:09 -07:00
friendica 189a31e628 If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
2012-05-07 15:54:49 -07:00
friendica e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
friendica 8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
Vasudev Kamath b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica 8ae83201cf consolidate item deletion so we can fix orphaned categories and file_as tags. 2012-05-05 07:05:32 -07:00
friendica d0dd22af57 workaround to clean up orphaned filetags 2012-05-04 17:43:47 -07:00
friendica 7c6e8b30b2 only show remove category to item owner 2012-05-04 16:45:10 -07:00
friendica 10754ced3e category removal 2012-05-04 06:42:56 -07:00
friendica 9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
friendica 421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
friendica 15542a8690 yet another bug in remote_friends_in_common 2012-05-03 20:47:04 -07:00
friendica f3e18df55d string update 2012-05-03 16:55:03 -07:00
Fabio Comuni 52915c6e68 validate_url() and validate_email() validate also IP address. 2012-05-03 15:28:23 +02:00
friendica 3ecde2d72f use mysql replace on cache items 2012-05-02 16:27:19 -07:00
friendica 8e1437ca8b fixing common friends 2012-05-02 16:15:59 -07:00
friendica 21e18db757 missing param 2012-05-02 02:18:54 -07:00
friendica 35dc4202a2 how did that happen? 2012-05-02 00:58:28 -07:00
friendica a42a475e10 shuffle results of remote_common_friends widget 2012-05-02 00:44:37 -07:00
friendica 1b1f56f556 only validate once 2012-05-01 23:16:58 -07:00
friendica dd27328390 perform basic validation 2012-05-01 23:15:39 -07:00
friendica becdb1f508 final touches - show friends in common with total strangers from different sites 2012-05-01 21:22:27 -07:00
friendica e247ed3de2 cross fingers 2012-05-01 20:36:35 -07:00
friendica 594803afca reduce the scope a bit 2012-05-01 20:33:19 -07:00
friendica 72dbc2faee fn not found 2012-05-01 20:11:35 -07:00
friendica 15c1850156 another one 2012-05-01 19:20:41 -07:00
friendica 1fc796b276 typo 2012-05-01 19:19:24 -07:00
friendica 8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
friendica f24ffa8ef0 improve handling of relative feed url's 2012-05-01 17:10:26 -07:00
friendica 38ccd2e655 convert html entities to utf-8 before email header encoding 2012-05-01 15:49:22 -07:00
friendica 0ca4fa78c8 link socgraph to zrls 2012-05-01 01:34:47 -07:00
friendica 584ac68ae4 adding zrl support to social graphs 2012-05-01 01:16:47 -07:00
friendica d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
Zach Prezkuta a844093365 change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 2012-04-30 20:51:22 -06:00
friendica da555286d6 missed a db field 2012-04-29 22:36:26 -07:00
friendica 928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica ae2aa74444 not all profile selector choices have unique or direct translations 2012-04-29 20:05:29 -07:00
friendica 1ebde08415 log db error strings in all cases 2012-04-29 19:41:17 -07:00
friendica e3fecb2557 improved db error logging 2012-04-29 17:34:54 -07:00
friendica 64060f82dc toggle to archive unfriends, though render them useless 2012-04-28 21:56:17 -07:00
friendica 4ff2e9a103 a few more continues that should be returns 2012-04-28 16:54:33 -07:00
friendica 44700b914d poller refactor: continue not valid in this context 2012-04-28 04:20:38 -07:00
friendica f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Vasudev Kamath 214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
friendica 3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
friendica 2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica 3637534119 move unfriend to standalone function for use in account removal 2012-04-23 19:42:57 -07:00
friendica e9e4fb664a allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets 2012-04-23 05:42:46 -07:00
friendica 2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
Michael Johnston 76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Michael Vogel a3f08c44be API: RSS-Feeds are now shortened to 1000 characters. (With added link) 2012-04-22 18:00:24 +02:00
Vasudev Kamath 8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
Tobias Hößl e3af818263 Typo 2012-04-17 19:31:06 +00:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica fd2f7dd6ae turn on comment edit 2012-04-16 03:51:48 -07:00
friendica 0b838e4cc7 propagate edited comments 2012-04-16 02:09:00 -07:00
friendica c8598e7da6 edited comments weren't being relayed 2012-04-16 01:35:27 -07:00
friendica 93df525f5c Merge pull request #238 from annando/master
API: Support of the statusnet application
2012-04-15 16:00:07 -07:00
friendica f994f9abc6 open contact edit in same window 2012-04-15 06:34:01 -07:00
friendica 31b1d353b2 Merge pull request #234 from copyninja/master
Executable permisson removal on files which are not elf/script
2012-04-14 14:50:54 -07:00
Simon L'nu 6278b2a923 string fix: typo. slow down scroll to top in dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Vasudev Kamath 41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Michael Vogel e825a73f1d DBA: Reverting back to original source 2012-04-14 13:35:11 +02:00
friendica 9dd0ef2aeb bug #372 - category feeds 2012-04-14 04:19:41 -07:00
Michael Vogel eb27c32065 DBA: Nothing really done .. 2012-04-14 13:17:58 +02:00
Michael Vogel 4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica 7c63ca8364 one more 2012-04-13 17:39:12 -07:00
friendica 0d0aa7495b additional marital status selectors 2012-04-13 17:34:02 -07:00
Fabio Comuni f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni 4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
Fabio Comuni 67a2d5be77 validate_url allow naked subdomain if is "localhost" 2012-04-13 09:42:53 +02:00
friendica df1904b204 stray debug statements, forgot to filter pending contacts 2012-04-12 23:14:41 -07:00