Commit graph

676 commits

Author SHA1 Message Date
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
Friendika
0cba6b128a fix typo, check for empty group in network page 2011-01-03 13:53:26 -08:00
Friendika
a51a1007a3 email check failed, translate wall_item template 2011-01-03 13:26:43 -08:00
Friendika
36b241c02b change activitystreams unfollow to stop-follow but also send out OStatus unfollow 2011-01-03 05:58:27 -08:00
fabrixxm
11a44a107d add plugin hook to home page content 2011-01-03 10:08:53 +01:00
Friendika
d92659560b site config to force publish in site directory 2011-01-02 22:09:54 -08:00
Friendika
de5495f90b don't process empty or non-existent group array 2011-01-02 21:53:00 -08:00
Friendika
527ff13f77 validate the openid url as well. We won't change it if it's bogus, but we won't use it either. 2011-01-02 21:25:38 -08:00
Friendika
03e15bd22f don't update openidserver if openid is empty 2011-01-02 21:20:17 -08:00
Friendika
0a485e6664 don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't) 2011-01-02 21:01:07 -08:00
Friendika
b381dfa6c6 typo slipped through 2011-01-02 14:36:30 -08:00
Friendika
c907c22eda missing thumbnail in new profiles 2011-01-02 14:26:23 -08:00
Friendika
4f796c68d2 declare key size/algorithm to ensure key gets generated 2011-01-02 14:12:22 -08:00
Friendika
be3cfe8b65 add plugin hooks to personal XRD 2011-01-01 15:03:49 -08:00
Friendika
d8985b3a54 try to auto-fill the profile address if we actually do know it. 2011-01-01 13:12:31 -08:00
Friendika
7b6385df94 freeform text area for private contact info - notes or things you just want to remember (addresses, phone numbers, birthdays, whatever) 2010-12-28 01:06:34 -08:00