1
0
Fork 0
Commit graph

1758 commits

Author SHA1 Message Date
friendica b74a776162 I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. 2012-05-06 20:06:39 -07:00
friendica 851264161f mail autcomplete testing 2012-05-06 19:55:39 -07:00
friendica 57920849c4 email recip autocomplete 2012-05-06 19:53:34 -07:00
friendica 49ccefd6c7 bad sql left after the mailbox in/out merge 2012-05-05 17:53:23 -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 2818cb28e9 use html symbols for double quotes 2012-05-03 17:19:53 -07:00
friendica f3e18df55d string update 2012-05-03 16:55:03 -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 e7580b71e1 use cid rather than uid in perms 2012-05-02 21:00:39 -07:00
Zach Prezkuta 5d957c3803 Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. 2012-05-02 21:12:57 -06:00
friendica 06d6ab4812 delineate the new profile changes from the rest of the text 2012-05-02 01:07:23 -07:00
friendica 91085f0969 really fat fingers today - though none of this has gone further than my own site 2012-05-01 19:24:22 -07:00
friendica 8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
friendica d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
friendica 3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
friendica 05df5337dd start adding tooltips to tab menus 2012-04-30 05:15:29 -07:00
friendica 5d10672fb8 fix join group notifications 2012-04-30 04:11:42 -07:00
friendica 3ff8fe53a2 provide "xxx joined yyy" notifications 2012-04-30 01:25:25 -07:00
friendica 928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica 0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
friendica def6f0b408 the heart should really be red. 2012-04-29 02:11:33 -07:00
friendica 735f518fd8 fix location change notification 2012-04-29 01:49:54 -07:00
friendica a9dba2720b enhanced profile reporting for single values 2012-04-29 01:42:48 -07:00
friendica f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica 39d0926d09 PRIVACY: if wall is blocked, don't provide public keywords in HTML meta 2012-04-27 19:39:19 -07:00
friendica 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
friendica ecc4962bd1 pass zrl to dfrn_request as fallback 2012-04-27 16:23:25 -07:00
tommy tomson 77a0570162 add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
friendica c9e5609cbf bug #307, explaining decentralised private photos is impossible. 2012-04-25 05:41:32 -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 f265863435 more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips 2012-04-23 18:28:33 -07:00
friendica 8f0f644295 protect jappixmini/proxy from typo check, more work on email2 connector 2012-04-23 05:16:57 -07:00
friendica 724e1d15d0 Merge https://github.com/friendica/friendica into pull 2012-04-22 16:25:02 -07:00
friendica 00cb7f9efb don't allow non-existent themes as choices 2012-04-22 16:24:29 -07:00
friendica c0dffa7442 Merge pull request #258 from unary/api
api: add support for StatusNet-style media param to API
2012-04-22 15:43:24 -07:00
Michael Johnston 76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Tobias Hößl 27c23229c4 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 13:31:07 +00:00
Tobias Hößl 3116db1a74 Add a hook 2012-04-22 13:28:54 +00:00
Fabio Comuni 3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 2012-04-20 09:25:51 +02:00
Fabio Comuni fddf21d983 filebrowser: fix style, show 10 recent photos if not in an album 2012-04-18 15:15:52 +02:00
Fabio Comuni 0630120455 filebrowser: more style, load min and max scale photos 2012-04-18 14:56:03 +02:00
Fabio Comuni e2e6b56c44 tinymce: add filebrowser for photos and attached files 2012-04-18 13:23:42 +02:00
Tobias Hößl b885fedee1 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:36:48 +00:00
Tobias Hößl d7e750ad74 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00:00
friendica 8269d6aa19 Merge pull request #240 from CatoTH/master
Some bugfixes / Notices
2012-04-17 06:50:09 -07:00
friendica e6330e3b96 naked br appearing when attaching and textplain 2012-04-17 06:11:41 -07:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica 7ebca2b37d rev update 2012-04-16 22:58:52 -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 0a3454c841 function name typo 2012-04-15 05:11:52 -07:00
friendica 0939029b74 track requested profile error msg 2012-04-14 14:45:09 -07:00
friendica 6af4183302 zrl on random profile 2012-04-14 05:07:00 -07:00
Michael Vogel 4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica 0d869ceb65 pass zrl's to/through global directory 2012-04-14 03:51:41 -07:00
friendica bfb821e918 well that was a silly mistake... 2012-04-13 16:12:06 -07:00
friendica d1b57d6e74 setting wasn't being applied 2012-04-13 15:37:25 -07:00
Fabio Comuni f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni 138a0e06b8 admin: change global theme settings 2012-04-13 11:20:05 +02:00
friendica 3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
friendica af68d033e3 extended the "interesting" profile attributes 2012-04-12 21:58:15 -07:00
friendica 446e962bb8 send link directly to profile tab 2012-04-12 21:38:40 -07:00
friendica 2b339d5a6b stray log statements 2012-04-12 21:21:35 -07:00
friendica 972c01edb3 profile change activities 2012-04-12 21:10:32 -07:00
friendica 32cd62ff0a allow setting default new friend notify 2012-04-12 18:15:46 -07:00
friendica 7e2d4d4026 turn off new friend activity by default 2012-04-12 16:51:57 -07:00
Michael Vogel 572678fef9 Merge commit 'upstream/master'
Conflicts:

	include/dba.php
2012-04-13 00:10:41 +02:00
friendica 60871555f5 reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
Fabio Comuni 18ecac4e93 settings: remove call to profile_load() 2012-04-12 08:42:00 +02:00
Fabio Comuni e992e29685 settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
Michael Vogel ee714daf4d Merge commit 'upstream/master' 2012-04-11 19:35:51 +02:00
Michael Vogel c88c2515e4 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
friendica 967ed8e23f Merge https://github.com/friendica/friendica into pull 2012-04-10 20:51:04 -07:00
friendica b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
Simon L'nu 75c7877986 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  profile redir - goto correct profile page even if contact blocked, you just can't do anything.

* master:
2012-04-10 23:34:55 -04:00
Simon L'nu 2af41ee57b [fix] absolute links in docs and newmember.php; breaks sub-dir installs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:34:39 -04:00
friendica 0fa932853c profile redir - goto correct profile page even if contact blocked, you just can't do anything. 2012-04-10 20:09:51 -07:00
friendica 19b636e7e8 more backend work on mail2 followers 2012-04-10 19:15:52 -07:00
friendica ed608694ce make editplain work everywhere 2012-04-10 18:08:06 -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 ab46f95683 duplicate community posts 2012-04-10 16:59:30 -07:00
friendica 8f40e8546e fix_mce_lf contact edit page 2012-04-10 16:32:38 -07:00
friendica 9b1bb53234 fix_mce_lf on profiles 2012-04-10 16:31:49 -07:00
Klaus Weidenbach 1f9fe8b5ee Remove Gravatar from core and add new hook avatar_lookup.
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach 93ffba58cc Rename gravatar_img() more generic to avatar_img().
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
friendica 92c20895e0 use local_user for tag completion if available. See bug #368 2012-04-09 04:55:52 -07:00
friendica de3b9e9584 send zrl after dfrn_request homecoming for manual entries 2012-04-08 17:28:36 -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
friendica 4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica 6bc7e6e09f add network_tabs hook 2012-04-05 21:42:47 -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
friendica 9b6e91086b make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php 2012-04-05 02:15:03 -07:00
friendica b45327b856 let's catch d* disabled at a higher level and not waste any resources on it. 2012-04-04 20:45:48 -07:00
Michael Johnston da0eb2d4c9 correct some filer dialog weirdness caused by introduction of categories 2012-04-04 23:08:16 -04:00
friendica f63636ed14 well that was a stupid mistake... 2012-04-04 17:19:46 -07:00
friendica 60c57704c6 better handling of reshares containing embeds 2012-04-04 02:02:23 -07:00
friendica 8e928d101b display settings hooks 2012-04-03 22:01:52 -07:00
friendica 466188ebd7 re-opened bug #363 2012-04-03 20:14:37 -07:00
friendica 96abee53e4 this is better 2012-04-03 19:20:39 -07:00
friendica dbe16afcd4 include contact_widgets for categories_widget when doing updates 2012-04-03 19:16:02 -07:00
friendica 4b762ff923 suppress duplicates in search 2012-04-03 02:44:29 -07:00
friendica 5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
friendica e1de2e3de0 don't change ssl settings on local photos for remote contact 2012-04-02 19:38:13 -07:00
friendica 9391fc965d bug #363 and a couple of other reported ssl link issues 2012-04-02 17:43:11 -07:00
friendica 2352e6c1cb make the "new calendar" (javascript interactive) the default 2012-04-02 01:46:35 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
Thomas Willingham 210586eaed Merge remote-tracking branch 'upstream/master' 2012-04-02 00:29:27 +01:00
Thomas Willingham 8406803473 modified: mod/newmember.php
Add a link to the quick start
2012-04-02 00:27:47 +01:00
friendica f95db4382e check for style.php existence before inclusion 2012-04-01 16:21:55 -07:00
Thomas Willingham d0ddd380e7 Moved Diaspora notes away from top, per user request 2012-04-02 00:18:03 +01:00
friendica 5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica ea10bba147 fix "between yourself and You" in mail list 2012-03-31 20:08:32 -07:00
friendica 2147e0a71f ensure all new users get a timezone. We'll use UTC until they choose otherwise. 2012-03-31 16:08:40 -07:00
friendica 53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica adebc2793e register hooks for a COPA plugin 2012-03-31 06:15:33 -07:00
friendica b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
friendica 8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
friendica aace55df0a Merge branch 'pull' 2012-03-30 15:12:20 -07:00
friendica cfdfcb37cb don't delete contact from a friend request if friendship was already established 2012-03-30 15:10:50 -07:00
Fabio Comuni 01af7d355a allow themes to use "style.php" instead of "style.css".
Load style.php trhu mod/view.php to pass it friendica framework.
2012-03-30 21:18:25 +02:00
Fabio Comuni 054d21a2e8 settings: add "display settings" tab, with UI-related settings.
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
friendica bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica d83bfd464b zrl into people searches 2012-03-29 22:20:14 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 75f778a504 provide a way to specify an admin account for siteinfo if more than one have admin email address 2012-03-29 18:22:20 -07:00
fabrixxm 3ee529d095 Merge pull request #185 from fabrixxm/master
Updated private message pages
2012-03-28 23:47:23 -07:00
friendica 3f89adfd62 wrong var for notify total 2012-03-28 17:51:43 -07:00
friendica 77715c0c65 fix notification total 2012-03-28 17:44:24 -07:00
friendica 7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
friendica 4fe0b56d76 bug #349 - email notls setting 2012-03-28 14:54:00 -07:00
Fabio Comuni 50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
friendica e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
friendica b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Fabio Comuni 767245e9ff viewsrc: return only body if page is requested via ajax 2012-03-28 11:42:04 +02:00
Fabio Comuni 0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
friendica 117d2165f5 form security error when using existing photo 2012-03-27 04:51:20 -07:00
friendica 7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07:00
friendica daa036e34c @-completion bug 2012-03-26 21:48:04 -07:00
friendica 4c585f759f theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
friendica b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica 1e2e6f5ba9 more wordsmithing of the Friendica invitation email 2012-03-25 20:52:34 -07:00
friendica be52ec6f5a Merge branch 'pull' 2012-03-25 19:48:17 -07:00
Simon 7873347c65 Merge pull request #167 from unary/typo
typo datarry -> datarray
2012-03-25 19:47:39 -07:00
friendica c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00