Commit graph

1091 commits

Author SHA1 Message Date
Fabio Comuni
7c5a7a94d4 Add oembed user option for use oembed instead of standard yotube embedding.
Remove global option and parse_url use of oembed.
2011-05-23 10:37:09 +02:00
fabrixxm
ef64c5187d add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation. 2011-05-23 09:14:57 +02:00
Friendika
5996e2cd4c if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend. 2011-05-22 21:20:28 -07:00
Friendika
576f8eda08 more buggy debugging code removed. 2011-05-22 20:18:39 -07:00
Friendika
44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika
ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Friendika
8510748b19 friendika page hook for German impressum 2011-05-22 01:15:04 -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
1ccda19f7a hooks can't contain direct values, must be variables 2011-05-21 17:17:27 -07:00
Friendika
0dfcbe9c44 better handling of twitter follows, remove ajax anchor /#!/ 2011-05-21 17:13:51 -07:00
Friendika
bc2297d933 don't insert link summaries containing javascript bug #75 2011-05-21 05:27:53 -07:00
Friendika
22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -07:00
Friendika
db60d6d78f photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77 2011-05-20 15:57:58 -07:00
Friendika
0abf2f11c6 patches for youtube's change in link and embed formats, please test 2011-05-20 15:46:41 -07:00
Friendika
5f20925220 deny link not clickable on admin approval notification page 2011-05-20 15:11:36 -07:00
Friendika
681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika
a6603a54d9 don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. 2011-05-18 20:34:18 -07:00
Friendika
990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika
f9444c8be5 admin directory view 2011-05-16 18:52:27 -07:00
Friendika
730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika
df7a4206b7 fix json_encode on url's 2011-05-12 02:15:04 -07:00
Fabio Comuni
31aee6b803 missing / in admin profile url 2011-05-12 10:33:59 +02:00
Fabio Comuni
564f9c924a Serve friendika node info as json from url /friendika/json/ 2011-05-12 10:26:34 +02:00
Friendika
b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika
a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika
5eea0d5ecb photo lockview not working, temp fix for po2php 2011-05-10 20:10:13 -07:00
Friendika
2fffec912c leave extra line between imported url and content 2011-05-10 18:15:45 -07:00
Friendika
c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika
cb6c1f91b7 rolling version number in preparation for release 2011-05-09 16:51:25 -07:00
Friendika
3b51f28d25 comment macros showing on photos 2011-05-08 22:58:38 -07:00
Friendika
c2e35d2d35 set permalink on uploaded photo items 2011-05-08 22:47:35 -07:00
Friendika
26d748f6d8 Merge pull request #96 from fabrixxm/api
Status.net Api
2011-05-05 04:29:45 -07:00
Friendika
b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy
Dispy
2011-05-05 04:29:14 -07:00
Fabio Comuni
b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika
eb2aae7987 missing is_public in editpost 2011-05-05 00:29:56 -07:00
Friendika
5f0b43485a incorrect count of total pages in normal view mode 2011-05-04 20:49:11 -07:00
Friendika
6c1d587ae3 notify not called on new photo album (first item) 2011-05-03 05:27:19 -07:00
Friendika
0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika
69dc17eb81 when viewing network group, show my private conversations to the group 2011-04-30 21:53:51 -07:00
Friendika
d45ad7bb6b suppress duplicate FB posts (incoming after posted locally) 2011-04-27 04:24:00 -07:00
Friendika
242d4805d5 call post_local_end hook on like/dislike 2011-04-26 17:07:49 -07:00
Friendika
a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika
245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika
a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Friendika
639d52ec18 block_public should also block the contacts page and 'Connect' page if not logged in 2011-04-21 19:12:22 -07:00
Friendika
eeb3c13ad3 when public access is blocked, profile page should show login box 2011-04-21 18:39:07 -07:00
Friendika
9e19eef194 "firewall" setting - block all public pages from the public if configured to do so 2011-04-21 17:29:47 -07:00
Friendika
1d4791d38c bin2hex not vice versa 2011-04-21 00:43:37 -07:00
Friendika
6e6d143aab another typo 2011-04-21 00:29:48 -07:00
Friendika
0803abcf53 typo 2011-04-21 00:27:35 -07:00
Fabio Comuni
793fc60a65 add rsd.xml (needs a template) 2011-04-21 09:08:50 +02:00
Fabio Comuni
b505e76393 First attemp of api 2011-04-21 09:04:15 +02:00
Friendika
a1ef8f669d don't show connect link to authenticated visitors 2011-04-20 15:27:10 -07:00
Friendika
c0b7000a83 missing acl selector after merge 2011-04-20 05:51:02 -07:00
Friendika
e302741e49 merge status editor instances 2011-04-20 05:48:12 -07:00
Friendika
0af6014c94 keep space before t() for legacy string puller 2011-04-20 05:00:58 -07:00
Friendika
afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika
e0e3cc7a72 edit post broke with recent checkin 2011-04-19 22:37:17 -07:00
Friendika
3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika
d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika
29a48de5e2 follow requests most adhere to site allow policy 2011-04-19 16:31:39 -07:00
Friendika
a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika
b168847b56 still getting a zero 2011-04-18 16:03:07 -07:00
Friendika
e2c9d04b36 leave imap port blank if 0 2011-04-18 15:58:01 -07:00
Friendika
ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika
863ddf1676 mail changes 2011-04-16 08:45:08 -07:00
Friendika
13eaa802e4 relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.) 2011-04-15 00:59:00 -07:00
Friendika
44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika
de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika
54368e3a0d initial spanish translation 2011-04-14 02:34:43 -07:00
Friendika
974077c06c contact "repair/relocate URL" tool 2011-04-13 20:14:30 -07:00
Friendika
5198e039df better visibility of default post permissions 2011-04-13 17:11:24 -07:00
Friendika
17a7dae67d doco 2011-04-13 16:58:21 -07:00
Friendika
767f165965 local documentation library 2011-04-13 07:07:21 -07:00
Friendika
d4bb560e7f small wording change 2011-04-12 21:37:54 -07:00
Friendika
4a514fa966 minor ui tweaks 2011-04-12 21:29:58 -07:00
Friendika
080efe4d1e missed file addition 2011-04-12 21:25:00 -07:00
Friendika
e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -07:00
Friendika
f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -07:00
Friendika
5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika
5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Friendika
61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika
6da84027af visual display of group members 2011-04-11 22:47:16 -07:00
Friendika
0ed2d19ac8 death to comment box oddities (a slow death as it will take some time for everybody to upgrade) 2011-04-11 20:11:21 -07:00
Friendika
0085bf0c10 that's better... 2011-04-11 16:42:41 -07:00
Friendika
a4836ac1ba wallwall oddities on display page 2011-04-11 16:15:38 -07:00
Friendika
ff15ea0993 wrong variable passed 2011-04-11 15:45:19 -07:00
Friendika
c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika
9133a2384a all conversations unified except photos 2011-04-11 01:31:04 -07:00
Friendika
a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika
a65c595b16 "display list of status items" moved to include/conversation.php,
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
2011-04-10 21:21:16 -07:00
Friendika
9341f2c4d6 little fix 2011-04-10 19:46:40 -07:00
Friendika
3d51518a13 set writable flag on dfrn_poll 2011-04-10 19:29:21 -07:00
Friendika
940d216395 initial dfrn update to pass perms 2011-04-10 18:38:55 -07:00
Friendika
12bc4a44cf [privacy] use owner's default permission settings on "is now friends with..." msg 2011-04-10 15:30:56 -07:00
Friendika
58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika
bf865f0210 bug #34, line breaks double in retweet/share 2011-04-10 03:00:29 -07:00
Fabio Comuni
1713ffb41c add opensearch support 2011-04-08 10:40:04 +02:00
Friendika
e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika
338ba48554 more templates 2011-04-07 18:00:35 -07:00
Friendika
5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Friendika
4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika
c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika
6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Friendika
ded449f697 ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, insists on single ostatus unfollow #non-standard 2011-04-05 23:06:03 -07:00
Friendika
ee19746aa9 revert to regex search when < 3 chars 2011-04-05 06:27:40 -07:00
Friendika
4c5e091b78 better twitter follow support 2011-04-04 20:40:31 -07:00
Friendika
793967a1d3 better handling of troublesome feeds. 2011-04-04 19:36:18 -07:00
Friendika
742bdd3054 make photo menu work better on remote profile logins 2011-04-04 05:52:59 -07:00
Friendika
933de1769c item_photo_menu to display page 2011-04-04 02:54:09 -07:00
Friendika
94881c15d3 missed merge conflict tag 2011-04-04 01:26:04 -07:00
Friendika
379af25215 Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
Conflicts:
	mod/dfrn_poll.php
2011-04-04 01:22:05 -07:00
Friendika
b5bcf44354 profile not set 2011-04-04 01:18:28 -07:00
Fabio Comuni
afa0d8ff70 fix profile redirect url in dfrn_poll 2011-04-04 09:50:25 +02:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Friendika
9b50b0e16f Public exposure warning on affected network group pages. config-able so a plugin can shut it up. 2011-04-03 20:41:40 -07:00
Friendika
4b356e59ec allow other destinations according to protocol 2011-04-01 14:39:09 -07:00
Friendika
e33b6e0b5a redirect to symbolic rather than absolute URL locations 2011-04-01 00:59:10 -07:00
Friendika
d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni
29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +02:00
Fabio Comuni
fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika
75ad3219e6 remote deletion - check contact-id 2011-03-30 17:50:18 -07:00
Friendika
0fe997490d dfrn remote profile protocol revision 2011-03-30 15:04:18 -07:00
Fabio Comuni
3f94721d62 first work 2011-03-30 17:10:14 +02:00
Friendika
04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07:00
Friendika
4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika
066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika
f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika
920396e402 off by one 2011-03-28 20:06:45 -07:00
Friendika
00b5f6f8a1 added comments, make typo checker work with redefined plural string functions 2011-03-28 17:24:11 -07:00
Friendika
1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
Friendika
77fbd2f78c tweaks to author collapsing 2011-03-27 20:43:45 -07:00
Friendika
7defb1768b collapse posts by same author (but not you). 2011-03-27 20:37:44 -07:00
Friendika
b57214cb78 wrong date order profile page 2011-03-27 19:59:27 -07:00
Friendika
c962f5c4bc comment collapsing, pagination wasn't advancing past 16 2011-03-27 19:53:36 -07:00
Friendika
76918ed5a5 info page 2011-03-27 16:35:56 -07:00
Friendika
6bc5d6f17b repair duplicate nickname accounts caused by race condition 2011-03-24 15:45:27 -07:00
Friendika
51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika
85e227151b use correct mime type for json 2011-03-22 16:52:14 -07:00
Friendika
e0202d82a1 add fulltext index on keywords, missed some directory localisations 2011-03-22 16:34:12 -07:00
Friendika
8f31935b7d items back in personal data download, chunked this time 2011-03-22 16:19:00 -07:00
Friendika
f20464112f remove items from export - too much memory consumed, will have to stream items,photos 2011-03-22 03:25:43 -07:00
Friendika
83a36cbd13 export posts also 2011-03-22 03:20:41 -07:00
Friendika
c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Friendika
cd2a0802e4 horizontal match layout 2011-03-22 02:21:53 -07:00
Friendika
ee11a74d0b profile match 2011-03-21 21:43:22 -07:00
Friendika
c74367e4c2 pagination in keyword match 2011-03-21 21:26:11 -07:00
Friendika
ee1dff9980 converted json to symbolic references 2011-03-21 19:44:00 -07:00
Friendika
e16bca4f76 first prototype of profile match against global directory (hint: set some keywords) 2011-03-21 19:33:06 -07:00
Friendika
f73e40c188 several install issues sorted out 2011-03-21 17:34:29 -07:00
Friendika
d71db3e064 typo 2011-03-21 15:12:40 -07:00
Friendika
94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika
b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
fabrixxm
c1144912e2 small fix 2011-03-20 08:38:42 +01:00
Friendika
7e33c1072a stuff to make connecting to diaspora profiles easier 2011-03-19 01:19:11 -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
ce754bc0e2 edit to display page 2011-03-18 01:24:34 -07:00
Friendika
9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika
ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00
Friendika
47f0abf27e no sharing icon for private msgs 2011-03-16 22:04:00 -07:00
Friendika
9d9176f87e no sharing from thread display page 2011-03-16 21:49:28 -07:00
Friendika
334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika
8fd989c568 protect tags from double expansion during RT 2011-03-16 19:57:13 -07:00
Friendika
3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika
f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika
53dcede278 pub_keywords -> meta keywords 2011-03-14 20:19:45 -07:00
Friendika
7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
fabrixxm
a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
Friendika
ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
Friendika
5e2f0ff055 roll back "real people preferred" message - ineffectual 2011-03-11 14:48:58 -08:00
Friendika
508636082e bogus 'no results' message on search page 2011-03-10 20:46:27 -08:00
fabrixxm
9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika
2270e73fcd show permission denied photo when direct link was accessed and authentication is insufficient to view 2011-03-09 21:29:32 -08:00
Friendika
35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08:00
Friendika
5f54503780 Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11 2011-03-09 00:17:47 -08:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Fabio Comuni
33264dc294 Add title attribute to location links 2011-03-08 16:50:10 +01:00
Friendika
c248b28f92 indicate preference to register/communicate-with real people and not fictitious entities. 2011-03-08 04:06:37 -08:00
Friendika
6ff6ac4743 profile deletion issues 2011-03-08 00:39:42 -08:00
Friendika
989b1b209e one more template free from translation, allow for later item editing within jot.tpl 2011-03-07 19:58:22 -08:00
Friendika
fb481e0b2f sparkle link enhancements to display page 2011-03-07 17:04:26 -08:00
Friendika
58eba782cf more tweaks #13 2011-03-06 19:48:46 -08:00
Friendika
26c4054652 more improvements on sparkle links bug #13 2011-03-06 19:43:03 -08:00
Friendika
7f1f18675c sparkle links for friends-of-friends, bug #13 2011-03-06 19:24:01 -08:00
Friendika
fecef140d5 new item view: sparkle links not redirecting 2011-03-04 21:27:38 -08:00
Friendika
216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika
71d4810697 photo in mail message getting bogus response 2011-03-03 20:58:39 -08:00
Friendika
bfdf4bddc9 "New Item View" had no magic sparkle links 2011-03-02 16:19:38 -08:00
Friendika
b8740a0a9c add manage file 2011-03-01 20:36:24 -08:00
Friendika
377f991ac5 switch identities to manage pages 2011-03-01 20:18:47 -08:00
Friendika
2d4b3bee60 qsearch_limit, not lsearch 2011-02-28 23:39:59 -08:00
Friendika
80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Friendika
f089b1610e feeds: update content when updated/edited changes 2011-02-28 18:24:32 -08:00
Friendika
3308a69320 increase visibility of group filter 2011-02-28 02:56:46 -08:00
Friendika
6ea77889b3 simplify connect/follow text 2011-02-27 18:11:15 -08:00
Friendika
9102fb3a6f autodiscover community pages for the directory 2011-02-27 14:17:42 -08: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
4efa0f1e81 newline at EOF 2011-02-25 19:57:44 -08:00
Friendika
597d09de1f handle group results without parsing anything 2011-02-25 19:56:38 -08:00
Friendika
ee4800a4d3 auto-complete contact/group endpoint 2011-02-25 15:28:07 -08:00
Friendika
c3cb3d75e5 use consistent tagging patterns with relationship partner 2011-02-25 12:12:25 -08:00
Friendika
1207bb1b55 silence parse_url on hostile input, need to get_app() for proc_run php location 2011-02-24 15:41:15 -08:00
Friendika
5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika
c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika
755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika
fdc469ae4c move directory registration block before redirect 2011-02-23 14:04:00 -08:00
Friendika
365ff94137 push directory on register - if permitted 2011-02-23 01:37:15 -08:00
Friendika
f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
Friendika
5f2f644064 resolve file inclusion conflicts w/ multiple plugins, improve the typo checker 2011-02-21 20:19:33 -08:00
Friendika
c10879efdd default publish to directory, but offer registration privacy setting.
generalise publish option template - so once translated we can merge them all.
Update strings.
2011-02-21 16:50:06 -08:00
Friendika
079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika
0a7b3c111e convert html entities on conversational emails 2011-02-21 00:20:55 -08:00
Friendika
af0fe4cf42 Merge branch 'chriscase-master'
Conflicts:
	mod/dfrn_notify.php
2011-02-20 01:42:11 -08:00
Chris Case
9260bb4ce1 updated private message code to use the new EmailNotification library 2011-02-19 05:35:01 -08:00
Friendika
3d1b153dec apps menu file 2011-02-19 01:01:33 -08:00
Friendika
0bf8e418a8 Merge branch 'chriscase-master'
Conflicts:
	mod/dfrn_notify.php
2011-02-17 14:05:51 -08:00
Chris Case
9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni
3d69e2a50c Merge branch 'master' into themetests 2011-02-17 14:14:06 +01:00
Friendika
979307ef91 ajax testing continues 2011-02-17 00:52:26 -08:00
Friendika
f7b2f9f5e7 convert update script arg passing to js - remembering the browser prefetch issues 2011-02-17 00:40:35 -08:00
Friendika
3cc63f2e6f issues found when testing all live network modes 2011-02-16 23:18:43 -08:00
Friendika
0435236192 error return for update process when invalid group 2011-02-16 23:10:18 -08:00
Friendika
9f8b6dff1c ajax live update for all network pages and subpages 2011-02-16 23:05:48 -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
67bb737aa1 broken image + linkify site link in body 2011-02-16 17:49:52 -08:00
Friendika
527e050ecc sanitise all incoming url's - also stop them from getting mangled by simplepie 2011-02-16 17:32:15 -08:00
Friendika
9f1f9da89b Merge branch 'chriscase-master' 2011-02-16 14:41:12 -08:00
Friendika
d6998ffef2 small fixes 2011-02-16 13:19:54 -08:00
Chris Case
2169329547 forgot to check this in earlier... splits up text and html into two different templates and base64 encodes them 2011-02-16 08:05:10 -08:00
Fabio Comuni
dc15e8640d duepuntozero: show desc on image in albums 2011-02-16 12:49:16 +01:00
Friendika
acce5c95a3 set contact permissions on photos uploaded to private messages 2011-02-16 03:14:45 -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
473786d3a0 Merge branch 'chriscase-master' 2011-02-15 03:45:40 -08:00
Chris Case
0d853433eb fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step 2011-02-15 03:31:20 -08:00
Friendika
1dea6a2d71 wrong return url for ajax comments on display and photos pages 2011-02-14 20:21:28 -08:00
Chris Case
7b26500510 Merge remote branch 'upstream/master' 2011-02-14 11:50:08 -08:00
Chris Case
42eb6dd723 fixed a bbcode issue with rich text html messages, fixed some issues with plain text. 2011-02-14 05:44:27 -08:00
Friendika
fe1a37074a Merge branch 'chriscase-master' 2011-02-14 05:06:16 -08:00
Friendika
b87ddbd58a Merge branch 'ajaxcomms'
Conflicts:
	view/comment_item.tpl
2011-02-14 04:46:49 -08:00
Friendika
df20990753 ajax comments 2011-02-14 04:43:49 -08:00
Chris Case
5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Chris Case
f98ba371cf updated private message notification to use HTML, still need the foreign language message notifications updated 2011-02-13 14:55:48 -08:00
Friendika
2d542e0f98 receiving comment notifications for conversations we aren't "involved" in 2011-02-12 22:29:32 -08:00
Friendika
3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika
c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika
2e78ed00f6 general purpose callback landing page - e.g. for facebook plugin 2011-02-10 00:32:09 -08:00
Friendika
40777b132b log ignored pubsub deliveries 2011-02-09 19:56:40 -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
9a1e5aaf09 tweaks to reworked remote deletion, which also fixes some comment box oddities 2011-02-08 05:08:10 -08:00
Friendika
d8cd693f11 rework remote deletion 2011-02-08 04:25:27 -08:00
Friendika
9f5d3000c7 don't change photo visibility if only album name was changed 2011-02-07 21:16:39 -08:00
Friendika
18c5d1ff90 feed cleanup 2011-02-07 17:06:04 -08:00
Friendika
147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
2011-02-06 15:50:50 -08:00
Friendika
4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly 2011-02-06 01:08:12 -08:00
Friendika
d322bb4613 Merge branch 'fabrixxm-master' 2011-02-05 13:06:20 -08:00
Friendika
1d0d765344 more error checking on posts 2011-02-04 13:37:04 -08:00
Friendika
2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition 2011-02-04 04:25:53 -08:00
Fabio Comuni
fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
Fabio Comuni
d72f248b3c Allow to set a photo from albums as profile photo 2011-02-04 10:18:28 +01:00
Friendika
5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos 2011-02-03 23:25:33 -08:00
Friendika
ac3cbe380f found the issue - remove the extra tracing stuff 2011-02-03 19:39:04 -08:00
Friendika
c6b00f7230 allow parentless items from SN - add more tracing on notify failures 2011-02-03 17:40:04 -08:00
Friendika
e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
fabrixxm
b5c3fb1545 remove an erroneously pasted line 2011-02-03 19:42:32 +01:00
Fabio Comuni
c15c550a06 Fix tabs 2011-02-03 17:25:10 +01:00
Fabio Comuni
bed0391e6f Show lock info on photos 2011-02-03 17:24:58 +01:00
Fabio Comuni
9b3131861f Extend lockview to show info on items, photos and events 2011-02-03 17:20:40 +01:00
Friendika
a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika
1a18f4bcde get media-rss thumbnail if available and nothing else was found (e.g. github). 2011-02-02 17:32:25 -08:00
Friendika
fce9988f73 backward compatibility 2011-02-01 22:45:46 -08:00
Friendika
a347d040f0 protocol reversal, roll dfrn_version to 2.1 2011-02-01 21:21:47 -08:00
Friendika
777c47aaa6 silence a few notice warnings 2011-02-01 20:23:58 -08:00
Friendika
8c5c07b265 don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) 2011-02-01 14:55:29 -08:00
Friendika
b4f2aac7e7 truncate long names 2011-02-01 14:09:47 -08:00
Friendika
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika
8965db24cc post to email recips (backend) 2011-01-31 18:18:28 -08:00
Friendika
3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -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
Friendika
c012843282 identify email-only contacts 2011-01-29 23:47:40 -08:00
Friendika
26cc2e02fe Merge branch 'fabrixxm-master'
Conflicts:
	boot.php
2011-01-28 18:50:20 -08:00
Friendika
33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika
620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika
076c25e103 Revert "Revert "roll version - now in alpha 2.1""
This reverts commit e8a3166fa9.
2011-01-27 03:52:18 -08:00
Friendika
e8a3166fa9 Revert "roll version - now in alpha 2.1"
This reverts commit df4f77dadd.
2011-01-27 03:50:56 -08:00
Friendika
df4f77dadd roll version - now in alpha 2.1 2011-01-27 03:46:09 -08:00
Friendika
d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika
05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika
c7ace10ffb dissolve relationship (new protocol) working 2011-01-26 02:32:00 -08:00
Friendika
abbd498a8b whitespace only 2011-01-26 00:19:54 -08:00
Friendika
bb5ad77e2a smilies on new item view 2011-01-25 05:26:12 -08:00
Friendika
5a7ff660c4 "unfriend" protocol 2011-01-25 03:57:10 -08:00
Friendika
08d6fe5ae7 allow RSS for feed contacts, but no comments 2011-01-24 19:36:20 -08:00
Friendika
f5674558ca propagate name changes to 'self' contact record 2011-01-24 18:18:47 -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
163e614a3b don't translate CR-LF 2011-01-24 03:08:20 -08:00
Friendika
205a2b8930 owner's sparkle link, sometimes not author's - on display page 2011-01-23 21:26:09 -08:00
Friendika
5be98e3ec8 following random feeds 2011-01-23 20:09:34 -08: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
1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -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
f278d17910 wrong verb in dislike activity body 2011-01-22 03:59:13 -08:00
Friendika
a80ab19483 typo 2011-01-22 02:51:31 -08:00
Friendika
c0a0710f97 incorrect item owner on like/dislike activity body when remote-auth profile 2011-01-21 12:20:05 -08:00
Friendika
d347026094 don't urlencode $_GET vars 2011-01-21 05:21:13 -08:00
Friendika
aeb585fee1 profile edit hooks 2011-01-20 15:30:45 -08:00
Friendika
623ae24109 per fabrix, except do the login "on page" 2011-01-20 14:25:44 -08:00
fabrixxm
28ebbe38d6 Netwok page redirect to login page if not local_user 2011-01-20 20:19:20 +01:00
Friendika
2ffe0d0b1d do a better job of comparing same URLs. 2011-01-19 19:51:34 -08:00
Friendika
d59585d89d fix context links 2011-01-19 18:31:04 -08:00
Friendika
b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00
Friendika
e7c5f9e7de undo sql change in f9f018ef08 (02-DEC-2010), not relevant and incorrect 2011-01-19 14:19:40 -08:00
Friendika
3da2b24951 list network page (parent items) by creation date thx:fabrix 2011-01-18 19:41:30 -08:00
Friendika
b40281802f personal title 2011-01-18 19:25:28 -08:00
Friendika
3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika
f4ebd2a213 Don't send conversation slaps, only immediate replies. Redundant and flawed. 2011-01-16 14:58:07 -08:00
Friendika
e7ae4ad3fa cannot pass null by reference 2011-01-14 14:56:13 -08:00
Friendika
5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika
b0a03c328f Merge branch 'dev' 2011-01-13 02:07:57 -08:00
Friendika
5559893293 event and birthday data structures 2011-01-13 02:01:00 -08:00
Friendika
9d6f3aa4dd add owner's birthday information to feed (if allowed to) 2011-01-12 21:04:49 -08:00
Friendika
2d80c601df string extraction 2011-01-12 12:44:22 -08:00
Friendika
1c7dc1879c removed function was still referenced 2011-01-11 14:05:40 -08:00
Friendika
2a269e0c18 use default system theme for system pages 2011-01-07 04:33:34 -08:00
Friendika
0147520e90 add contact edit hooks 2011-01-07 03:15:52 -08:00
Friendika
ffbdad7041 friend request homecoming - ensure login redirects back to confirmation page,
prune old introductions that remain blocked over 30 minutes.
2011-01-07 02:57:26 -08:00
Friendika
502d59089b schema typo 2011-01-06 23:41:14 -08:00
Friendika
fd1abe1c54 undo freesans temporarily due to poor legibility. 2011-01-06 13:26:25 -08:00
Friendika
95ec0767d8 plugin settings were getting changed 2011-01-05 13:10:47 -08:00
Friendika
1b0ddc928d make home tab work from remote profile, fix link in comment notify emails 2011-01-05 01:53:34 -08:00
Friendika
f257569713 couple minor issues with reg queue 2011-01-04 23:31:51 -08:00
Friendika
95507cf90f secure admin hijacking from openid 2011-01-04 23:18:52 -08:00
Friendika
bb0c24bd4f prevent admin hijacks 2011-01-04 22:17:58 -08:00
fabrixxm
ea978af9c1 Merge branch 'friendika-master' 2011-01-04 14:48:19 +01:00
fabrixxm
0df91fd9a2 Manage user registrations in REGISTER_APPROVE mode. 2011-01-04 14:46:08 +01:00
Friendika
64628c800d provide "return home" key 2011-01-04 05:06:10 -08:00
Friendika
15c81716e8 much better solution to privacy on ajax wall photos 2011-01-04 02:01:07 -08:00
Friendika
f057cc3a70 missing pagination in photo collections 2011-01-04 00:06:36 -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
7ae8486b36 settings: ensure system theme is default selection 2011-01-03 21:55:21 -08:00