nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
29909 commits 2 branches 55 tags 148 MiB
Commit graph

653 commits

Author SHA1 Message Date
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
Michael db2d0e0095 removal of useless variable 2017-01-01 23:38:32 +00:00
Michael 79b5eb63db Some more reverts 2017-01-01 23:37:29 +00:00
Michael 212f78386d Deactivated the auto mention - we should do it differently. 2017-01-01 23:35:34 +00:00
Michael 8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +00:00
Michael 8c579735f9 Diaspora: Add a mention when doing a thread reply 2017-01-01 21:21:16 +00:00
Roland Häder 45dd1ccc7b
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 19:51:08 +01:00
Roland Häder f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:36 +01:00
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:29:56 +01:00
Roland Häder 9814414b6a
used dbm::is_result() instead of count() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:39:06 +01:00
Roland Häder b4bc07fdcc
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:32:00 +01:00
Roland Häder 536f078ed4
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:31:05 +01:00
Roland Häder 52f14ffa5f
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:17:09 +01:00
Roland Häder 6e44acfed6
Continued with coding convention: 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-20 21:15:53 +01:00
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 
# Conflicts:
#	include/follow.php
 2016-12-20 12:50:36 -05:00
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder 51716957b2 converted more to dbm::is_result() + added braces/space 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 15:37:27 +01:00
Roland Häder fa444f373c added curly braces + space between "if" and brace + added missing @param 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:19:23 +01:00
Roland Häder 4299cce719 added curly braces + space between "if" and brace + added missing @param 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:18:54 +01:00
Roland Häder 4dce3d8224 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:55 +01:00
Roland Häder abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +01:00
Roland Häder fb676335db Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:10:33 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:41:33 +01:00
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
 2016-12-13 11:00:44 +01:00
Roland Häder 6a8a36f12d More usage of dbm::is_result($r) instead of count($r): 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:44:13 +01:00
Michael e12227c000 The gcontact-id and the object field can now be stored with item_post 2016-12-09 09:57:02 +00:00
rabuzarus 66341046d2 Bugfix: preview has sometimes phantom mentions and tags 2016-11-20 16:19:55 +01:00
Michael e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
Michael 8ab90f02c3 Shadow entry mechanism improved 2016-10-29 21:27:56 +00:00
Michael 7bd79c67a7 Avoiding deadlocks and small sql improvements 2016-10-29 20:17:33 +00:00
Michael Vogel 3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Michael Vogel 8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Michael Vogel 4c5a7fac83 Some stuff to make Hypolite happy :) 2016-10-21 21:32:27 +00:00
Michael Vogel 501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel 356414846b Check for duplicated postings from connectors 2016-10-17 19:17:11 +00:00
Michael Vogel e5c7ce0902 Use "last-item" in the contact table instead of an expensive sql query 2016-10-14 05:45:32 +00:00
Michael Vogel 6abac720e2 Small performance tweaks for "item_store" as well. 2016-10-07 06:05:43 +00:00
Michael Vogel f9b9ee6b77 Increased performance when storing items 2016-10-06 21:24:29 +00:00
Michael Vogel 5fb2e47809 Increased performance when storing items 2016-10-05 16:12:53 +00:00
Roland Häder c825cc8d0d
This merge brings back dbm::is_result() where I could find it. 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:21:18 +02:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel 9a7653a4fe Store the author-id and owner-id in mod/item.php as well 2016-06-21 07:54:45 +02:00
Roland Häder 3e701b90ac
Continued rewriting: 
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-05-01 14:24:44 +02:00
Michael Vogel ca98b47ee5
Remove test code 2016-05-01 13:48:52 +02:00
Michael Vogel 33436132a0
Use data from contact and gcontact prior to probe_url 2016-05-01 13:48:52 +02:00
Michael Vogel e7c4d0bc50
Bugfix DFRN and bookmark detection 2016-05-01 13:48:52 +02:00
Michael Vogel cea445b6f3
Check the global contacts every 90 days/Better handling in item creation 2016-05-01 13:48:52 +02:00
Michael Vogel 5efd25a0eb
Some more checks that the gcontact table contains valid data 2016-05-01 13:48:52 +02:00
Michael Vogel 1584f2ee00
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore 2016-05-01 13:47:24 +02:00
Michael Vogel 8d82bf922e
The signature creation now moved into the Diaspora class. That's much cleaner. 2016-05-01 13:47:24 +02:00
Michael Vogel cd92521c1d Remove test code 2016-04-25 21:39:54 +02:00
Michael Vogel 1aa6c1dc5b Use data from contact and gcontact prior to probe_url 2016-04-25 21:35:42 +02:00
Michael Vogel 93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
Michael Vogel 5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel 28f97845ca Some more checks that the gcontact table contains valid data 2016-04-20 07:00:55 +02:00
Michael Vogel 71caebdae0 Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore 2016-04-13 07:00:36 +02:00
Michael Vogel d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel 7f1f549c6f Fallback when there is no nick name 2016-02-14 15:08:49 +01:00
Michael Vogel 7b2fadcf43 Get rid of the "guid" table. We don't need it anymore. 2016-02-09 10:21:10 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors" 
This reverts commit db949bb802.
 2016-02-07 15:11:34 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors 
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
 2016-02-05 21:52:39 +01:00
Fabrixxm 7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00
Michael Vogel 214f381e81 Code cleanup 2016-01-10 12:37:49 +01:00
Michael Vogel 358a9fd6fd Notify and alias will be fetched via OStatus 2016-01-08 00:35:46 +01:00
Michael Vogel 9521cdc18f notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed 2016-01-07 23:43:16 +01:00
Michael Vogel fdb31abdfa Use gcontact when adressing contacts in editor 2016-01-07 08:19:28 +01:00
Michael Vogel 2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
rabuzarus 3df5c17124 reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
Michael Vogel 388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Sandro Santilli 2a2dd6a1b9 Remove duplicated calls to language detection 
Also avoids overriding existing "lang" specification in an item
 2015-09-23 10:47:34 +02:00
Michael Vogel a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel 419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
Michael Vogel c416ce4893 Improved tagging 2015-06-03 11:27:56 +02:00
Michael Vogel b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
Michael Vogel 39d4856abb Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-02 23:19:00 +02:00
Michael Vogel b5129a3e11 Store the GUID from here as well. 2015-06-02 22:10:28 +02:00
Michael Vogel 1a26d464dd Always add the addressed contacts in a post to the tags. 2015-06-02 20:36:10 +02:00
Michael Vogel d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel 788d3cf1ab Ostatus: The automatical adding of @-replies now uses the correct contact. 2015-05-30 21:45:43 +02:00
fabrixxm 05d1aaf0ed Use correct class name to send post to email recipients. Fix #1437 2015-03-22 10:12:16 +01:00
Michael Vogel 7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Michael Vogel 3f1d186106 Remove the old hashtag functions, change it to the new functionality. 2015-03-01 20:40:38 +01:00
Michael Vogel 1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
Michael Vogel 97ec2787c6 New feature: Storing the field "extid" is now possible 2014-10-20 08:21:23 +02:00
Michael Vogel 459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
Michael Vogel 4bdd905b3e Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile. 2014-08-28 01:06:41 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel b99737986d The GUID in the link to the items has to be encoded, since it could contain special characters 2014-08-09 09:17:28 +02:00
Michael Vogel f2f73799ba When storing items, the object-type is detected and stored. 2014-08-07 08:02:24 +02:00
Michael Vogel 4d6f28d224 Optimized version of the possibility to reload the content of the network page only at its top. 2014-08-02 00:35:25 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id) 
Bugfix for adding tags to photos
 2014-07-22 00:36:20 +02:00
Michael Vogel c980e6d20d Possibility to disable the automatic reload of the network page 2014-07-09 21:32:32 +02:00
Michael Vogel 48e2b422dd Preparation for an bidirectional app.net connector 2014-06-04 21:25:31 +02:00
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02:00
Michael Vogel 8689ab3e1b Now changing categories also changes them in the term table. 2014-03-20 18:48:08 +01:00
Michael Vogel bbf9378a49 Even more SQL improvements. 2014-03-16 17:12:56 +01:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Michael Vogel eaefcf9de7 All subqueries in tag searches are now reformed. Further SQL improvements 2013-11-03 02:07:44 +01:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
Tobias Diekershoff 4ee23069ad typo found in the php.logs 2013-03-24 09:37:11 +01:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2013-02-20 21:57:26 +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
Tobias Diekershoff fca8a23265 use enotify to send CC mails 2013-02-17 08:20:29 +01:00
Tobias Diekershoff 77bc4cd0dc use entry title (if set) as subject when send by email 2013-02-16 11:03:46 +01:00
Fabrixxm 0a79b2300c delete item page respond with json if called via ajax. 2013-02-15 06:34:32 -05: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 c9cce9873d search privacy enhancements for those with blocked walls 2013-01-27 13:14:13 -08: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 Vogel 82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +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
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 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
friendica 9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
friendica 112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -07:00
Zach Prezkuta ce73cd560f allow tagging of people by name or nickname 2012-09-29 17:55:40 -06:00
Zach Prezkuta 8a4dcc28c1 make size search less greedy 2012-09-14 18:33:07 -06:00
Zach Prezkuta f445ed47df fix permissions for uploaded images with size specified 2012-09-14 18:22:56 -06:00
friendica 411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica 4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta 79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
friendica 68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
Domovoy 4b514ea989 Fallback so that we alway have a thr-parent 2012-08-07 10:04:47 +02:00
Domovoy 97285f4811 Preview was not working 2012-08-05 15:35:12 +02:00
Domovoy 786e9064f2 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-04 23:33:06 +02:00
friendica 621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy 8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Domovoy 2a1657e361 Revert "Progress on #1. Comments are now threaded, at least in the database, for normal view." 
This reverts commit da1b47a029.

Useless, comments are already threaded in the database using parent-uri
 2012-07-23 13:58:47 +02:00
Domovoy da1b47a029 Progress on #1. Comments are now threaded, at least in the database, for normal view. 2012-07-23 12:56:47 +02:00
friendica 8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
friendica 9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
Zach Prezkuta fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
friendica a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
Zach Prezkuta 28526dbf21 remove possibly unnecessary checks for likes or comments created by Diaspora users 2012-06-25 19:03:03 -06:00
Zach Prezkuta 9e8573507e store signature info for remote users too 2012-06-25 19:03:03 -06:00
Zach Prezkuta 5773241537 add some debug logging 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
Zach Prezkuta fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -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
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica 0ef8ccf11b fix wall_uploaded photo permissions on group post by member 2012-05-25 17:42:35 -07:00
friendica a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica dd86f40f96 set comment permissions explicitly to parent permissions 2012-05-19 16:42:24 -07:00
friendica e7ff35f27d Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. 2012-05-02 22:33:51 -07:00
friendica 2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica 0a3454c841 function name typo 2012-04-15 05:11:52 -07:00
friendica 18e225b051 move all fix_mce to one function so it can easily be undone 2012-04-10 17:14:07 -07:00
friendica 92c20895e0 use local_user for tag completion if available. See bug #368 2012-04-09 04:55:52 -07:00
friendica 977625a53b fix to wall_upload photos default permissions to use cid rather than uid. 2012-04-08 16:19:45 -07:00
friendica cf2d8ef7a6 tag tests cont. 2012-04-07 02:11:56 -07:00
friendica 3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Michael Johnston ca1e2254c9 typo datarry -> datarray 2012-03-25 16:00:11 -04:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica f1bbe03df1 work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
friendica 057a142b8c cut/paste error 2012-03-17 00:08:52 -07:00
friendica 28f941193d syntax error from pasted text, remove ^M's 2012-03-16 06:02:26 -07:00
friendica 531201f2a1 Merge pull request #132 from campino/master 
Test cases
 2012-03-14 15:16:30 -07:00
Simon L'nu 0bf9595ab1 PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-14 11:00:20 -04:00
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 2012-03-14 12:30:52 +01:00
Alexander Kampmann bce3bfff38 get tags test improved 2012-03-12 13:59:00 +01:00
Alexander Kampmann f8042d0445 splitted test cases. 2012-03-09 12:57:11 +01:00
Abinoam P. Marques Jr 2d5f8b4b48 mod/item.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica 2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
friendica 1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
friendica 7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica e43a3a412c store moderated flag if set 2012-01-29 02:09:39 -08:00
friendica e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica 0856935d75 use $_REQUEST for all post items, move default api permission code block to simplify logic 2012-01-12 14:20:21 -08:00
friendica 87c4d1c3cd bug #251 - privacy settings not working via API 2012-01-12 13:58:17 -08:00
friendica 7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica 291a82c4a4 backend for per-network streams 2012-01-05 18:11:53 -08:00
friendica b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica 53878625f6 backend support for post preview 2012-01-05 15:02:44 -08:00
friendica fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica 0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica 356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica efb9157490 eliminate dup identical hashtags in posts 2011-12-16 01:42:45 -08:00
friendica d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica 3afa248238 use default post permissions when coming from api - unless permissions are explicitly set. 2011-11-28 20:09:10 -08:00
friendica d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
Friendika cc1c015f20 @ completion is a bit too greedy 2011-11-05 21:43:58 -07:00
Friendika bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Friendika a9ec56ace1 prevent duplicate @ tags 2011-11-02 18:52:55 -07:00
Friendika 05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Fabio Comuni a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Friendika 557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Friendika b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Friendika 7091173131 removing another potential way a post could have a zero parent. 2011-10-03 02:39:19 -07:00
Friendika 119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika 8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika 9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Friendika 4f24494b0b Dreamhost's unreliable process model is really getting irritating 2011-09-12 19:42:10 -07:00
Friendika 17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika 82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Friendika f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika 0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika 240941237a privacy enforcement on pubmail_enable 2011-08-15 18:29:49 -07:00
Friendika bbd545b9ca honour "post to xxx network by default" when using API 2011-08-14 04:26:41 -07:00
Friendika 0745c00b16 guids on items 2011-08-07 17:33:13 -07:00
Friendika 8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika d0b7723bbc re-parent api post item with parent_id and no parent_uri 2011-08-03 16:29:25 -07:00
Friendika 996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika 55bbe2108a event ownership from remote feeds messed up, this is one step - may require more 2011-07-12 01:24:07 -07:00
Friendika ad5b976978 allow spaces in @ tags 2011-06-29 18:59:05 -07:00
Friendika 38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika 5633430a19 don't allow tags in app source 2011-06-23 15:58:43 -07:00
Friendika 96857389ac friendika-z initial implementation 2011-06-23 01:57:14 -07:00
Friendika 55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika c92e6ed929 avoid race condition on delete checked items 2011-06-16 00:38:41 -07:00
Friendika e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika ca84823437 Dear $username not expanded/replaced in text emails 2011-06-14 20:49:25 -07:00
Friendika a10abd4860 remove event if attached item is deleted 2011-06-08 00:47:00 -07:00
Friendika e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Friendika 547fd1e0e5 small fixes to item post to try and sort out segfault issues on php 5.3 (?) 2011-05-29 15:47:26 -07:00
Friendika 763ff827d5 don't reset photo permissions unless photo has owner-only permissions 2011-05-27 02:37:12 -07:00
Friendika 3710a6fd07 sort out a couple of email notify issues 2011-05-25 18:15:49 -07:00
Friendika b6b2997b43 remove debug line 2011-05-25 16:02:02 -07:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Fabio Comuni e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
Friendika ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Chris Case f4cb6b9b08 fixed a couple of bugs 2011-05-21 23:19:50 -07:00
Chris Case 4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case 2cf696d0b5 image updates 2011-05-21 19:27:56 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika 0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika 245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika 9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Friendika 43234a6678 rework post editing a bit 2011-03-18 05:06:16 -07:00
Fabio Comuni 7df8e18dd1 Update more strings 2011-03-18 11:02:42 +01:00
Friendika 9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika 8fd989c568 protect tags from double expansion during RT 2011-03-16 19:57:13 -07:00
Friendika f01538a54f content expiration 2011-03-15 17:31:49 -07:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika 05d3eb59ec status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower. 2011-02-26 01:53:18 -08:00
Friendika 755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika 4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Friendika c397a2f89b properly handle error returns in post w/ajax 2011-02-16 20:25:10 -08:00
Friendika d6998ffef2 small fixes 2011-02-16 13:19:54 -08:00
Friendika 9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
Friendika df20990753 ajax comments 2011-02-14 04:43:49 -08:00
Friendika 3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika de2c9531db post permission hooks 2011-02-09 19:39:49 -08:00
Friendika f70a0b0282 more graceful handling of some statusnet followups 2011-02-08 18:44:30 -08:00
Friendika 766c4778cb modify tag handling and replies to stnet 2011-02-08 15:08:07 -08:00
Friendika 1d0d765344 more error checking on posts 2011-02-04 13:37:04 -08:00
Friendika 8965db24cc post to email recips (backend) 2011-01-31 18:18:28 -08:00
Friendika e8d52d879b more debugging to see if the google push hub is even trying to publish our content. 2011-01-30 15:28:50 -08:00
fabrixxm e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika 00d2b58358 fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs. 2011-01-23 16:29:30 -08:00
Friendika 950e5f6693 given a tag @foo, don't also link/replace words like food in msg body 2011-01-23 13:49:21 -08:00
Friendika 15c81716e8 much better solution to privacy on ajax wall photos 2011-01-04 02:01:07 -08:00
Friendika 20cc007655 set permissions of uploaded wall photo to match those of the 
associated status post.
 2011-01-03 23:05:20 -08:00
Friendika caf93fffac move facebook post to addon - and under the AGPL 2010-12-27 23:28:34 -08:00
Friendika 6808d53d0f plugin/addon API landing - still things left to do before it's useful 2010-12-22 14:16:22 -08:00
Friendika 4a2d83fcff don't send any private messages over the facebook channel 2010-12-19 13:41:55 -08:00
Friendika d3987416c5 facebook connector - initial checkin (untested) 2010-12-17 22:36:35 -08:00
Friendika a42b9ea3de display the fact that a conversation is private without disclosing the details of who can/cannot see it. 2010-12-07 20:47:53 -08:00
Friendika d6caf59f35 verify all the display links in emails 2010-11-26 03:47:04 -08:00
Friendika ca706ccbed added more notifier logging 2010-11-25 02:53:19 -08:00
Friendika 9d7130e403 tag search boolean mode 2010-11-24 19:25:47 -08:00
Friendika 56ccf0920a add linked hashtags to item tag 2010-11-17 14:56:41 -08:00
Friendika 098478e3a5 linkify hash tags 2010-11-08 22:39:03 -08:00
Friendika 67707c89f6 full name tags => items 2010-11-07 14:04:37 -08:00
Friendika 71ae08d506 add display link to notify emails 2010-11-04 20:58:08 -07:00
Friendika 4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Mike Macgirvin d8630dbdd8 infrastructure for swat0 (#fsw) 2010-11-01 23:42:26 -07:00
Mike Macgirvin 4f4d6bace6 add rel=mentioned links for tagged persons 2010-10-31 21:57:30 -07:00
Mike Macgirvin b376f21533 notify folks who have been tagged in a post 2010-10-31 20:36:59 -07:00
Mike Macgirvin f34c1ce66a provide the means to tag link a person by full_name 2010-10-29 00:02:26 -07:00
Mike Macgirvin 6301de1032 catch a couple of edge cases with the tag linkifier 2010-10-28 20:11:50 -07:00
Mike Macgirvin 051fb7107e linkify @person and @person@domain.com tags 2010-10-28 18:18:20 -07:00
Mike Macgirvin a8e4ec7801 use browser geolocation when desired 2010-10-19 20:52:05 -07:00
Mike Macgirvin 09606dbac2 more doco 2010-10-06 00:33:11 -07:00
Mike Macgirvin 34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin b91494d22e preliminary network abstraction, configurable debugging. 2010-09-26 16:30:21 -07:00
Mike Macgirvin d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin db89a1eb44 prepare for open source server release 2010-09-21 16:01:19 -07:00
Mike Macgirvin 3a69413f86 more preparation for activities 2010-09-09 22:02:28 -07:00
Mike Macgirvin 2e6041d1b6 activity verbs 2010-09-09 21:16:40 -07:00
Mike Macgirvin 49c9860e61 fix item 2010-09-09 19:20:35 -07:00
Mike Macgirvin 887a8add2d populate wall element 2010-09-09 19:14:42 -07:00
Mike Macgirvin e8c39ff49f found the missing comment box bug 2010-09-09 05:25:01 -07:00
Mike Macgirvin ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin 2d76a5c76b fix last-child in face of deletions 2010-08-29 21:55:57 -07:00
Mike Macgirvin b02e30f1cf sort out notify x-domain 2010-08-22 20:57:20 -07:00
Mike Macgirvin 709c86b2da added location tagging 2010-08-20 14:33:15 -07:00
Mike Macgirvin 6ed5b642a4 item delete -> nuke contents 2010-08-17 18:56:33 -07:00
Mike Macgirvin facca43e2d no more url in cmdline 2010-08-16 20:47:40 -07:00
Mike Macgirvin 35e29e10e6 installer changes, pe sync 2010-08-15 21:49:29 -07:00
Mike Macgirvin 47e9613acd mongo notification checkin, wall, comments, settings 2010-08-14 07:55:18 -07:00
Mike Macgirvin 9662c44a17 even more fixes 2010-08-10 21:22:36 -07:00
Mike Macgirvin 0a4c5a694d fix item type 2010-08-10 01:21:38 -07:00
Mike Macgirvin adce88e564 photo editing 2010-08-07 06:20:27 -07:00
Mike Macgirvin a48efe0bc0 photo comments 2010-08-06 06:30:25 -07:00
Mike Macgirvin d090033a0a more photo progress 2010-08-04 20:03:38 -07:00
Mike Macgirvin fa154248dc working on readonly contact attribute 2010-07-27 22:32:21 -07:00
Mike Macgirvin 2e5fb9c37e lots of formatting, bug fixes on profile updates, i18n 2010-07-27 19:27:14 -07:00
Mike Macgirvin 7a6665b5cf item deletion and hover images 2010-07-26 17:01:37 -07:00
Mike Macgirvin 17808daf5e item delete 2010-07-26 04:22:19 -07:00
Mike Macgirvin 9f81c3345b fixup of some nits with live update and remote comment display on profile page 2010-07-25 22:51:45 -07:00
Mike Macgirvin 6695b4a203 more bugs 2010-07-19 06:58:03 -07:00
Mike Macgirvin bbe53699f2 bug fixes 2010-07-19 05:24:22 -07:00
Mike Macgirvin 9b0584e593 revamp of item structure 2010-07-18 23:23:18 -07:00
Mike Macgirvin aff4f63ff8 remote comments working now 2010-07-17 19:26:00 -07:00
Mike Macgirvin f937de932d fixing stuff that broke with the last big code push 2010-07-16 23:14:37 -07:00
Mike Macgirvin 5e4df4b3f7 added network page 2010-07-16 17:16:50 -07:00
Mike Macgirvin d20e1a6f93 feed related 2010-07-14 23:04:10 -07:00
Mike Macgirvin 4631a3c282 fix inheritance 2010-07-13 16:18:14 -07:00
Mike Macgirvin c4f31ec65a child conversations inherit ACL's from parent 2010-07-13 16:09:53 -07:00
Mike Macgirvin c6267a2cd2 turn groups back into numbers 2010-07-13 02:00:53 -07:00
Mike Macgirvin 7e16f8cdae groups and acls 2010-07-12 23:08:07 -07:00
Mike Macgirvin e0e2a032cf mongo commit 2010-07-12 16:43:59 -07:00
Mike Macgirvin bec3d15c52 more work 2010-07-08 17:49:41 -07:00
Mike Macgirvin 9a6a60a9c1 mucho progress on notifier, email style dfrn url's 2010-07-08 07:03:25 -07:00
Mike Macgirvin 4b4d680dc4 sort out anon profile display and write permissions 2010-07-07 22:44:22 -07:00
Mike Macgirvin dea552b74f some fixes after cloning to a new site 2010-07-07 06:29:32 -07:00
Mike Macgirvin 9cc49f27e6 minor stuff, getting ready for notify 2010-07-06 23:08:38 -07:00
Mike Macgirvin 1ea69ae275 bizzy 2010-07-06 05:07:28 -07:00