friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
15,171 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

311 Commits

Author SHA1 Message Date
Johannes Schwab 1114ae4c81 fix urls for pager 2015-02-06 17:04:48 +01:00
Tobias Diekershoff 710bd08c30 adopting red matrix iconography for red# 2015-02-04 08:47:57 +01:00
Michael Vogel b309187e3d Just two more places where pictures have to be send through the proxy function. 2015-01-28 10:09:16 +01: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
Beanow 2fe79c564b Fixed whitespace issue causing trueish results in templates. 
For example: profiles would show labels with no content.
 2014-09-07 15:48:44 +02:00
fabrixxm 9a0c37eb47 new password mail via notification() 
new include/text.php::deindent() function
remove unused templates
 2014-09-07 11:20:06 +02:00
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2014-08-13 00:18:05 +02:00
Michael Vogel d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
fabrixxm 27024e3b1d preferred item image size for theme, get smallest photo near scale requested 
themes can declare preferred image size for images in items, with

   $a->theme_info = array(
    "item_image_size" => 1
   );

0: original, 1:640px, 2:320px

mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
 2014-07-30 15:37:34 +02:00
Michael Vogel e2f9ae3970 Removing of some warnings 2014-07-24 22:53:09 +02:00
Michael Vogel 6541247bd3 Use the GUID to refer to items (preparation for future changes) 2014-07-15 08:47:36 +02:00
Michael Vogel f68bbffb64 Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews) 2014-07-09 20:44:12 +02:00
fabrixxm 0b83432bf3 better logger format, some comments 2014-04-27 15:18:43 +02:00
fabrixxm 22c45b9bf1 Merge pull request #938 from annando/master 
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
 2014-04-22 16:15:42 +02:00
Michael Vogel b64ddcce96 Accepting "!"-links as tags. (They are used at statusnet for groups) 2014-04-22 15:54:56 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master 
Massive SQL stuff
 2014-04-04 07:28:06 +00:00
Michael Vogel a410d9caae When a user isn't logged in, then the item link got to an invalid address. 2014-03-20 18:46:35 +01:00
Michael Vogel 9496537e5f Now term table is used for categories and putting items to folder 2014-03-16 17:16:01 +01:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Tobias Diekershoff d29c981aa2 Merge pull request #919 from annando/master 
plink, disabling features, triming the content of parsed urls
 2014-03-02 08:31:03 +01:00
Michael Vogel 9c87e00dd3 Preparation for a new variable that points to the post on the own friendica server 2014-03-02 00:47:22 +01:00
Tobias Diekershoff 3bbe7a75ec Merge pull request #911 from annando/master 
target="_blank" and api improvements
 2014-02-16 14:15:44 +01:00
Michael Vogel 01971428aa target="_blank" instead of target="external-link" 2014-02-11 23:42:06 +01:00
fabrixxm e312b734ca Merge pull request #899 from fabrixxm/issue_898 
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
 2014-01-21 23:42:04 -08:00
Fabrixxm 682793ccd3 use 'ENT_QUOTES' in xmlify/unxmlify 2014-01-20 02:59:20 -05:00
Tobias Diekershoff c52973f956 red# links to redmatrix.me 2014-01-17 09:25:52 +01:00
Fabrixxm 1e87f4eb8c use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify 2014-01-16 09:08:51 -05: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
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
friendica bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
fabrixxm 5cdeef22ea pager: fix stupid typo 2013-06-19 14:28:39 +02:00
Fabrixxm faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
Tobias Diekershoff 2b09b8ae17 make red# available as a smilie 2013-05-27 08:34:12 +02:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06: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 ddf1caf0fd template engine rework 
- use smarty3 as default engine
- new pluggable template engine system
 2013-04-23 03:27:52 -04: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
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07: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
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
Zach Prezkuta 6152cbd5ac add support for more file attachment types 2013-02-04 22:15:16 -07:00
Zach Prezkuta b6bc7daadf move mb_strlen call out of for loop definition 2013-02-04 20:17:56 -07:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01: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
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
Michael Vogel 82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +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
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
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
friendica 215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -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
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07: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 4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
friendica 009744af50 allow posted ACLs to be comma-delimited string besides the default array 2012-11-11 13:56:21 -08:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
friendica 054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
Fabrixxm dd25c7db7e more $item data 
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
 2012-09-20 09:46:49 +02:00
Fabrixxm b400ddd22d conversation: new 'categories' and 'folder' elements to $item 
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
 2012-09-19 11:38:32 -04:00
friendica cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work 2012-09-03 21:31:35 -07:00
friendica 386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica e802c81ec1 fix single quotes 2012-08-15 05:09:44 -07:00
friendica 4654ebd43b correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare 2012-08-15 00:02:15 -07:00
friendica 558fbcc69e rev update + don't tag anything in [] brackets 2012-08-06 19:50:57 -07:00
friendica 372ad112c9 tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. 2012-08-01 01:36:39 -07:00
Zach Prezkuta 5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica 43d986cab2 one for the ladies who get poked by undesirables. 2012-07-20 00:47:30 -07:00
friendica 700569c7d6 this is the one I'll probably use the most 2012-07-19 22:40:45 -07:00
friendica d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Michael Vogel 7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
Michael Johnston 717fd8539b add alt_pager function, add ability to use new pager logic on network, profile, community, and search. 2012-07-14 14:21:58 -04:00
Michael Vogel 8d7d46ae7a Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work 2012-07-14 19:54:27 +02:00
friendica 5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica dd71f9446b config to disable email validation 2012-07-01 18:56:00 -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 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 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica 4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica 15c023a218 y didn't i think of this b4? 2012-05-30 17:22:51 -07: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 a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -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 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Fabio Comuni 4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
friendica 9b1bb53234 fix_mce_lf on profiles 2012-04-10 16:31:49 -07:00
friendica 3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica 221726392e pass autoname(0) test 2012-04-05 18:44:36 -07:00
friendica 62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
friendica 1f74bd1b78 catch a couple more Oo smilies 2012-04-01 22:57:50 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica 53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica 0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf 2012-03-31 14:48:35 -07:00
friendica 8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
Michael Vogel bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni 7aec2fd68d filer: info() on item filed 2012-03-28 10:45:16 +02:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica d81256d7b0 support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
Thomas 84f8e2eaa8 modified: include/text.php 
Stupid bug fixed
 2012-03-19 22:32:19 +00:00
Thomas e9b33a6f1f modified: include/text.php 
deleted:    images/diaspora.png
	deleted:    images/smiley-bangheaddesk.gif
	deleted:    images/smiley-beard.png
	deleted:    images/smiley-shaka.gif
	deleted:    images/smiley-whitebeard.png

Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out.
 2012-03-19 21:59:06 +00:00
friendica 139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
friendica 2349852b4a support "no_smilies" 2012-03-19 03:18:39 -07:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
Michael Vogel f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
Michael Vogel 8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica 224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
Michael Vogel 9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 
much more work needed - this is just for test/evaluation currently
 2012-03-13 18:13:03 -07:00
friendica 5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
friendica 3bc990f718 more save to file backend 2012-03-11 21:32:11 -07:00
friendica 93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Michael Vogel 9f76d96d46 Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works. 2012-03-11 19:11:25 +01:00
Michael Vogel 670b571c8a Caching improved. 2012-03-10 18:19:00 +01:00
Michael Vogel 74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
Simon L'nu 415ca107fd Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
 2012-03-06 18:38:44 -05:00
Thomas 67456bad06 Fixed...merged with mainline THEN added beards. 2012-03-06 20:50:38 +00:00
Thomas a265afe7eb added beard smileys 2012-03-06 20:44:53 +00:00
friendica eec4cff84b remove "smilie" expansion for Diaspora logo 2012-03-06 04:28:45 -08:00
Fabio Comuni 60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
friendica f1bf6dcdfb expand multiple heart smilies e.g. <3333 2012-03-02 01:24:20 -08:00
friendica bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
Tobias Hößl ac86407fdf Bugfix 2012-02-26 20:43:35 +00:00
friendica 390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica 91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica 6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica 11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr 03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Simon L'nu 49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to / 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-02-19 05:17:26 -05:00
friendica 4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
friendica 7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
fabrixxm 16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00