tobias/friendica
1
0
Fork 0
Code Pull requests Activity
7950 commits 2 branches 61 tags 203 MiB
Commit graph

2104 commits

Author SHA1 Message Date
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
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Michael Johnston ca1e2254c9 typo datarry -> datarray 2012-03-25 16:00:11 -04:00
friendica 6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica f1cb287742 bug #329 - compress the plugin list on the friendica info page 2012-03-24 21:50:04 -07:00
friendica 8c4fbc3b4d add the bang 2012-03-24 03:11:45 -07:00
friendica db5ec58863 network filter is now a permission group 2012-03-24 01:33:50 -07:00
Fabio Comuni 82cc86a41a user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica 40d19d5b8c normalise comparison link on delegation page 2012-03-22 06:19:27 -07:00
friendica ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
friendica f1bbe03df1 work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
friendica c1d6ece98e revert permissions relaxation on community 2012-03-21 14:56:06 -07:00
friendica ef33cfcc9a move friend suggestions to top of contact page, add default contact profile photos if missing 2012-03-20 16:05:32 -07:00
friendica a72a23b6d6 missed a default profile photo replacement in notifications 2012-03-20 15:43:34 -07:00
friendica 894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica 92ef36ad61 slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible 2012-03-20 14:55:18 -07:00
friendica 9df7972993 bug #339 - lostpass sending to username, not email 2012-03-20 01:50:20 -07:00
friendica b8f6312408 cleanup after openid refactoring 2012-03-19 15:10:14 -07:00
friendica 9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
friendica 139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
friendica cf2edb5b9a ctrl + left|right cursor keys to prev/next photos 2012-03-19 01:20:53 -07:00
Simon 283bc51acf Merge pull request #149 from CatoTH/master 
Add a missing security token [Using photos as profile photos]
 2012-03-19 00:40:51 -07:00
Tobias Hößl 0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00
friendica cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
Tobias Hößl 453b5b46a3 CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) 2012-03-18 15:44:33 +00:00
friendica 9e731506c2 remove admin view of local directory 2012-03-17 22:14:17 -07:00
friendica e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
friendica 057a142b8c cut/paste error 2012-03-17 00:08:52 -07:00
Simon L'nu 49540fb958 make auto-complete work in more places 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 21:20:23 -04:00
friendica 82f2bfea5b convert boolean or int settings to strings to work around issues with template processing 2012-03-16 16:05:16 -07:00
Simon 1246a40ec2 Merge pull request #141 from CatoTH/master 
Private messages - tabindex
 2012-03-16 10:54:20 -07:00
Tobias Hößl 75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica 28f941193d syntax error from pasted text, remove ^M's 2012-03-16 06:02:26 -07:00
friendica 224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica 7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
friendica f96aff5518 more recycle fixes for plaintext 2012-03-15 03:47:02 -07:00
friendica 9cd1c35c22 fix recycle symbol when using plaintext editor 2012-03-15 03:44:41 -07:00
friendica b06c5983a4 don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts 2012-03-14 21:58:54 -07:00
friendica 110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 531201f2a1 Merge pull request #132 from campino/master 
Test cases
 2012-03-14 15:16:30 -07:00
friendica dcdfa96a1f Merge branch 'pull' 2012-03-14 14:34:52 -07:00
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 2012-03-14 14:34:48 -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 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica 
Conflicts:
	view/de/strings.php
 2012-03-14 12:57:35 +01:00
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 2012-03-14 12:30:52 +01:00
friendica 7e270b043c addon settings form error 2012-03-13 23:52:13 -07:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica de017d1ed7 sort inbox by recently replied conversations first 2012-03-13 19:27:52 -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 db80ffa0ff don't count self in number of contatcs 2012-03-13 16:02:20 -07:00
friendica 427362c324 Merge branch 'pull' 2012-03-13 15:41:13 -07:00
friendica dc84da520d invite potential connectees to the free social web 2012-03-13 15:40:16 -07:00
Tobias Hößl 59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
Tobias Hößl 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
Alexander Kampmann bce3bfff38 get tags test improved 2012-03-12 13:59:00 +01:00
friendica 93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
friendica d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
Tobias Hößl 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica 1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
Michael Johnston fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
Alexander Kampmann f8042d0445 splitted test cases. 2012-03-09 12:57:11 +01:00
friendica 42d622d6bf recover contacts total count which got lost 2012-03-09 02:50:57 -08:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica 3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
friendica 03b5e3aa0c reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) 2012-03-07 21:12:31 -08:00
friendica 7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
friendica 88cd5800cf [privacy] rework latest fix 2012-03-06 17:21:14 -08:00
friendica 39a49d51e3 remove stray debugging 2012-03-06 16:28:52 -08:00
friendica 7431bd9509 fix html reshares when editplain in use 2012-03-06 15:28:27 -08:00
friendica a464e4d33f search should be ok, but a little extra security won't hurt 2012-03-06 15:15:59 -08:00
friendica 21887a36fd [PRIVACY] privacy issue bug #314 2012-03-06 14:53:14 -08:00
friendica 8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
friendica 23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08:00
Tobias Hößl 02a9fd5dc1 A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore. 2012-03-03 10:44:34 +00:00
Fabio Comuni 5fc3c3ab85 group: fix create new group form 2012-03-02 15:40:17 +01:00
Fabio Comuni b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni f0b6e76293 admin: fix small string 2012-03-01 11:28:48 +01:00
friendica bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica 84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -08:00
Fabio Comuni b71a3af457 Merge remote-tracking branch 'friendica/master' into randomerror 2012-02-29 14:58:37 +01:00
friendica 60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex 2012-02-28 17:32:44 -08:00
friendica f40ef1bf46 Merge branch 'pull' 2012-02-28 14:53:41 -08:00
friendica 4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl 5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Tobias Hößl 3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
fabrixxm 733f830be4 fix url and network display 2012-02-28 19:10:27 +01:00
Tobias Hößl 36a1a43f06 Avoid notices 2012-02-28 13:42:12 +00:00
Tobias Hößl f48556cbc0 contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used 2012-02-28 13:40:41 +00:00
friendica 53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica 2b730ae86d clicking contact on contacts page broken link 2012-02-27 18:46:11 -08:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
friendica 89560edde2 Merge pull request #50 from annando/master 
massive changes in mail and design updates in "vier"
 2012-02-26 15:07:34 -08:00
friendica 6ddd444afd Merge pull request #49 from CatoTH/master 
Bugfix for del_config
 2012-02-26 14:49:56 -08:00
Michael fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
Tobias Hößl b102a1d5ec is not always defined; but if defined, then always of type integer 2012-02-26 20:43:23 +00:00
Tobias Hößl 792abc3a24 necessare fields not loaded from DB 2012-02-26 20:40:41 +00:00
Tobias Hößl fd9c12128a should probably be a->user['hidewall'] instead of profile['hidewall'] 2012-02-26 20:39:37 +00:00
friendica 5f7858a688 show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08: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 579738aff7 fixed link for toggling plugin from detail page 2012-02-25 13:00:44 -08:00
friendica c90bac5727 sysnotify count in wrong location, and wrong number 2012-02-25 04:37:12 -08:00
friendica 4839c235da theme seen,unseen notifications 2012-02-25 03:28:07 -08:00
friendica 18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica 6092567c97 notifications to zeros, bug in notify link 2012-02-24 23:44:55 -08:00
friendica 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica 65ddefe9c5 system notifications to notify module, untranslated string in notifications.tpl 2012-02-23 17:37:03 -08:00
friendica b4d38f6eed implement firehose notify in ping, strip links so notify popup displays correctly in all themes 2012-02-23 16:50:29 -08:00
Fabio Comuni fd3274ff53 less html in mod/group.php, template for group members editor, quattro theme for group edit. 2012-02-23 16:17:36 +01:00
Fabio Comuni cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. 
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
 2012-02-23 11:22:32 +01:00
friendica 41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
friendica 808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica 53d3ee8852 new notifications 2012-02-21 19:03:55 -08:00
friendica f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
friendica a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
friendica b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
Abinoam P. Marques Jr 9b2171ecee mod/match.php - Friendika -> Friendica 2012-02-20 19:41:01 -03:00
Abinoam P. Marques Jr 6797485f6e mod/dirfind.php - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr 12a8796854 mod/dfrn_request.php and templates - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Fabio Comuni dd09c2d125 use info() for successfull dfrn confirmation instead of notice() 2012-02-20 20:39:19 +01:00
Fabio Comuni edac27c791 ping: return all introductions detail when there are more than one 2012-02-20 20:21:34 +01:00
Abinoam P. Marques Jr dedfc300a0 Fixed log file issues on a freshly installed Friendica. 
* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)
 2012-02-18 14:19:35 -08:00
friendica 1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica 75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00
friendica 8ff6cb8406 a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account 2012-02-16 23:58:07 -08:00
friendica 0500fc2826 do not under any circumstances allow a delegated forum admin to access the site admin page. 2012-02-16 23:50:57 -08:00
Abinoam P. Marques Jr. 7b59ad6148 Merge pull request #37 from abinoam/oex 
Oexchange Small Fix
 2012-02-16 04:53:37 -08:00
Abinoam P. Marques Jr 4ac001663e oexchange small fix [_POST -> _REQUEST] 2012-02-16 02:52:35 -08:00
friendica c8704040d3 improvements in newmember page 2012-02-16 01:57:59 -08:00
friendica b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -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
Fabio Comuni 73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
friendica 07ca8d6574 starred/bookmark searches only returning conversation head without comments 2012-02-14 23:29:24 -08:00
Fabio Comuni 7140e56d1f events js: pass only first line of desc as title; item.desc and item.location as html 2012-02-14 16:48:34 +01:00
Fabio Comuni 22cfb77173 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
friendica d2a9ce9362 more contacts categorisation, page cleanup 2012-02-13 22:48:35 -08:00
friendica 4de67d95ce proper tab selection when network or search is in effect 2012-02-13 20:42:10 -08:00
friendica d75b6a00d4 tabs and total count for contacts page 2012-02-13 20:38:00 -08:00
Fabio Comuni 850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
Fabio Comuni 3e664dbdfe reshare in "display" view 2012-02-13 09:33:20 +01:00
friendica 4cfb1fe0cf refresh contact record after setting change 2012-02-11 23:17:55 -08:00
friendica d856ae1fa5 bug #279, add network selector widget to contacts page 2012-02-11 21:39:51 -08:00
friendica 0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica da946bb9b0 bug #278 show only blocked contacts 2012-02-11 03:07:15 -08:00
Abinoam P. Marques Jr 2984b8d5d2 bug #270 - solved 2012-02-10 14:03:43 -08:00
Fabio Comuni ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -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 795e02aa14 bug #273 - no $baseurl variable expansion in install template 2012-02-09 15:13:34 -08:00
friendica 11517a027b if removing a contact after viewing the third page of contacts, go back to page 3 2012-02-08 21:15:26 -08:00
friendica b0ee8dd409 begin cmin, cmax 2012-02-08 17:56:23 -08:00
friendica bb22464165 browser being sent to update_community 2012-02-08 03:40:49 -08:00
friendica c6cdad946e more fixes for textmode 2012-02-07 00:13:16 -08:00
friendica 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica c68235d10d placeholder - spam tab on network page 2012-02-01 00:20:54 -08:00
friendica c0c0f2dc15 add closeness attribute 2012-01-31 23:54:53 -08:00
friendica 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica 61246cbd1c some zot-id infrastructure 2012-01-29 15:47:25 -08:00
friendica e43a3a412c store moderated flag if set 2012-01-29 02:09:39 -08:00
friendica d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica 3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica 068cb53a9e page delegation 2012-01-26 20:08:02 -08:00
friendica 167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica d2a9341128 new event current date off by one, submit button misplaced 2012-01-25 13:42:06 -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 a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
Fabio Comuni 30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01: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 e3a415d409 add photo upload link to album widget and "upload to this album" ability 2012-01-15 17:48:42 -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 a95000d9f5 manage also needs the new authenticate_success function 2012-01-12 19:18:01 -08:00
friendica df14d7abc4 allow crepair to change name - as long as it isn't blank 2012-01-12 18:54:35 -08:00
friendica cdd56dc5de fix return url when deleting network posts with page params 2012-01-12 18:30:52 -08:00
friendica 4b6990e1ff modularise successful authentication 2012-01-12 15:46:39 -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 dcc22ab5c5 improve direct login on network page 2012-01-11 13:38:03 -08:00
friendica 99fc4309be slightly better group icon 2012-01-10 21:09:38 -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 5c72ead74e contact photo missing from friend activities 2012-01-08 01:08:57 -08:00
fabrixxm ad02af4e8f Merge pull request #23 from fabrixxm/master 
Theme works
 2012-01-06 00:42:06 -08:00
friendica cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
Fabio Comuni f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica 291a82c4a4 backend for per-network streams 2012-01-05 18:11:53 -08:00
friendica b265334c9e added citations back into ping - lost somehow 2012-01-05 16:47:47 -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 47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica b0c3dc00b9 fix registration request pings 2012-01-04 16:14:26 -08:00
friendica fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica 969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
Fabio Comuni 93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica 0db637bf00 hopefully this will speed up the network updates a wee bit more 2012-01-02 19:33:26 -08:00
friendica 71377291ba that didn't work - revert 2012-01-02 18:50:28 -08:00
friendica f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica 4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
Fabio Comuni c7bfd1e1ba install: fix install procedure 
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
 2012-01-02 20:16:28 +01:00
Fabio Comuni be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica 4b09566579 try again on the network page sql optimisation 2012-01-02 03:40:52 -08:00
friendica a5144518aa revert sql optimisation - js updates broken 2012-01-02 00:20:06 -08:00
friendica fb3a0baa78 long running query on network page - optimise out the double sub-select 2012-01-01 23:07:53 -08:00
friendica c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica 0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica 5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica 356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica 205dcd8f5b Merge branch 'master' into notify 2011-12-25 19:14:45 -08:00
root 09be90be02 modified: settings.php corrected TLS email connector not working due to spelling mistake. 2011-12-25 22:52:15 +00:00
friendica aea5584bf1 Merge branch 'master' into notify 2011-12-22 16:08:17 -08:00
friendica 52137859eb improved cid search 2011-12-22 16:05:03 -08:00
friendica 95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni 2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
friendica 048fcae40b bug #247 2011-12-21 01:45:15 -08:00
friendica d9ede7f7bd implement max daily registrations 2011-12-20 20:12:29 -08:00
friendica 7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
friendica c0c4c46874 remove hashchars from pub keywords 2011-12-20 03:04:20 -08:00
friendica eb05d00794 connect on suggest/match - added to testbubble 2011-12-18 12:51:45 -08:00
friendica 622886a33c make mod-follow "get"-able 2011-12-18 12:41:46 -08:00
friendica 5d6a098ce0 add connect link to suggestion and matches 2011-12-18 01:44:46 -08:00
friendica 974a52a16d add connect link to friend suggest 2011-12-18 01:08:32 -08:00
friendica 3aab1c7140 typo 2011-12-18 00:22:44 -08:00
friendica b0718c4f05 typo 2011-12-18 00:21:01 -08:00
friendica 978717a247 add webfinger to poco, if present 2011-12-18 00:14:34 -08:00
friendica efb9157490 eliminate dup identical hashtags in posts 2011-12-16 01:42:45 -08:00
friendica 6d7781434b must use named vars in plugin args 2011-12-15 01:09:38 -08:00
friendica cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica 431a4abd25 name change stragglers, fix newmember links, liveupdate glitch 2011-12-14 14:17:48 -08:00
friendica 4007e7ec19 "new" view broken after liveupdate fixes 2011-12-14 03:51:50 -08:00
friendica 4613e74361 update link locations 2011-12-13 19:17:33 -08:00
friendica ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica ee4975f1cd unnecessary slash in profile update path 2011-12-12 19:08:13 -08:00
friendica e67f69df81 default ajax settings after conversion 2011-12-12 17:30:29 -08:00
friendica e74a960327 change default ajax interval to 40 seconds 2011-12-12 17:10:19 -08:00
friendica c45b903178 live update improvements 2011-12-12 16:11:03 -08:00
friendica 80428a33d5 refactor updates 2011-12-12 14:39:25 -08:00
friendica cbdc667ba2 separate dfrn introductions from email when it comes to expiration of blocked requests 2011-12-11 23:33:56 -08:00
friendica a38d3b82b9 browser_update settings 2011-12-11 21:03:33 -08:00
friendica 50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica 102ea901c3 cannot register at all when multiple_pages is not allowed 2011-12-09 16:50:13 -08:00
friendica 3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica efeb377a12 w3c valid cleanup 2011-12-06 20:56:51 -08:00
friendica 341fcce75e preg_quote search strings 2011-12-06 19:51:19 -08:00
friendica 7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica 0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica 47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
friendica c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica 116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica 172fdbcdcf bug #232 2011-12-03 00:08:04 -08:00
fabrixxm e36bdd5c89 Merge pull request #11 from fabrixxm/master 
mention notification in ping
 2011-12-02 07:35:08 -08:00
Fabio Comuni ccc8486544 ping: mention rewording 2011-12-02 08:34:03 +01:00
friendica 513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
Fabio Comuni 6705549d66 ping: add @-tag notifs, fix intros url 2011-12-01 16:36:02 +01:00
friendica f1af2c224f personal notifications 2011-11-30 22:26:02 -08:00
friendica 37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica 8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica 73564df4d8 fine tune personal regex's 2011-11-29 22:49:05 -08:00
friendica 84e197cde9 missing paren 2011-11-29 19:53:18 -08:00
friendica 7474c48022 add tag to personal 2011-11-29 19:52:14 -08:00
friendica 7b9ba3bb03 personal tab on network page 2011-11-29 14:35:20 -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 034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica f4e1135f79 poco addition to provide a "suggestme" for new members 2011-11-28 15:11:59 -08:00
friendica 0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica a1c277ed1a remove old liveupdate marker 2011-11-24 18:46:07 -08:00
friendica 757ca5014c move liveupdate after birthdays/events 2011-11-24 17:32:45 -08:00
friendica b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
Fabio Comuni 79603e3146 expire settings for items, notes and photos. 
show default privacy acl in popup
 2011-11-17 15:53:59 +01:00
friendica b4218614ed change hide profile setting text 2011-11-16 04:15:14 -08:00
Fabio Comuni 9b2cbc33ae ping: show tags 2011-11-15 17:41:51 +01:00
fabrixxm 7b48b33b49 Merge pull request #4 from fabrixxm/master 
ping: fix total count and comment/post
 2011-11-14 03:10:51 -08:00
Fabio Comuni 4c2680ca6f ping: fix total count and comment/post 2011-11-14 12:09:11 +01:00
friendica c659512f32 D* doesn't like html entities in post. Convert our hijack-proof hashtag replacement to utf-8 2011-11-13 19:38:30 -08:00
friendica 8a19c7c379 warn about photo caching when updating profile pic 2011-11-12 13:47:51 -08:00
Friendika 58ba7c3969 Merge branch 'pull' 2011-11-12 04:12:03 -08:00
Friendika cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
Fabio Comuni 1ff8cddeb6 oembed: replace base64 url for iframe with url site/oembed/url_encoded 
fix http://bugs.friendika.com/view.php?id=191
 2011-11-11 17:33:32 +01:00
Friendika 20217c04f0 "follow" link was missing 2011-11-11 02:56:54 -08:00
Friendika c66b886d7e shared tags for testbubble, prevent tag hijacking of shared tag activities 2011-11-10 17:11:55 -08:00
Friendika 15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika 722e8e3d49 add allfriends page 2011-11-09 18:33:08 -08:00
Friendika 2825c49573 more work on new contact edit page - plus first port to testbubble 2011-11-09 03:46:36 -08:00
Friendika 02d4a742ab more contact edit page stuff 2011-11-08 21:22:45 -08:00
Friendika 05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
Fabio Comuni 0becdb01db oauth: fix add new app 2011-11-07 17:54:46 +01:00
Fabio Comuni 00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni b070666120 statusnet-friendika post permalink compatibility 2011-11-07 17:39:00 +01:00
Fabio Comuni 4407fc2c5d oauth apps/authorization management in settings page 2011-11-07 17:38:30 +01:00
Fabio Comuni 10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika cc1c015f20 @ completion is a bit too greedy 2011-11-05 21:43:58 -07:00
Friendika 014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika 4f4b03367a plugin check returning 0 vs false 2011-11-03 15:14:33 -07:00
Friendika 35305fb6d9 fix "do not show status post for photo" setting when used with js_upload (value is string "true/false" not integer or boolean) 2011-11-02 21:53:44 -07:00
Friendika bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Friendika 3ca41fc3bd make@ tag completion work on /display page 2011-11-02 20:38:19 -07:00
Friendika a9ec56ace1 prevent duplicate @ tags 2011-11-02 18:52:55 -07:00
Fabio Comuni 69e41f7703 oauth: authorize view, wrong verifier. 2011-11-02 09:54:07 +01:00
Friendika e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika 158028a0ac first cut friend suggestions 2011-11-01 20:29:55 -07:00
Friendika 3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika 573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika 05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika 0eceade2fe view source of item [bbcode] usage: viewsrc/nnn 2011-10-30 16:28:07 -07:00
Friendika c00aacf9e5 rename 2011-10-30 15:12:07 -07:00
Friendika e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika 056fe0a3aa poco discovery 2011-10-27 14:52:35 -07:00
Friendika ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Friendika abe96155b4 hmmm - why won't poco xml work 2011-10-27 01:54:52 -07:00
Friendika 31502207bd more poco spec compliance 2011-10-27 00:57:19 -07:00
Friendika faa078b83f basic portable contacts http://portablecontacts.net/draft-spec.html no filter/sort, or xml at the moment 2011-10-26 20:09:03 -07:00
Friendika 2d22a58324 @ tag completion enhancements, show url on hover and respect custom attags 2011-10-26 15:14:12 -07:00
Fabio Comuni ff7fc68382 oauthapi: authorize app 2011-10-26 17:15:36 +02:00
Fabio Comuni 155a09cfdf filter by contact type 2011-10-25 15:49:53 +02:00
Fabio Comuni bcb672e7ff autocomplete contacts nickname while writting in a comment box. 2011-10-25 15:01:58 +02:00
Friendika 4ea6f86b20 bug #166 2011-10-24 22:07:42 -07:00
Friendika efe3365431 tag privacy settings 2011-10-24 21:11:05 -07:00
Friendika 790c4a4e1a tag display with item 2011-10-24 17:25:49 -07:00
Friendika 4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika ea9d3b06f6 Merge pull request #35 from fabrixxm/master 
Use oembed if possible without the addon

Awesome!
 2011-10-24 15:49:28 -07:00
Friendika 3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika f48fd5aa16 more tagging 2011-10-24 04:17:46 -07:00
Friendika 87aedacec7 shared tag search 2011-10-23 21:37:11 -07:00
Friendika 7cbb69d87f tagging 2011-10-23 00:24:37 -07:00
Friendika 01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Friendika bef7a5d66b bug #183 - strlen borking on sysmsg, which is now an array 2011-10-20 14:55:40 -07:00
Friendika da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika 19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika 06096486d4 hopefully solve db update issues bug #182 2011-10-18 00:18:21 -07:00
Friendika 0f24f3b505 post/comment order options 2011-10-17 18:24:23 -07:00
Friendika f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07: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
Fabio Comuni 5830682e0c another fix to tabs in notifications 2011-10-17 17:14:10 +02:00
Fabio Comuni a2dc8bad2e fix tabs in notifications 2011-10-17 16:54:21 +02:00
Fabio Comuni 2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Friendika d60505ffb0 missing arg xmlize x is friends with y 2011-10-13 01:12:03 -07:00
Friendika df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Friendika 2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget 
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
 2011-10-11 19:27:58 -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
Fabio Comuni 906addf865 common_tabs in notifications.php 2011-10-10 17:01:14 +02:00