Commit graph

3953 commits

Author SHA1 Message Date
friendica
952b2ef2ab . 2013-03-10 18:45:58 -07:00
Michael Johnston
41cd10f903 some fixes related to events
- add backticks around column "desc" in sql query
    - fixed query for data passed to showEvent
      - showEvent was picking up on id from item instead of id from event
    - fixed references to author info in template
2013-03-07 02:07:51 -05:00
friendica
3d299f066e fix comment permissions on display (again) and clean up an error seen in the logs 2013-03-06 18:52:42 -08:00
friendica
c5d0da43e5 tweaky tweak, plus add share tracking db, and don't show acl for guest postings, and experiment with compressing pcss on the fly 2013-03-06 15:13:54 -08:00
friendica
59ea4e32a0 randprof sorta working 2013-03-06 00:21:02 -08:00
friendica
6845d22285 hide hidden entries 2013-03-05 21:04:47 -08:00
friendica
4062be2869 basic friend suggestions (but not "new to the network and have no friends at all" suggestions) 2013-03-05 21:00:25 -08:00
friendica
dd22e1b582 just tinkering and trying a few things - don't get upset. It can all be reverted it it sucks. Freedom's just another word for "nothin' left to lose" and I'm not sure it's possible to create a UI that's hated more than Friendica. So that gives us plenty of artististic license to explore some different directions and see if they lead to anything interesting. 2013-03-05 15:48:56 -08:00
friendica
8d442e6fc1 fix timeago (again), webfinger new spec implemented, some theme work 2013-03-04 20:58:39 -08:00
friendica
4cfbdfa6db cleanup affinity tool 2013-03-03 23:38:08 -08:00
friendica
a7efec2b51 edits might really work now 2013-02-28 18:59:03 -08:00
friendica
a2a2ae2dd2 this might make edits update across the wire, or it might not 2013-02-28 18:20:42 -08:00
friendica
8275f14cea mail recall - just set mail_flags = mail_flags & MAIL_RECALLED and tell the notifier. We'll need a special button for this. Also should probably report whether it was seen or not. Will do that another day. 2013-02-27 20:38:33 -08:00
friendica
5612716cff taking the next step on pages 2013-02-27 17:09:04 -08:00
friendica
596ed80adf hex2bin is a built-in function in PHP 5.4 2013-02-27 00:59:41 -08:00
friendica
48d2f7e07d get rid of str_getcsv legacy function since we now require php 5.3 2013-02-26 20:07:14 -08:00
friendica
70e766c2bf xss attack vector in bbcode.php - check for proc_open being disabled for security reasons in install 2013-02-26 19:41:44 -08:00
friendica
c1e2f95484 doc update 2013-02-26 18:26:33 -08:00
friendica
1a6a89da1b remove things calling feed_birthday(), so we can remove it 2013-02-26 18:10:09 -08:00
friendica
b69fca14e7 initial doco 2013-02-26 15:49:37 -08:00
friendica
9430117204 route oembed through z_fetch_url 2013-02-25 20:13:30 -08:00
friendica
c45a8e2763 make sure old fetch_url calls (and those that provided their own curl wrapper) go through z_fetch_url 2013-02-25 20:06:33 -08:00
friendica
46a89910ae partial port of embedded shares 2013-02-25 19:06:31 -08:00
friendica
ea3940c4b0 start formatting for Doxygen 2013-02-25 17:09:40 -08:00
friendica
cfd0dc1bff little fixes 2013-02-24 20:21:37 -08:00
friendica
1abce176ff add groups and personal configs to export/import 2013-02-21 21:18:36 -08:00
zottel
e724e2b0d2 bring back like/dislike and share buttons 2013-02-21 11:27:41 +01:00
friendica
0e9cf839d6 fix localdir privacy (again) 2013-02-19 23:41:42 -08:00
friendica
7038ad2e59 set xchan hidden flag correctly when local directory update 2013-02-19 23:31:26 -08:00
friendica
a192171365 directory debugging 2013-02-19 23:21:23 -08:00
friendica
23718e5e28 that should be the last critical piece. Everything else is gravy. 2013-02-19 20:22:04 -08:00
friendica
ef360f0a5c dang - this is almost testable. Still have to figure out the best way to deal with the profile photo. Otherwise if you're really brave you could give it a go and see what happens. The worst that could happen is that it destroys the universe. Not a big deal. More likely you could end up with a bunch of imported things that have to be cleaned up. Less likely but entirely possible is that nothing useful will happen at all and it'll white screen. 2013-02-19 19:08:04 -08:00
friendica
24eac8c656 the heavy lifting is done for location migration aka channel import - now it's just connecting all the dots. Don't get impatient, there are a lot of dots. 2013-02-19 17:13:23 -08:00
friendica
8a474cbff5 permission plugin hooks 2013-02-19 14:22:10 -08:00
friendica
488714290f global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
friendica
2d6027150f viewcontacts update 2013-02-19 00:20:47 -08:00
friendica
6e6a83194a nothing to see, keep moving 2013-02-18 16:27:54 -08:00
friendica
65912ec0bf moving on 2013-02-18 15:15:55 -08:00
friendica
a21e6cffa1 start on channel_remove(), add some generic channel queries to the API layers 2013-02-16 15:51:55 -08:00
friendica
e754845c80 add rating support to poco 2013-02-15 22:34:01 -08:00
friendica
c66c168d1c needle/haystack reversal 2013-02-15 17:18:07 -08:00
friendica
ec3d387a65 public scope 2013-02-15 14:13:58 -08:00
friendica
b3bc061ae1 implement sender side of public scope setting (public post, network-wide, site-wide, etc....) 2013-02-14 20:17:30 -08:00
friendica
9784536ff9 more groundwork for channel import 2013-02-14 17:39:16 -08:00
friendica
d6db8513e8 placeholder comment for public scope requirement 2013-02-14 14:07:00 -08:00
friendica
4bde38c429 make 'view in context' actually go somewhere useful 2013-02-13 23:54:25 -08:00
friendica
b4057cfeb4 use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches. 2013-02-13 20:09:30 -08:00
Thomas Willingham
5888d03ff6 Expert mode. Doesn't do anything yet, just checking in on the offchance anyone needs it before I'm finished with the theme stuff that uses it. 2013-02-13 15:35:57 +00:00
friendica
b19764c9a1 fix to common friends - it seems it counts the right number of common friends, but they are all you 2013-02-13 04:12:13 -08:00
friendica
d1e5337c72 recursion and typo in rmagic with zid 2013-02-13 00:14:01 -08:00
friendica
33c97f718c contact photo update issue 2013-02-12 16:21:12 -08:00
friendica
3ee75a795a Whinging whining stupid fucks. 2013-02-12 02:02:35 -08:00
friendica
e7170cb513 maybe it would work if I didn't put non-existent php vars into the sql. 2013-02-11 17:03:06 -08:00
friendica
bf8f066dcd more progresss on tag delivery 2013-02-11 16:59:48 -08:00
friendica
698a372ba1 Sort out registrations requiring approval 2013-02-11 16:43:27 -08:00
friendica
6db8e97535 tag notifications now work. 2013-02-11 15:51:43 -08:00
friendica
ba3cff6d9a progress on tag delivery 2013-02-11 00:20:14 -08:00
friendica
191af201fb debug tag_deliver 2013-02-10 23:19:52 -08:00
friendica
127f5a447d debug import_profile_photo 2013-02-10 20:09:32 -08:00
friendica
08bc8ed876 add mimetype to protocol layers 2013-02-10 19:08:19 -08:00
friendica
90c1ecca24 taming the wild mod_display 2013-02-10 17:03:33 -08:00
friendica
2cfd73c57d progress on mod/display - slow but any progress is good 2013-02-10 16:04:03 -08:00
friendica
99c5f88963 mod_display - no fun. Not working at all. But a bit of progress. 2013-02-10 04:55:29 -08:00
friendica
e0cbbbf918 smarty support in intltext, fix old pending accounts query in ping, log failed email register notify 2013-02-09 13:20:10 -08:00
friendica
6022a9e9cd more profiling - cache the qcomment list so we don't have to look it up for every rendered item 2013-02-09 04:22:11 -08:00
friendica
d8c667288e this seems to cut load times in half 2013-02-09 03:40:56 -08:00
friendica
55df911403 performance profiling - 95% of the time is spent in "conversation()" e.g. rendering and templates, even with the new theme engine. The time spent in the DB is miniscule. Will have to profile the bbcode processing and template engines individually to drill down further. 2013-02-09 02:46:50 -08:00
friendica
2f36f6307d another sql error from the logs 2013-02-08 16:29:18 -08:00
friendica
ce95b1f68c clean up some sql errors from the logs 2013-02-08 16:26:00 -08:00
friendica
62afdf3820 more register_approve stuff - like the admin page. Hopefully this won't conflict with Thomas's admin page "list users" changes 2013-02-08 03:51:31 -08:00
friendica
dbc024cdaf perhaps REGISTER_VERIFY will work now. I'll test it and make certain it works some day. But not today. 2013-02-08 03:11:40 -08:00
friendica
1ae87e51c5 No bloody comment. 2013-02-08 00:58:09 -08:00
friendica
71cfa66193 I think we're finally done with import_xchan_from_json - everything has been converted to import_xchan now 2013-02-07 20:06:01 -08:00
friendica
5c21798ed3 cleanup issues discovered in the logs 2013-02-07 19:55:40 -08:00
friendica
82ed07baa1 provide a global way of enforcing name policy restrictions, but only enforce empty names or length > storage size. Allow plugins to set other policies. In particular, you can't have an empty channel name now, but one char is legal ;-) 2013-02-07 18:53:51 -08:00
friendica
ce2fd23461 this should fix the auto-friend stuff 2013-02-07 14:49:09 -08:00
friendica
1e665f4da1 catch typos 2013-02-06 21:22:48 -08:00
friendica
3a1eef6449 massive notification revision 2013-02-06 21:21:50 -08:00
friendica
1e8146fc5c work on notifications 2013-02-06 20:29:17 -08:00
friendica
af1b3c6c9a this might make zot-id work as originally conceived complete with reverse magic auth. If it doesn't it will probably crash and burn every site involved in horrible ways. To test or not to test.... decisions. (Maybe tomorrow.) 2013-02-06 17:04:34 -08:00
friendica
6a23ac9217 added 'dlogger()' which is intended as a low noise personal logger() facility for developers. See the source. 2013-02-05 20:39:19 -08:00
friendica
2a6abaf9d5 partial cleanup of mod/profile_photo - needs a LOT more 2013-02-05 20:14:19 -08:00
friendica
f3eb2eb9e7 convert wall_upload to use the photo api 2013-02-05 16:54:09 -08:00
friendica
05ba851d52 mod/attach support for files/attachments using OS storage 2013-02-05 15:34:30 -08:00
friendica
a5671c0e26 error 500 trying to debug templates 2013-02-04 23:54:59 -08:00
friendica
66b3603178 make preview work again after search/new template change 2013-02-04 18:50:55 -08:00
friendica
da388f4bc5 fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right. 2013-02-04 17:46:04 -08:00
friendica
ff0a73bf40 null notice when sending private mail 2013-02-04 15:06:23 -08:00
friendica
421921d4d0 debugging mark all seen for various notification types 2013-02-04 00:03:19 -08:00
friendica
fb2b21626e clearly a chanview link is not going to work there, go back to zid. 2013-02-03 19:53:16 -08:00
friendica
b41106f2fb allow non-linkable locations, self-linked locations and get rid of google default location link 2013-02-02 16:34:00 -08:00
friendica
3eacd7aab3 debugging the photo api 2013-02-02 15:08:11 -08:00
friendica
c5b00bc56c Merge pull request #26 from beardy-unixer/master
Admin page
2013-02-02 12:50:04 -08:00
Oliver
4ee4dcf43d fix con"n"nections 2013-02-02 20:07:28 +01:00
Oliver
d1428571a9 fix con"n"nections 2013-02-02 20:05:50 +01:00
Thomas Willingham
c4ca0f796a Fix broken menu for multiple profiles. 2013-02-02 16:28:10 +00:00
friendica
5c6c4395f4 Communication of mention tags were garbled 2013-02-02 04:47:30 -08:00
friendica
ed277f82f4 searchable flag logic reversed 2013-02-02 03:11:23 -08:00
friendica
7645b440e8 more progress on photos api 2013-02-02 01:58:11 -08:00
friendica
344b8593a8 sort out the rest of the nasty stuff in the attachment/file api - time to move on to something else 2013-02-01 00:49:07 -08:00
friendica
5ca88ca10a debugging of file attachment api - somewhat functional but the attachment info structure in the item table needs to be re-done. 2013-01-31 23:56:46 -08:00
friendica
982034b87d update friends in common tool now that poco is working 2013-01-31 17:55:52 -08:00
friendica
02e099da45 file/attachment storage api with revision control - needs a bit more testing but the framework is in place 2013-01-31 16:13:44 -08:00
friendica
3767bba3c3 beginning of backend file/attachment api 2013-01-30 17:27:32 -08:00
friendica
e270bd3874 mark for death implemented 2013-01-29 19:28:19 -08:00
friendica
fb9ccf5d1b fix edit permissions 2013-01-29 18:08:28 -08:00
friendica
f591526ebc missing permission settings 2013-01-29 18:01:33 -08:00
friendica
62d08029d8 connnnnnnnections 2013-01-29 14:29:40 -08:00
friendica
b2d03eb55c convert mod/follow to associative json and add more logging for when things go wrong 2013-01-29 02:05:21 -08:00
friendica
3cf3f7437e It's really not supposed to be quite this chatty on the network - ah that's why. Oops. 2013-01-28 20:51:37 -08:00
friendica
95415bff69 delete item should now mostly work 2013-01-28 19:24:36 -08:00
friendica
89c6fc939d Someday the social graph will work, but alas not today. Add more debugging. 2013-01-28 18:07:31 -08:00
friendica
4c5d2fe0fe check for mcrypt during install, allow admin email account to be admin *if* it's the first account. 2013-01-27 22:49:18 -08:00
friendica
357e71cb44 simplify friendship approval - merge with connection editing 2013-01-27 17:05:32 -08:00
friendica
bbcbd504cf help deletions along 2013-01-27 13:43:43 -08:00
friendica
28ab6d5bf5 lostpass fixes and login/logout flow if authenticated but no default channel exists 2013-01-27 01:19:24 -08:00
friendica
0c67ce57e3 ensure zot messages with 'deleted' items set 'created' as a fallback to ensure the message isn't tossed. 2013-01-26 22:24:08 -08:00
friendica
3e096e4a42 better handling of failures to lookup remote authors 2013-01-26 15:50:31 -08:00
friendica
3e0040d7c3 photos cont. 2013-01-26 03:42:05 -08:00
friendica
91126d8dd3 more photo backend stuff 2013-01-26 02:24:07 -08:00
friendica
70aa8421b3 further baby steps on the photos API 2013-01-25 23:32:44 -08:00
friendica
b43b6c3549 start on photos rework 2013-01-25 18:13:15 -08:00
friendica
c96eb6dc97 make contact_remove sort of work so I can actually get rid of Oliver's and Michael J's dead contacts and not poll them every ten minutes forever 2013-01-25 16:18:35 -08:00
friendica
318d75a86a poco debugging cont. 2013-01-25 15:36:18 -08:00
friendica
a8575199af upstream fixes, template regeneration 2013-01-25 13:55:42 -08:00
friendica
c657cabc9a Putting the final wraps on the backend private message API. This is more or less what needs to happen for every data type and get all the SQL code out of the front-end controllers. 2013-01-25 12:28:32 -08:00
friendica
da6276255d api for abook entries 2013-01-25 05:12:16 -08:00
friendica
d8fe7e0115 more api functions to help pull business logic out of controller code, in this case the often used functions to fetch all contacts or fetch the self contact 2013-01-25 05:00:18 -08:00
friendica
132a5f0f96 add new magic links to activity translations 2013-01-25 04:30:03 -08:00
friendica
299507de08 fix wall-wall ownername 2013-01-24 23:49:44 -08:00
friendica
851e436d04 make all private message functionality api-able 2013-01-24 23:45:15 -08:00
friendica
769456305b inverted logic on wall-wall check 2013-01-24 23:10:37 -08:00
friendica
fc8225be8d here's another reason the social graph isn't updating 2013-01-24 21:17:59 -08:00
friendica
50433d857a quick-n-dirty wall-to-wall detection, wasn't working at all - this may be overboard or it may still not work at all. 2013-01-24 20:43:33 -08:00
friendica
99c40ce388 check comment permissions against observer, unbold email subject links for read messages 2013-01-24 20:05:23 -08:00
friendica
566dd55146 turn down the log noise a bit 2013-01-24 19:45:08 -08:00
friendica
33b22338dc turn private_messages_list into backend functionality and separate it from the controller 2013-01-24 18:51:02 -08:00
friendica
cb5a20ba2c uncomplicate item deletion and fixup all the other linked tables 2013-01-24 16:44:10 -08:00
friendica
4f7f547190 why oh why is poco_load not getting called? oh - that's why. 2013-01-24 14:31:57 -08:00
friendica
6e6b268e25 auto permissions (such as for forums or whatever) - untested but might just work 2013-01-23 21:15:40 -08:00
friendica
739ea78905 Merge https://github.com/friendica/red into zpull 2013-01-23 16:07:56 -08:00
friendica
f63997f618 plug potential hole in magic auth, add link to chanview to view in dedicated window 2013-01-23 16:06:01 -08:00
Michael Meer
657a02ad3c delete item: change of timestamp last edit 2013-01-23 15:06:49 +01:00
MicMee
9996d5ee9b Merge pull request #1 from friendica/master
get changes
2013-01-23 04:55:09 -08:00
Michael Meer
fca354aa46 delete of single items should now work again 2013-01-23 13:50:57 +01:00
friendica
b8c92a0a42 fix some displayed links that were wonky 2013-01-22 23:08:46 -08:00
friendica
d06c21dc39 some poco fixes 2013-01-22 20:48:03 -08:00
friendica
d43591fb0f fixed contactgroup editor 2013-01-22 20:13:20 -08:00
friendica
cf2488e999 clean up the photo storage backend, revamp mod/wall_upload 2013-01-22 17:48:42 -08:00
friendica
beb3301d43 security fixes related to directory access and sites that are off the grid 2013-01-22 02:56:32 -08:00
friendica
bda4ca4c0d hidden directory entries 2013-01-22 00:20:25 -08:00
friendica
fb76675a28 now we're into the minor nitty fixes 2013-01-21 19:56:39 -08:00
friendica
4119e1f9cc testing begins 2013-01-21 19:40:25 -08:00
friendica
5949607d17 magic auth - it's mostly done or at least all the code bits are written and it looks in theory to be pretty secure and it doesn't white screen. Getting it to actually work(?), well we won't know how hard that will be until we get it on a couple of systems and try it. Magic auth on one box is a no-op because you're already authenticated. 2013-01-21 19:16:21 -08:00
friendica
debf7f5f26 more work on magic auth 2013-01-21 15:39:05 -08:00
friendica
15150ab958 sort out yet more api functions 2013-01-20 18:36:33 -08:00
friendica
060716f172 make lockview work, bring back acl widget theming in redbasic 2013-01-20 18:05:29 -08:00
friendica
127b605f32 preserve event item[uri] if present 2013-01-20 15:36:04 -08:00
friendica
45be26dd81 more heavy lifting on API - though need to re-visit events and give them all message_ids from the origination site. 2013-01-19 22:21:00 -08:00
friendica
994f322d47 more hard slogging on the api 2013-01-19 06:08:13 -08:00
friendica
d8d8dd5ced directory services cleanup 2013-01-19 01:07:35 -08:00
friendica
9725dcf41d distributed directory search from the navbar 2013-01-19 00:43:05 -08:00
friendica
6554246045 add versioning info to basic identity export, create skeleton function for import 2013-01-18 16:01:14 -08:00
friendica
2ae2bb4191 provide other ways to export the basic info 2013-01-16 21:34:36 -08:00
friendica
92cf3aae10 api/export/basic - how we'll migrate you 2013-01-16 20:49:07 -08:00
friendica
26b5d50e86 yet another api hackathon 2013-01-16 19:18:10 -08:00
friendica
77bba56336 api posting seems to work now - of course that's the easiest part of the API. 2013-01-16 17:36:45 -08:00
friendica
c74bf006cc begin the hard slog on the api 2013-01-16 15:51:21 -08:00
friendica
af066d7383 mopping up the events issues so I can move on to other stuff 2013-01-16 03:18:32 -08:00
friendica
a9f4a47a35 import events (not just event posts) from zot 2013-01-16 00:59:43 -08:00
friendica
ddd8a0e062 still some bugs but events are happening again. 2013-01-15 20:13:25 -08:00
friendica
275fa6e1d2 events backend heavy lifting - the new structure is slowly emerging. 2013-01-15 17:59:49 -08:00
friendica
ed275cd40d slow progress on events, one step forward, one step back. 2013-01-15 16:48:59 -08:00
friendica
6b6a742a1b reduce number of template include paths, which were needed during the theme restructure but no longer required. 2013-01-15 13:57:24 -08:00
friendica
62b1eb65dc pages sorta working 2013-01-15 01:32:11 -08:00
friendica
639325b235 progress on pages - they're still getting lost inside conversation(), but progress is progress. 2013-01-14 16:49:57 -08:00
friendica
67868a3094 Merge https://github.com/friendica/red into zpull 2013-01-14 16:20:33 -08:00
friendica
610dc2823a read/write "pages" permissions and fiddly bits - per Thomas 2013-01-14 16:17:57 -08:00
Michael Meer
dbbdad12d1 function contact_selector is no longer in use, commented out 2013-01-14 20:44:46 +01:00
friendica
3a5fea516a syntax error 2013-01-13 23:16:04 -08:00
friendica
5182d6d820 this should make tag delivery (e.g. forums) work - but not yet fully tested 2013-01-13 18:35:12 -08:00
friendica
4f6c4f4d2d ignore tagged items in reshares from notifications and tag_delivery 2013-01-12 18:35:27 -08:00
friendica
d5c71e5691 start on tag deliver rewrite 2013-01-12 18:06:34 -08:00
friendica
f24ce35603 implement "finger" command 2013-01-12 15:55:37 -08:00
friendica
fa642b36ff fix double-encoding 2013-01-11 14:53:14 -08:00
friendica
b3d1b8332f use correct param for connect link 2013-01-11 14:40:44 -08:00
friendica
89423844bb network & home notification fixes 2013-01-11 02:19:46 -08:00
Zach Prezkuta
ddb2a8c23a add Smarty templates for international templates 2013-01-10 21:24:10 -07:00
friendica
f0a08a05ae fix the "personal" network filter and introduction notifications 2013-01-09 23:07:13 -08:00
friendica
948644bd46 minor notification tweaks 2013-01-08 13:38:07 -08:00
friendica
a96d3ac66f The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff 2013-01-08 11:59:29 -08:00
friendica
ba20913c2b lots of notification tweaks 2013-01-08 02:49:08 -08:00
friendica
5cfbb3f5e8 registration issue 2013-01-07 22:37:48 -08:00
friendica
5cb8db64cf bypass smarty for intletext templates 2013-01-07 20:25:38 -08:00
friendica
da188214c3 events are still buggered and aren't anywhere close to working, but not buggered quite as much as before. 2013-01-07 15:12:16 -08:00
friendica
31ce6a3876 input cleansing 2013-01-07 13:58:25 -08:00
friendica
f04ce3b093 more work on notification system, fix a couple of minor issues from smarty conversion 2013-01-07 13:40:58 -08:00
friendica
3fc6df1000 Merge pull request #13 from fermionic/20130105-smarty3
implement smarty3
2013-01-06 19:25:01 -08:00
Zach Prezkuta
c94c500cdc deal gracefully with non-existent files 2013-01-06 19:58:50 -07:00
Zach Prezkuta
b4a95460e6 fix show-stopping bugs 2013-01-06 19:34:54 -07:00
friendica
a9aa74a807 make dislikes work - though they need a display tweak 2013-01-06 16:36:02 -08:00
Zach Prezkuta
a0d19ffb72 implement Smarty3 2013-01-06 15:57:11 -07:00
friendica
7cd014e93c make preview work fix some other nits 2013-01-06 04:07:10 -08:00
friendica
6d9d07bdde fix notification uid 2013-01-05 23:24:15 -08:00
friendica
d132d49e79 some work bringing acl_selectors into the modern era 2013-01-05 23:07:17 -08:00
friendica
364e33e4f1 tweak notifications so they store correctly 2013-01-05 20:57:41 -08:00
friendica
529451a4e5 start rewrite of notification system delivery backend 2013-01-05 18:08:06 -08:00
friendica
5894a7db48 tag cloud ported - except for putting into a template 2013-01-04 22:40:35 -08:00
friendica
0d623f716c import basic tag cloud functions - needs porting to this database schema and taxonomy infrastructure 2013-01-04 22:04:57 -08:00
friendica
490867ebf7 port "remember me" from Friendica 2013-01-04 21:34:36 -08:00
friendica
3795720421 move all the final page construction to a construct_page() function 2013-01-04 20:27:41 -08:00
friendica
78a65c7c1b remove the country autofill declaration 2013-01-04 19:56:00 -08:00
friendica
d14c211341 debugging directory profiles 2013-01-04 19:47:03 -08:00
friendica
70b6f989dd fix the contorted update logic on the network page 2013-01-04 19:24:17 -08:00
friendica
e208e07e35 Make zot_feeds in ascending created order so that we'll see parents before kids. Otherwise if we get a kid and we don't have a parent we'll drop it. 2013-01-04 18:06:38 -08:00
friendica
9253eaa98a never enough documentation 2013-01-04 17:16:35 -08:00
friendica
816383a9c3 This should fix the errant relaying... 2013-01-04 17:04:44 -08:00
friendica
37a4afa2ff fix typo - commited to wrong tree 2013-01-04 16:28:33 -08:00
friendica
59c23564a0 break delivery loop 2013-01-04 03:36:32 -08:00
friendica
bd728e773b small tweaks to icon positions 2013-01-03 20:41:17 -08:00
friendica
53cd7a64b6 json_decode param missing 2013-01-03 19:35:42 -08:00
friendica
bec7d9f483 temporary feed import/export (public only for the moment) until this is integrated with remote permissions 2013-01-03 19:34:04 -08:00
friendica
b001323390 make the menu consistent and eliminate redundancy - though we need icons for mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now). 2013-01-03 17:36:03 -08:00
friendica
9a8dec5480 place holders for mail and event icons on nav bar 2013-01-03 17:08:36 -08:00
friendica
e03f6cb975 more debugging - looks like michameer.dyndns.org is throwing 500s so cannot test further 2013-01-03 16:39:22 -08:00
friendica
6a42d3708c change precedence of bitwise operation 2013-01-03 16:30:35 -08:00
friendica
7df33bb963 fix register_policy globally 2013-01-03 13:50:23 -08:00
friendica
05d8faf5e1 provide delivery report on both sides, local and remote 2013-01-03 02:21:35 -08:00
friendica
4aae0ac948 issue with abook creation 2013-01-03 01:53:22 -08:00
friendica
4c21abe533 verify table needs auto_increment flag 2013-01-02 23:07:46 -08:00
friendica
32a97d5065 zome issues registering new hubs 2013-01-02 16:28:47 -08:00
friendica
c266f0724b another typo 2013-01-02 01:47:06 -08:00
friendica
a824a87d80 foreach issue 2013-01-02 01:44:50 -08:00
friendica
03a4ad0e09 typos etc. 2013-01-02 01:30:53 -08:00
friendica
50d1cb2e3a start building social graph 2013-01-01 23:56:27 -08:00
friendica
4d7fe15d3b more poco discovery 2013-01-01 02:06:41 -08:00
friendica
93d85858d5 poco discovery 2013-01-01 01:57:20 -08:00
friendica
6accc190d4 ensure all delivery result possibilities are logged and communicated to the sender 2013-01-01 00:45:44 -08:00
friendica
f2a4ea7254 add individual message delivery reporting 2012-12-31 21:33:11 -08:00
friendica
8d32477bff cleanup boot 2012-12-31 17:18:11 -08:00
friendica
a8812346c4 couple of fixes to follow, prepare for default connection permissions 2012-12-31 15:47:51 -08:00
friendica
791302f317 more delivery diagnostics 2012-12-31 14:45:26 -08:00
friendica
ba0876d011 update timestamps on successful poll 2012-12-30 23:55:57 -08:00
friendica
2d113f0c87 refresh now works on poller runs 2012-12-30 23:51:39 -08:00
friendica
83db4abaab fixes 2012-12-30 22:56:52 -08:00
friendica
abc271a0e7 more progress on onepoll 2012-12-30 22:41:53 -08:00
friendica
4e23e700f4 requeue failed deliveries 2012-12-30 21:44:59 -08:00
friendica
14fb503800 progress on poller 2012-12-30 16:14:29 -08:00
friendica
8eee37e1fa more logging, some debugging of group membership page 2012-12-30 15:28:13 -08:00
friendica
2f1bc925de add item['expires'] to protocol communications 2012-12-30 00:41:08 -08:00
friendica
cb329b9fb4 no hub - well doh, no wonder; we were looking for array['hub'] and it's actually array['url']. 2012-12-29 23:45:06 -08:00
friendica
098de66c2f probe diagnostic translated to zot, will use your current channel for permissions, logout to check anonymous permissions 2012-12-29 00:33:04 -08:00
friendica
ddd58e6e28 bypass replace_macros and use template processor directly for theme includes 2012-12-28 17:28:49 -08:00
friendica
dda4d689bb This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?" 2012-12-27 23:33:37 -08:00
friendica
55e77a57d0 get rid of xtag 2012-12-27 14:36:06 -08:00
friendica
a2c6f8c965 master/standalone directory profile update 2012-12-26 19:39:37 -08:00
friendica
d80f299dd4 more progress on directory import 2012-12-26 18:18:56 -08:00
friendica
91dac0f18a Merge pull request #9 from oohlaf/fixes
HTTP redirect fixes and a include file fix
2012-12-26 12:57:52 -08:00
Olaf Conradi
a5cbea038e Tweak behavior of redirect for http codes
Not every webserver supports 308 redirects with POST correctly.
Most sites are already configured using 301 or 302 redirects.
This only effects POST, GET behavior is unmodified.
Most calls to POST are under control by friendica not the end user,
so should not be a problem ni general.

GET with 301, 302, 303, 307 and 308 are redirected as GET
POST with 301, 302, 307 and 308 are redirected as POST
POST with 303 is redirected as GET
2012-12-26 18:44:30 +01:00
Olaf Conradi
7f13baf367 Same applies for 307
308 spec mentions 307 must not rewrite POST to GET
2012-12-26 16:30:19 +01:00
Olaf Conradi
cb46f7b227 POST redirects to POST on 308 only
POST redirects to POST on 308 only, 301-307 to GET.
Side-effect is that POST params get dropped for GET.
2012-12-26 16:08:21 +01:00
friendica
c8292b3cdd remove the private keywords stuff to reduce directory and search complexity 2012-12-26 03:49:50 -08:00
friendica
1aeea64311 include/follow cleanup 2012-12-25 22:57:16 -08:00
Olaf Conradi
bb16186fab Add permanent redirect (308) http code
Add 308 http code next to 301, 302, 303 and 307.
Close curl session before returning on redirect.
Let post_url redirect using post_url, not fetch_url (which is
actually 308 behavior).
2012-12-26 04:03:12 +01:00
friendica
f2a0514917 prevent connecting to yourself or connecting to the same channel multiple times 2012-12-25 18:48:51 -08:00
Olaf Conradi
e15683175e More whitespace fixes 2012-12-26 03:25:13 +01:00
Olaf Conradi
4d684b3790 Fix whitespace 2012-12-26 02:17:43 +01:00
Olaf Conradi
acbf822bbd Stringify groups before imploding 2012-12-25 16:01:32 +01:00
friendica
ce0d389696 profile messages for directory synchronisation 2012-12-22 04:33:32 -08:00
friendica
f09b9f1e44 add permission controls to "storage" objects such as attachments or other stored files 2012-12-22 03:33:12 -08:00
friendica
e091d30ca4 wrong constant 2012-12-20 00:33:53 -08:00
friendica
ad20e1f617 directory page still needs a lot of work, look up locally if local master or standalone, need to put some basic profile info in discovery page and direct to local directory master 2012-12-19 19:51:52 -08:00
friendica
893ba371a9 set_baseurl issue, more cleanup 2012-12-19 16:48:17 -08:00
friendica
44e70bdca3 send stuff to zothub as a fallback directory master for now 2012-12-18 19:10:56 -08:00
friendica
e9c87a69ce cleanup more obsolete stuff 2012-12-18 16:29:57 -08:00
friendica
e9b5b0f0b4 several small fixes and adjustments 2012-12-16 20:20:29 -08:00
friendica
fa8b4e98b7 some cleanup - Thomas we can put the radius/shadow stuff back later for the hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting. 2012-12-16 15:49:22 -08:00
friendica
5d008a6923 fixing permissions_sql - may need more tweaks 2012-12-16 03:38:04 -08:00
friendica
00128955eb typo - this keyboard is getting frustrating 2012-12-16 02:46:21 -08:00
friendica
8d8ad7656e there are now 2 permalinks - one is the remote original post (plink) and the other is a pointer to a local copy (llink). mod_display is not longer tied to a particular id or channel so if a message is publicly viewable it will appear without any ownership info. 2012-12-16 02:18:26 -08:00
friendica
696551222e typo 2012-12-16 02:07:16 -08:00
friendica
37974e5288 db query looping without bounds if group table wasn't manually updated to add the 'hash' column. 2012-12-14 15:08:55 -08:00
friendica
dd2483221d admittedly local magic-auth is easy so that's mostly done. Now it gets hard. 2012-12-13 16:27:58 -08:00
friendica
6e363ed0c8 typo 2012-12-12 15:31:43 -08:00
friendica
d93080ac74 So what if Red could do more CMS types of things? And you could add arbitrary web content pages of your own design to your channel resources? Oh wait... 2012-12-12 15:27:39 -08:00
friendica
7737382378 revamp permissions, blocking a contact takes priority over all other permission settings, such as "allow anybody in network to do xyz". If they're blocked they can't do it. 2012-12-10 20:09:19 -08:00
friendica
b0970850d4 Allow forum/account delegation by anybody? On any site? But of course... 2012-12-10 13:44:54 -08:00
friendica
c066793554 get rid of more targeted windows and direct all profile view to local site 2012-12-09 20:17:38 -08:00
friendica
47235e5b32 start whipping the item photo menu into shape 2012-12-09 19:57:02 -08:00
friendica
f8c33243bf start to whip the permissions into shape, also got rid of the mce drop shadow until we can figure out how to do it without the ugly black bars. I tend to prefer "outy" shadows over "inny" shadows anyway, but maybe that's just me. 2012-12-09 18:07:36 -08:00
friendica
c70777e19c a bit of e_all cleanup 2012-12-08 14:18:02 -08:00
friendica
2452b822f9 permissions should now be stored correctly on posting 2012-12-07 14:18:10 -08:00
friendica
a0a8cde201 do zot_finger/import_xchan on zid requests so we get the info cached locally 2012-12-06 20:05:42 -08:00
friendica
2a7a5b2d01 move 'Connect' button to local chanview page, remove from remote profile pages - still requires some theming love 2012-12-06 19:44:13 -08:00
friendica
8f864ebd19 Fixing the acl widget is going to be hard. Here's a start. 2012-12-06 19:18:38 -08:00
friendica
435836b224 templatise micropro 2012-12-06 18:17:43 -08:00
friendica
0bcbcc3b5a use consistent quote encoding 2012-12-06 16:12:45 -08:00
friendica
6ed27f9503 contact photo issues 2012-12-06 15:52:37 -08:00
friendica
7d1610197d move autosubmit up a level where it will actually work 2012-12-06 14:15:40 -08:00
friendica
c6b8ab534f fixed several little nit bugs that cropped up during deployment 2012-12-06 00:03:24 -08:00
friendica
d5800c61dc third param to zot_finger no longer needed 2012-12-05 18:50:27 -08:00
friendica
270266357d make mail replies work 2012-12-05 17:11:38 -08:00
friendica
1c6f301d8f y'all got mail 2012-12-05 16:44:07 -08:00
friendica
e17ba14696 DB: do the mail table again. Mail almost working onsite, still needs to zot though 2012-12-04 18:24:46 -08:00
friendica
c5cace552b most of the basic "make friends" stuff except for email notifications, drop community tab 2012-12-03 19:17:02 -08:00
friendica
7b4a92146f local delivery 2012-12-02 20:54:20 -08:00
friendica
c38ec1ab48 notify stuff 2012-12-02 20:01:30 -08:00
friendica
7f1a4a3060 auto-friending for forums and stuff is almost trivial now. But we will need a page to set the permissions on the "self" abook record. These will be the default permissions for anybody we wish to connect with. 2012-12-01 22:37:41 -08:00
friendica
f7ff2de132 add pending check on group queries 2012-11-29 23:06:03 -08:00
friendica
c079133719 remove previous iterations of threading code because it's not being used and just confusing things 2012-11-29 20:53:43 -08:00
friendica
59ea856311 further progress on new network/home notifications 2012-11-29 20:46:45 -08:00
friendica
dd428cf4fc rm pidfile stuff since we won't need poller locking 2012-11-29 19:52:10 -08:00
friendica
7082d198c2 Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet. 2012-11-29 18:15:13 -08:00
friendica
e138052584 backport features categories and add some new ones like the affinity slider 2012-11-28 19:23:39 -08:00
friendica
05e08cb5d2 trace through the threaded conversation spaghetti to bring back a sane looking network page 2012-11-28 18:45:11 -08:00
friendica
2fe2de1d5a got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term 2012-11-27 17:09:01 -08:00
friendica
f3fdbb6021 tracking through comments 2012-11-27 03:08:26 -08:00
friendica
e916d71cc5 basic (very basic) communication showing up on network page 2012-11-26 23:52:16 -08:00
friendica
941c554031 You've got mail! (actually a post, mail is for another day) 2012-11-26 21:20:16 -08:00
friendica
ed9d7257b0 fix item_private flag 2012-11-26 17:07:23 -08:00
friendica
d79d698beb more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby. 2012-11-26 16:48:04 -08:00
friendica
ccf44f2514 more but slow progress on deliveries. The b*tch is trying to match permissions 2012-11-25 23:18:11 -08:00
friendica
cd4e381aa1 "heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end. 2012-11-19 20:45:12 -08:00
friendica
194ef02c28 DATABASE: outq additions, delivery now getting the notify across to the other side 2012-11-19 16:51:15 -08:00
friendica
db77309bc3 For private messages, use hush-hush ultra top-secret mode by default 2012-11-18 19:19:16 -08:00
friendica
8611c3da68 Now we are able to get a zot notification packet and the resulting json encoded message into the queue, it's still a hard slog, but there's light at the end of the tunnel - "a message is ready and waiting to be delivered". 2012-11-18 18:30:00 -08:00
friendica
387346c772 and there's the import side of things 2012-11-17 12:55:59 -08:00
friendica
9c51f37f29 mostly working item_decode, but without full input santising 2012-11-17 02:29:02 -08:00
friendica
011ca56e93 remove include/salmon 2012-11-16 16:13:02 -08:00
friendica
b8609aba63 little stuff 2012-11-16 15:53:02 -08:00
friendica
9a726f0308 finish basic item encoding, add plugin compatibility tag, notes on improving $global_perms for edge cases 2012-11-16 13:57:55 -08:00
friendica
5d4c9f5617 more progress on notifier cleanup and encoding items for transit. 2012-11-15 21:52:05 -08:00
friendica
ef192a3c14 start on item feed structures 2012-11-14 23:09:25 -08:00
friendica
160258fd5d make the visual group editor work again in the new world 2012-11-14 20:55:05 -08:00
friendica
71dc132f42 more infrastructure changes 2012-11-14 19:27:16 -08:00
friendica
fcb89c6311 groups now take xchans, so you can have groups containing channels that you aren't connected with 2012-11-14 18:18:28 -08:00
friendica
0ace91bd0e starting the big notifier cleanup 2012-11-14 17:02:30 -08:00
friendica
6ac5e048b3 cleanup 2012-11-13 20:53:33 -08:00
friendica
aa88165383 mood mostly working 2012-11-13 19:32:59 -08:00
friendica
4af6d77de3 a bit more progress on the new network/home ajax notifications, at least I've now got a plan 2012-11-13 16:04:22 -08:00
friendica
b7ccf08cea self-signed cert? Since you won't listen to me and insist on annoying your friends, sorry, but red won't talk to you. This snake is dead. 2012-11-13 14:58:58 -08:00
friendica
34f8b06d45 still a lot of files to bring up to date with new architecture - keep plugging away at them 2012-11-13 14:37:02 -08:00
friendica
9bfff0bca1 ensure we update the correct abook record 2012-11-13 01:42:08 -08:00
friendica
5bf3ddfcf6 got zot 2012-11-12 20:59:18 -08:00
friendica
b4c603cdac one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working 2012-11-12 16:16:37 -08:00
friendica
f4ac91a8bc typo 2012-11-11 19:13:38 -08:00
friendica
9fd2c2dd8a hush-hush ultra top-secret mode 2012-11-11 19:12:20 -08:00
friendica
093ab7177a rework a couple of zot basics 2012-11-10 23:26:12 -08:00
friendica
dd00fcc7bb starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake. 2012-11-10 20:08:07 -08:00
friendica
593d361d2e profile/channel page view contacts 2012-11-09 00:02:46 -08:00
friendica
517c05700d turn star into a feature 2012-11-08 23:04:34 -08:00
friendica
22841e1566 start implementing zot-id 2012-11-08 19:07:19 -08:00
friendica
f66a3d26be magic auth indicator (link is dead at the moment) 2012-11-08 18:44:33 -08:00
friendica
c1b931549c permissions and contact permissions are now sticky 2012-11-08 17:33:38 -08:00
friendica
3d56ab227d turn multiple profiles into a feature, implement connection flags (block,hide,archive,etc.) 2012-11-07 18:48:31 -08:00
friendica
295b865d06 "follow" now creates an address book entry, which means we can start tying that into the "connections" module - still have to turn the "contact edit" page from a mockup to real code, but it's all starting to flow. 2012-11-06 18:13:47 -08:00
friendica
55df0452b6 finish off like/dislike localisation except for zrl/magic_link 2012-11-06 16:16:26 -08:00
friendica
417d1080d4 likes working a bit better - not translateable yet 2012-11-06 00:30:40 -08:00
friendica
82e74e3520 likes are quasi working again - at least an activity item is stored and it mostly has correct data, but displaying it needs improvement. 2012-11-05 23:52:01 -08:00
friendica
7d926213c6 fix the profile change activity post 2012-11-05 21:05:51 -08:00
friendica
90e70d9674 start on the like/dislike activities 2012-11-05 20:42:12 -08:00
friendica
fe5f511f19 more work on the settings pages 2012-11-05 17:17:21 -08:00
friendica
4f1170b656 change permission settings from radio buttons to select boxes 2012-11-05 15:26:01 -08:00
friendica
2752b58f33 plaintext default - richtext is a feature 2012-11-05 01:25:08 -08:00
friendica
152641bf24 that was certainly some fun debugging (not) 2012-11-04 20:53:59 -08:00
friendica
94f737b699 some cleanup of main item template 2012-11-04 16:57:09 -08:00
friendica
aaa5a2638c feature enable 'dislike' - backend 2012-11-03 23:39:38 -07:00
friendica
d72bad4efa typo 2012-11-04 15:52:58 +11:00
friendica
a746eb751f note about extending the hook system for application wrappers 2012-11-03 20:21:55 -07:00
friendica
be0f376d6a expanded help text for features 2012-11-03 20:13:21 -07:00
friendica
f55636aeb6 turn off categories feature by default 2012-11-03 16:51:29 -07:00
friendica
ece59b778e turn off some "advanced" features by default, like archives and saved search - even though we don't yet have a screen to turn them on. That will come. 2012-11-03 16:40:05 -07:00
friendica
7915e597ec more theme stuff 2012-11-03 06:32:27 -07:00
friendica
358111c76b fix post preview 2012-11-03 05:46:56 -07:00
friendica
8a983a82ec remove recursive share tags 2012-11-03 03:59:37 -07:00
friendica
2fa93655c4 a lot more changes of terminology 2012-11-03 02:34:12 -07:00
friendica
140f464e02 channels you are connected to are "connections". Get rid of "address book" which doesn't fit. 2012-11-03 02:00:48 -07:00
friendica
a47a1d5eb9 secure permission discovery 2012-11-02 16:25:59 -07:00
friendica
aca2e3b52a add key passing and verification to targeted discovery 2012-11-02 15:34:35 -07:00
friendica
9547e8004d slightly better wording of permission choices 2012-11-02 02:18:52 -07:00
friendica
af9890cd3e consolidate permission arrays 2012-11-02 02:04:07 -07:00
friendica
8ae77d2984 verify all the signatures before adding contact 2012-11-02 01:44:27 -07:00
friendica
83cf11dd95 fixed the hash, now onward & upward 2012-11-02 00:19:04 -07:00
friendica
37653a3760 grrr... hashes aren't matching. 2012-11-01 22:23:13 -07:00
friendica
5c9a68488a bug in get_all_perms 2012-11-01 20:47:32 -07:00
friendica
3bf5677797 settings page channel permissions front-end (needs back-end still) 2012-11-01 19:47:10 -07:00
friendica
42ac706b9f more progress on follow - should be able to import the xchan and photos. 2012-11-01 16:36:35 -07:00
friendica
9bf4508ffb cleanup channel management 2012-11-01 15:45:02 -07:00
friendica
3f7530417a typos 2012-11-01 02:00:25 -07:00
friendica
d4657c89c2 merging zot_finger schema additions 2012-11-01 01:54:51 -07:00
friendica
1b74753c11 typo 2012-10-31 21:58:17 -07:00
friendica
77c30972cb network discovery on follow 2012-10-31 21:42:20 -07:00
friendica
78f64c90a3 get permission discovery working - guid sigs were getting truncated in db 2012-10-31 20:53:02 -07:00
friendica
0dd06b736a need to accomodate different webbies on different hubs 2012-10-31 18:05:36 -07:00
friendica
2a0ff2b542 merge zperms functionality into zfinger 2012-10-31 17:38:22 -07:00
friendica
62a8298b54 starting on pinging the basic elements of federation and communication 2012-10-31 16:55:19 -07:00
friendica
fb173900a1 more progress on address book 2012-10-30 21:37:58 -07:00
friendica
f608373d08 fixing broken things again after the latest round of ripping out the yellow slime and replacing it with red slime. 2012-10-29 20:47:56 -07:00
friendica
1a6415807e more structural stuff 2012-10-29 19:31:38 -07:00
friendica
e3c2e58979 "profile url" e.g. the wall/stream is now "channel url". "Profile URL" goes to the profile details. 2012-10-29 17:14:02 -07:00
friendica
6496a07460 ignore error for non-existent DB fields at the present time since it's just filling up the logs with noise. 2012-10-28 22:10:07 -07:00
friendica
e138876199 fix updating of bitwise 'unseen' to account for mysql operator precedence 2012-10-28 22:08:08 -07:00
friendica
d0d8971a69 start to use our permissions for stuff 2012-10-28 20:01:36 -07:00
friendica
4bcf19632b Now have a solid permissions model. Create a few functions to enumerate them and then we're off to the races. 2012-10-28 18:50:35 -07:00
friendica
1a9ab12748 fix starring posts 2012-10-27 05:26:34 -07:00
friendica
96c8e74438 start on network/home notification refactor 2012-10-27 04:43:39 -07:00
friendica
e29618ee0d contact group is now 'channel group' 2012-10-27 03:54:44 -07:00
friendica
0baf4bb4d2 fix a couple of things that went wonky when moving to thread objects 2012-10-27 03:05:51 -07:00
friendica
5b1a15704b feature management 2012-10-26 15:31:10 -07:00
friendica
26774310b1 move things to the newer conversation object, a few minor bugs - will sort it out eventually 2012-10-25 21:58:33 -07:00
friendica
3b394ea43f comments sort of working again but now need to fix the threading which was ported when it was only half working 2012-10-25 18:42:42 -07:00
friendica
ebb75340ec fixes to photo linked items, shut up poller until I can get to that 2012-10-25 00:10:53 -07:00
friendica
939543b26d more progress on the main photos module 2012-10-24 22:21:35 -07:00
friendica
ceeb4db6e3 Give the UI a little love after all the backend mods 2012-10-24 19:13:29 -07:00
friendica
cf89db176a fix photo paths 2012-10-24 00:00:16 -07:00
friendica
968b9ce1af more heavy lifting 2012-10-23 21:24:23 -07:00
friendica
8e8482355b more heavy lifting 2012-10-23 17:14:50 -07:00
Mike Macgirvin
7acba41dc6 more cleanup 2012-10-23 21:26:12 +11:00
Mike Macgirvin
672da80282 progress however tedious 2012-10-23 20:59:20 +11:00
Mike Macgirvin
364266e7a0 cleanup 2012-10-23 20:51:41 +11:00
Mike Macgirvin
76f7a4baf3 cli_startup() for directory updates 2012-10-23 19:35:06 +11:00
Mike Macgirvin
9d043d2db4 remove remoteupdate since it only worked for a month in 2011 2012-10-23 19:09:32 +11:00
friendica
d9c947663c mv objects from object dir to include where they belong 2012-10-22 20:07:40 -07:00
friendica
21578fd0b0 cleanup missing functions after move 2012-10-22 19:48:48 -07:00
friendica
a7abe24382 more file cleanup 2012-10-22 19:46:18 -07:00
friendica
8f9ddcb536 lotsa little fixes 2012-10-21 22:11:02 -07:00
friendica
87c171030c upstream fixes 2012-10-21 17:23:21 -07:00
friendica
112e4e6c9c more work on profile changes - the notify activity is still stuffed as we finalise the json structure for activitystream meta-data 2012-10-19 15:40:13 -07:00
friendica
b60560812f fix photo in nav menu 2012-10-19 03:49:39 -07:00
friendica
8981da89c3 don't show categories widget if there are none 2012-10-19 03:36:09 -07:00
friendica
2c3c933ed4 get profile edits working 2012-10-18 20:59:00 -07:00
friendica
a680eb3a73 output queue (merges the old deliverq and queue and adds some zotness) 2012-10-17 16:18:36 -07:00
friendica
794c92a8fb wall posts now display - address book structure revamp started 2012-10-10 17:58:56 -07:00
friendica
5248c5075d more stuff we don't need. 2012-10-08 18:23:43 +11:00
friendica
ef22c1a9b3 prevent tag recursion on shared posts 2012-10-08 18:04:12 +11:00
friendica
3c04676a32 get posts to show up 2012-10-07 21:44:11 -07:00
friendica
a56c0425e6 start fixing all the item queries 2012-10-07 18:44:06 -07:00
friendica
c612253627 fix some issues that couldn't be tested yesterday - as was working offline 2012-10-07 16:39:29 -07:00
friendica
118049c0e9 new item structure to item_store 2012-10-06 18:17:25 +10:00
friendica
7bee460df2 provide auto admin registration as before, but allow the current admin to create other admins 2012-10-04 23:05:45 -07:00
friendica
ff43d62e44 add hash to channel structure for consistency/redundancy 2012-10-04 03:13:57 -07:00
friendica
e124c9fa5c Can't see any posts currently - after the big shakeup, but we can now post top level activities and store them. 2012-10-03 22:28:19 -07:00
friendica
dc8a46477b use hash for channel id 2012-10-01 19:04:21 -07:00
friendica
846a9813b2 here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. 2012-10-01 18:02:11 -07:00
friendica
fbafd92f7f moving a lot of structure around. 'entity' is now 'channel' 2012-09-25 17:57:20 -07:00
friendica
6c92b5ab86 separate the public feed from everything else 2012-09-20 17:04:22 -07:00
friendica
c8957b36ea permissions responder + upstream merge 2012-09-10 22:00:56 -07:00
friendica
e4f3e96b65 remove targeted windows 2012-09-09 21:26:36 -07:00
friendica
3ebb4a3dc7 updates 2012-09-09 21:17:06 -07:00
friendica
a08666be14 unbreak some more stuff 2012-09-04 19:49:29 -07:00
friendica
cf9a6454b0 bring back "this is you" comment photo 2012-09-04 04:28:38 -07:00
friendica
2df083efb1 rev update 2012-09-03 22:32:35 -07:00
friendica
fd5dfc95f6 set the account_id on channel creation 2012-09-02 21:24:39 -07:00
friendica
7550cd586b fix the nav 2012-09-02 20:57:44 -07:00
friendica
38344798f2 rev update 2012-09-02 01:59:11 -07:00
friendica
80bd128425 more DB cleanup 2012-08-30 18:47:07 -07:00
friendica
eac29badb2 start on contacts/profiles 2012-08-30 18:17:38 -07:00
friendica
f6d198ce5d trim a bit of fat 2012-08-29 23:03:03 -07:00
friendica
9cd1dabe73 have to do something about that return_url - but let's just plunge forward without it. 2012-08-28 03:02:45 -07:00
friendica
5d23e701c0 now it gets hard 2012-08-28 01:55:18 -07:00
friendica
fb714f9e72 recover frankentheme 2012-08-27 22:27:36 -07:00
friendica
a13c196032 solve endless redirect 2012-08-27 21:56:13 -07:00
friendica
7fad83cea4 Now logging in with Red zaccount/zentity instead of Friendica user. Yay. Most existing Friendica functionality is now stuffed since the Red structures are quite different. 2012-08-27 21:17:46 -07:00
friendica
8c3c3d5fd7 stuff 2012-08-27 01:22:08 -07:00
friendica
5ff6e9348b a few minor changes 2012-08-26 23:05:00 -07:00
friendica
f0e299a97a begin debug zentity 2012-08-24 01:57:36 -07:00
friendica
b08d070e15 basic identity creation 2012-08-24 01:14:42 -07:00
friendica
2456174cc9 back to identity creation form 2012-08-23 20:00:10 -07:00
friendica
136380fede cleanup the rest of the new register logic 2012-08-22 19:39:12 -07:00
friendica
2140c2ea37 basic hub registration 2012-08-21 23:11:27 -07:00
friendica
30e86284af upstream 2012-08-21 20:03:25 -07:00
friendica
9b9f35f8e5 NaCl passwords - (db update) 2012-08-21 17:48:09 -07:00
friendica
2f81fb4385 upstream fixes 2012-08-20 06:34:54 -07:00
friendica
d78d6a2e66 reversed error logic 2012-08-16 05:13:51 -07:00
friendica
5c8d854d7d zregister, cont. 2012-08-16 03:37:07 -07:00
friendica
434bcfef8b add invitiation logic to registrations - this is starting to look good 2012-08-16 03:16:55 -07:00
friendica
adba0bd98a That's better 2012-08-16 01:03:53 -07:00
friendica
eb911443aa more zregister cleanup and theme separation 2012-08-16 00:51:03 -07:00
friendica
5b547ae991 registration dangling code fragment that should've been removed 2012-08-15 23:15:29 -07:00
friendica
f7c6a6ff90 item table rename parent-uri, target-type, object-type (more to come later) 2012-08-15 22:33:37 -07:00
friendica
77b334efbc cleanup of mod_zregister, basic functionality working - new accounts getting stored. 2012-08-15 21:56:04 -07:00
friendica
2358a220ba merge from upstream 2012-08-15 20:01:55 -07:00
friendica
2a49460c77 improvements in js localisation/translation 2012-08-13 22:12:16 -07:00
friendica
184cf51d2f reduce duplication - only provide one system language setting 2012-08-12 20:56:23 -07:00
friendica
f261871346 cleanup all the theme include stuff - this could make Friendica themes work out of the box, maybe. 2012-08-11 19:28:58 -07:00
friendica
e80d69d25b merge upstream 2012-08-11 18:54:23 -07:00
friendica
26e29d7f88 zot basic comm structure (real basic) 2012-08-09 20:31:06 -07:00
friendica
f2a7fcf822 more theme modularisation and css/js management 2012-08-09 19:09:55 -07:00
friendica
0292d46e5d merge comment threading, provide plugin/theme functions to handle css/js includes 2012-08-09 16:26:44 -07:00
friendica
432595314a Merge https://github.com/friendica/red into zpull 2012-08-08 18:50:33 -07:00
friendica
9a39d4ade2 moving forward again 2012-08-08 18:50:04 -07:00
Thomas Willingham
29b8b8f82b Merge remote-tracking branch 'upstream/master' 2012-08-09 01:35:46 +01:00
friendica
5f619d3254 the dynamic "show more" sort of works - but with a nagging delay. But I need to move on to bigger things. We'll leave it for now. 2012-08-06 23:10:37 -07:00
Thomas Willingham
e6763be5f3 Bring get_theme_screenshot and get_theme_info up to date. 2012-08-06 19:25:09 +01:00
friendica
c673c70c25 updates 2012-08-05 21:41:58 -07:00
friendica
dcbc0c0c95 major theme re-org, only duepuntozero and slackr working atm 2012-08-01 05:02:43 -07:00
friendica
7a08942872 remember that the main thing is to keep the main thing the main thing... 2012-07-31 17:55:27 -07:00
friendica
65160ffd12 functions to generate and check webbies interactively 2012-07-30 21:51:25 -07:00
friendica
194c52aee5 get_item_elements (json version) 2012-07-29 22:43:51 -07:00
friendica
4824e5b8b8 birthdays and events are now notifications 2012-07-29 18:29:27 -07:00
friendica
2ae0076ae2 move today's events into a ping notification 2012-07-28 17:21:42 -07:00
friendica
4ec7ef5223 more fixes for the legacy stuff as we push forward to new stuff 2012-07-26 02:27:12 -07:00
friendica
7bdbb8331c picking up the page load times a bit 2012-07-25 22:55:43 -07:00
friendica
fc53a7a09e recover existing conversation loading functionality for home,search,community,display,etc. whilst working on the ajax stuff in network 2012-07-25 18:57:04 -07:00
friendica
6911beca2f ajax page loads 2012-07-24 22:06:21 -07:00
friendica
ea13ece890 rev update 2012-07-24 21:03:15 -07:00
friendica
4b36e41b09 implement page update modes 2012-07-23 20:49:56 -07:00
friendica
b0f1d03a8a convert all network search params to get requests (no url path args) 2012-07-23 17:35:58 -07:00
friendica
3decf67e6d realtime updates of "6 minutes ago" with fallback to iso8601 timestamps (available on tooltip) 2012-07-23 04:11:59 -07:00
friendica
4e4395b00f more registration functions plus ability to over-ride individual strings plus upstream merges plus rev update 2012-07-22 17:25:26 -07:00
friendica
1f313eba50 upstream fixes 2012-07-22 05:13:29 -07:00
friendica
236ba8badc more account infrastructure 2012-07-22 00:46:20 -07:00
friendica
6e08f39820 simplify 2012-07-21 03:48:59 -07:00
friendica
bf38674904 sync 2012-07-19 21:09:40 -07:00
friendica
49c0e0de9b sync changes 2012-07-19 18:53:26 -07:00
friendica
d92a4a686d eliminate the obsolete "last-child" indicator 2012-07-18 17:08:03 -07:00
friendica
0400779b43 remove some d* extraneous bullshit 2012-07-18 05:00:59 -07:00
friendica
d683df17bd Removing connectors we won't be needing - this is probably going to break some shit. 2012-07-18 04:49:15 -07:00
friendica
59ec671879 json notification popup mostly working in zero 2012-07-17 22:11:24 -07:00
friendica
073eb1b845 backend support for alternate profile photos for private profiles 2012-07-17 16:02:16 -07:00
friendica
359c74d320 error cleanup 2012-07-17 05:30:32 -07:00
friendica
e03da2beba first cut at a generalised item query function 2012-07-16 23:14:11 -07:00
friendica
54ffc32d7c working towards getting rid of item['tag'] and item['file'] - still some dependencies 2012-07-16 21:52:26 -07:00
friendica
d3279a6157 more search cleanup 2012-07-16 21:20:04 -07:00
friendica
aeaccb03ba make network tag and personal searches work again 2012-07-16 21:07:59 -07:00
friendica
44638184c3 the pioneers should at least have a current db - it will likely be some time before db updates go into this tree as many incompatible things are changing and cannot be automatically migrated, so it will probably mean frequent reinstalls. 2012-07-16 16:33:31 -07:00
friendica
5902e0983d language filtering infrastructure, check owner's language prefs and either translate it or dump it depending on those prefs and the availability of translation plugins. 2012-07-16 03:53:11 -07:00
friendica
a047c5b1c3 call item_translate hook if source language is not acceptable, ignore message if it cannot be translated. 2012-07-16 03:32:42 -07:00
friendica
0dc9c66b17 check for existence, not value of $arr['term'] 2012-07-16 01:56:32 -07:00
friendica
b79212dcc8 split up get_browser_language() to use in additional ways 2012-07-16 01:38:26 -07:00
friendica
c148455570 use include/language.php for all language and translation code 2012-07-16 01:26:26 -07:00
friendica
f83a504da1 more work on json notifications, now working except for notify popup 2012-07-15 21:06:07 -07:00
friendica
03209d2d0d updates 2012-07-14 20:39:46 -07:00
friendica
a20a637727 merge upstream, slider work, refactor ping module, language selection work 2012-07-13 07:09:29 -07:00
friendica
599f3d2961 add plink to profile change notifications 2012-07-12 16:53:42 -07:00
friendica
3f7b93ce65 language detection and sparkle links added to plinks where appropriate 2012-07-12 03:50:05 -07:00
friendica
3f414aec63 get rid of special "short salmon key" for statusnet 2012-07-11 16:54:18 -07:00
friendica
71afdf3d9c gracefully recover from datetime constructor issues 2012-07-11 16:20:17 -07:00
friendica
6105211e73 catchup 2012-07-11 04:29:47 -07:00
friendica
31c218e785 catchup 2012-07-10 20:44:17 -07:00
friendica
e7957e1448 create fetch_tags function, make search work again, change logo 2012-07-10 19:28:02 -07:00
friendica
94fabe3a29 upstream fixes and a lot of taxonomy stuff 2012-07-10 06:28:02 -07:00
friendica
1215de575d slider 2012-07-09 23:23:20 -07:00
friendica
5355193b63 theme cleanup 2012-07-09 22:48:51 -07:00
friendica
4b066e04f6 making tags work 2012-07-09 22:08:25 -07:00
friendica
95fdba753c remove bookmark content flag 2012-07-08 03:38:10 -07:00
Zach Prezkuta
6d10374c17 cleanup 2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
friendica
0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora
remove check for event description in bb2diaspora
2012-07-07 04:19:15 -07:00
Zach Prezkuta
4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
a6514e81bb remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
Zach Prezkuta
47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
Zach Prezkuta
5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
friendica
854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions
slightly better way of handling last loop
2012-07-05 18:10:32 -07:00
Zach Prezkuta
528d250ded slightly better way of handling last loop 2012-07-05 19:08:30 -06:00
friendica
09959b1b1c Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions
add some timeouts to prevent deadlock
2012-07-05 18:05:32 -07:00
Zach Prezkuta
5dcce1ed93 add some timeouts to prevent deadlock 2012-07-05 19:01:13 -06:00
friendica
fe984963ed Merge pull request #373 from fermionic/more-list-fixes
fix small bug in lists and revert Diaspora list processing to non-Markdo...
2012-07-05 16:03:29 -07:00
Zach Prezkuta
e0607e0238 cleanup some syntax errors in lock.php 2012-07-05 14:27:29 -06:00
Zach Prezkuta
75ed37fb3d "lock" is a reserved MySQL keyword 2012-07-05 14:27:29 -06:00
Zach Prezkuta
46068935d0 minor cleanup in lock.php 2012-07-05 14:26:42 -06:00
Zach Prezkuta
20c4ecbcd9 cleanup obsolete comments 2012-07-05 14:26:42 -06:00
Zach Prezkuta
168ae40dd2 add rudimentary locking capability to Friendica functions 2012-07-05 14:26:42 -06:00
Zach Prezkuta
041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version 2012-07-05 12:54:52 -06:00
friendica
360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica
e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica
5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica
c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
friendica
ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica
315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica
dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica
6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring 2012-06-30 05:16:30 -07:00
Fabrixxm
0fb08e3642 nav: pass $baseurl to template 2012-06-29 05:29:29 -04:00
friendica
43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica
1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica
43d3721fa9 css smiley class 2012-06-28 16:42:40 -07:00
friendica
d7f35c81db Merge https://github.com/friendica/friendica into pull 2012-06-28 16:05:28 -07:00
friendica
de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
Zach Prezkuta
cd9ce0ecb3 fix logic for nested lists--should be OR, not AND 2012-06-27 21:21:26 -06:00
Sebastian Egbers
587b081a38 moved api direct message formating to own function.
added same formating to direct reply message, when posting a new message.
2012-06-26 08:54:01 +02:00
Sebastian Egbers
0f0fb2e2f3 Merge branch 'master' of https://github.com/friendica/friendica 2012-06-26 08:33:41 +02:00
friendica
a4b407eb54 stray s 2012-06-25 22:01:32 -07:00
friendica
d32d0e2154 typos 2012-06-25 21:39:07 -07:00
friendica
78ede4744f add event titles to discovered birthday events 2012-06-25 21:37:38 -07:00
friendica
0f0ffce1b6 change required doco 2012-06-25 21:27:34 -07:00
friendica
359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica
fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
friendica
53f0aee82d Merge https://github.com/friendica/friendica into pull 2012-06-25 18:16:55 -07:00
friendica
f1991a5952 propagate remote deletes 2012-06-25 18:15:56 -07:00
Zach Prezkuta
5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta
c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting 2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
2012-06-25 19:03:03 -06:00
friendica
f0b41709eb improve remote delete forwarding 2012-06-25 17:45:33 -07:00
friendica
fad2679c7e Merge https://github.com/friendica/friendica into pull
Conflicts:
	include/bbcode.php
2012-06-25 16:05:42 -07:00
friendica
b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Simon L'nu
939ebe16f8 fix typo and syntax error
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:49:36 -04:00
friendica
cb450d3365 Merge pull request #360 from fermionic/more-nested-lists
allow nested [ol] and [ul] lists too
2012-06-25 14:20:16 -07:00
Zach Prezkuta
fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
Zach Prezkuta
4293de7554 allow nested [ol] and [ul] lists too 2012-06-25 08:26:00 -06:00
Sebastian Egbers
8c251aebc7 fixed direct message reply in api call. 2012-06-25 16:25:34 +02:00
Sebastian Egbers
af1d4bb632 modified api message reply to set title to conversion title, when replying. 2012-06-25 15:53:56 +02:00
Sebastian Egbers
020deedd7c Merge branch 'master' of https://github.com/friendica/friendica 2012-06-25 13:59:39 +02:00
friendica
7ea5917bf7 more service class functionality 2012-06-25 03:25:06 -07:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica
c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica
7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
fermionic
49ecf58163 Merge pull request #357 from fermionic/fix-relayable-signature-handle
ok now I'm just making silly mistakes--take out premature function locki...
2012-06-23 21:29:52 -07:00
Zach Prezkuta
59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code 2012-06-23 22:28:28 -06:00
friendica
92a997365f Merge https://github.com/friendica/friendica into pull 2012-06-23 21:11:41 -07:00
friendica
1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
fermionic
642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle
use author handle instead of sender handle
2012-06-23 21:08:43 -07:00
Zach Prezkuta
0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta
5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
Zach Prezkuta
1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta
4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Max Weller
cbf1cab0da Merge remote-tracking branch 'sebastian/master' 2012-06-23 22:59:03 +02:00
Max Weller
e3c36dfd1d add reliable way to get server version 2012-06-23 22:52:50 +02:00
Max Weller
11b6beae06 make it selectable 2012-06-23 22:39:11 +02:00
Max Weller
111ace5abd I want HTML code! 2012-06-23 22:35:43 +02:00
Max Weller
9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects 2012-06-23 19:38:15 +02:00
Max Weller
2c992c5969 bugfix 2012-06-23 19:35:01 +02:00
Max Weller
f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages 2012-06-23 19:29:58 +02:00
Max Weller
d8a376666c modified direct_messages 2012-06-23 19:21:48 +02:00
Zach Prezkuta
90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06:00
friendica
7a346bc756 this is going to take some more debug before it can be roller out 2012-06-23 07:43:56 -07:00
friendica
63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica
a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica
1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica
f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica
49360b0a64 Merge https://github.com/friendica/friendica into pull 2012-06-23 05:47:31 -07:00
friendica
22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta
9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Sebastian Egbers
cd25c3b5dd added replyto and subject to direct messages. 2012-06-22 14:54:31 +02:00
Sebastian Egbers
c14270ac64 modified conversion to use x function for parameter checking. 2012-06-22 13:35:36 +02:00
Max Weller
6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Max Weller
0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00
friendica
53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica
91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
Zach Prezkuta
73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
friendica
bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica
0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica
f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
friendica
961c633773 Merge pull request #344 from ridcully/master
exclude_replies for twitter api
2012-06-20 01:01:55 -07:00
friendica
b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica
1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
Zvi ben Yaakov (a.k.a rdc)
ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -07:00
Sebastian Egbers
eab3938471 added exclude_replies option to api call statuses/user_timeline. 2012-06-19 16:27:23 +02:00
Sebastian Egbers
43532b7414 added exclude_replies option to api call statuses/home_timeline. 2012-06-19 16:15:19 +02:00
friendica
dbceef04e8 exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there 2012-06-18 20:21:54 -07:00
Zach Prezkuta
7cd516e34f fix some whitespace issues 2012-06-18 21:06:54 -06:00
Zach Prezkuta
42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica
341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
Thomas Willingham
371bdfb19d Typo breaking tag notifications 2012-06-18 22:00:18 +01:00
Michael
6eaca19f41 Merge branch 'master' of github.com:annando/friendica
Conflicts:
	include/oembed.php
2012-06-18 08:51:12 +02:00
Michael
d53414a333 OEmbed: Don't output the width of images 2012-06-18 08:49:35 +02:00
Michael Vogel
cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Zvi ben Yaakov (a.k.a rdc)
8af9fe8df7 Added missing backticks to navigation bar query 2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc)
b0021a4637 Enabled Profile photo revisions to be displayed in navigation bar 2012-06-17 23:22:37 +03:00
Michael Vogel
3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica
7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
Hauke Zuehl
cc7d849ce3 Merge remote branch 'upstream/master' 2012-06-16 19:49:04 +02:00
fermionic
950dacbbdd Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
Diaspora dont check more signatures than diaspora does
2012-06-16 09:49:19 -07:00
Zach Prezkuta
3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta
577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta
0ff86e28bb fix small typo for logging command in api.php 2012-06-16 10:25:46 -06:00
Zach Prezkuta
0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta
09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Hauke Zuehl
f9a40ccbde Merge remote branch 'upstream/master' 2012-06-16 18:04:59 +02:00
Hauke Zuehl
1231dd72f0 Check if $rr exists 2012-06-16 15:07:23 +02:00
friendica
4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica
ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica
2efee75557 also mark for death if there isn't any xml to be found 2012-06-14 17:38:39 -07:00
friendica
267681844d poll even if contact hasn't responded recently, so we can update the termination status 2012-06-14 17:27:07 -07:00
friendica
be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
friendica
79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica
edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica
b0a0c1ef4d couple of little fixes to enotify positional params 2012-06-13 20:03:18 -07:00
friendica
7d8b087f4a fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them. 2012-06-13 19:59:20 -07:00
friendica
24bf4632af Merge https://github.com/friendica/friendica into pull 2012-06-13 16:25:57 -07:00
friendica
85876be48a Merge https://github.com/fabrixxm/friendica into pull
Conflicts:
	util/messages.po
2012-06-13 16:25:09 -07:00
friendica
36491462ba Merge pull request #333 from Erkan-Yilmaz/master
missing bracket
2012-06-13 16:21:15 -07:00
friendica
d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
Erkan Yilmaz
e8e1de3603 add missing bracket 2012-06-13 20:41:53 +02:00
fabrixxm
feab17bfea enotify: fix stupid typo 2012-06-13 12:08:34 -04:00
fabrixxm
46cb8174fa enotify: rework strings to more easy to translate 2012-06-13 11:55:21 -04:00
friendica
a424fecdae this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March 2012-06-12 22:52:34 -07:00
friendica
bbdb8751e5 that was it 2012-06-12 21:39:39 -07:00
friendica
82ad881c85 think this will fix it 2012-06-12 21:38:10 -07:00
friendica
d955813f22 tracking another edge case 2012-06-12 21:34:28 -07:00
friendica
08af43f396 edge case 2012-06-12 21:30:17 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica
832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica
08b3126dae Merge https://github.com/friendica/friendica into pull 2012-06-12 02:48:00 -07:00
friendica
1dd52c20cf move parens to proper place 2012-06-12 02:47:05 -07:00
Michael Vogel
a1c407e017 Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php" 2012-06-12 12:39:28 +03:00
friendica
b6ff71acaa survive bad/un-parseable input to datetime_convert 2012-06-12 02:06:29 -07:00
friendica
645c2f9092 Merge pull request #331 from mexon/upstream
Add a hook for post-processing remote items
2012-06-12 00:52:36 -07:00
Matthew Exon
33a4e45f6b Add a hook for post-processing remote items after they've been stored in the database and have an ID 2012-06-12 07:58:12 +02:00
friendica
b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica
24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica
75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica
09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica
3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
friendica
afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica
da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica
ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
Fabio Comuni
2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica
6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
friendica
5389efffa9 add email probe logging, limit typo check to main addon files and skip additional support files 2012-06-05 19:28:04 -07:00
Vasudev Kamath
12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Michael Vogel
0353410cd4 Merge remote branch 'upstream/master' 2012-06-04 08:09:15 +02:00
Michael Vogel
5de91c2a7c API: Only repeat items if there is a content 2012-06-04 08:08:45 +02:00
Zach Prezkuta
9920fb39e5 Debugged implementation of Diaspora relayable_retractions
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
2012-06-03 14:53:30 -06:00
Zach Prezkuta
06263f72a8 cleanup and logging 2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Zach Prezkuta
1fe1ac022f Support relayable_retractions that are relayed to us by the top-level post owner 2012-06-03 14:53:29 -06:00
friendica
daa4f5213f zrl's when visiting public photos at the source site 2012-06-03 01:53:11 -07:00
friendica
97576e3e33 doco 2012-06-02 23:22:02 -07:00
friendica
82cf664920 turn "follow" into a function 2012-06-02 23:12:20 -07:00
friendica
d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica
3d39e6e594 bug #439 - remove web port number from notification email "from" address 2012-06-02 18:23:54 -07:00
friendica
4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica
608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica
29bdf432f0 fewer "bob smith to bob smith via wall-to-wall". 2012-06-02 00:40:38 -07:00
friendica
c0b74b18fe Merge pull request #321 from beardy-unixer/master
BB code [quote=somebody] fix.
2012-06-01 21:48:23 -07:00
friendica
0165d5dd2c registration issue after re-factor 2012-06-01 15:42:13 -07:00
Thomas Willingham
7a5c85f628 [quote=somebody] was appearing as an extended spoiler tag. 2012-06-01 23:31:07 +01:00
friendica
93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
Zach Prezkuta
d5116689af query using both id and parent 2012-05-31 19:45:58 -06:00
friendica
f0cf0ebb48 prevent email from leaking in feeds 2012-05-30 19:11:01 -07:00
friendica
15c023a218 y didn't i think of this b4? 2012-05-30 17:22:51 -07:00
friendica
e5a988f0b5 fix private photos that also have a size specification 2012-05-30 01:52:58 -07:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
c58b0b9cbb prvgroup should see intros 2012-05-29 18:24:44 -07:00
friendica
514c994e6a possible sql injection in search 2012-05-29 17:14:35 -07:00
friendica
21d79e787e Merge https://github.com/friendica/friendica into pull
Conflicts:
	mod/search.php
2012-05-29 16:50:42 -07:00
friendica
419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
Simon
43c185ce04 Merge pull request #316 from annando/master
Speed improvements
2012-05-29 13:13:10 -07:00
Tobias Hößl
dfef0ec84d Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning 2012-05-29 19:03:30 +00:00
Michael Vogel
8202355df9 Disabled logging of SQL statements 2012-05-29 16:16:37 +02:00
Michael Vogel
68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
0241bd1fbf Provide backend option to only expire other peoples' conversations. 2012-05-28 23:24:10 -07:00
friendica
f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
friendica
ff0291c876 add plugin hooks to gender, sexpref, and marital selectors 2012-05-27 22:35:01 -07:00
friendica
b752acd089 birthday in november,december bug 2012-05-27 21:36:20 -07:00
friendica
2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica
08941d4285 handle multiple underscores in D* links 2012-05-26 23:46:42 -07:00
friendica
73c61b6f96 allow force ssl on notifications 2012-05-26 16:11:51 -07:00
Michael Vogel
7f19d39b14 Doing negative caching for config values, special logfile for database optmisations 2012-05-26 15:41:23 +02:00
Michael Vogel
a612b10b2a Deactivating the test output in db engine 2012-05-26 03:23:18 +02:00
Michael Vogel
4951210508 Speed optimisation by enabling the posibility of the MySQL fulltext engine 2012-05-26 03:21:07 +02:00
Michael Vogel
a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
Simon L'nu
789063da39 add a placeholder attribute on search-text; dispy fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
friendica
61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica
3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica
b43b680802 clear submanage, etc from session on logout 2012-05-22 18:05:58 -07:00
friendica
3ce06caeed cause of bogus wall-to-wall posts found 2012-05-22 03:55:11 -07:00
Tobias Diekershoff
30f3a16874 Merge branch 'master' of https://github.com/friendica/friendica 2012-05-22 11:57:19 +02:00
Tobias Diekershoff
5dad99888d fix setting array values to config items 2012-05-22 11:56:49 +02:00
friendica
a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica
54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
friendica
afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
Michael Vogel
8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Michael Vogel
9a940786c1 Merge remote branch 'upstream/master' 2012-05-19 14:04:24 +02:00
friendica
513ef2410d backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ 2012-05-19 02:42:11 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica
7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica
d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica
4f0e26759c bring in the *much better* xml parser from the original zot branch 2012-05-16 21:29:57 -07:00
Michael Vogel
f2c0c40f6e Merge remote branch 'upstream/master' 2012-05-16 08:24:46 +02:00
Matthew Exon
e574514e21 Allow plugins to modify the contact photo menu 2012-05-15 08:59:45 +08:00
friendica
3811fe288f rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00
Vasudev Kamath
10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
friendica
4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica
20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica
496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
Michael Vogel
f2e648d62f Merge remote branch 'upstream/master' 2012-05-09 14:56:48 +02:00
friendica
53157bb954 send browser back to correct page (with query args) after posting 2012-05-09 04:18:01 -07:00
friendica
70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
friendica
a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
friendica
10812e0c19 make it optional to optimize the item table after expire 2012-05-08 15:33:01 -07:00
friendica
f0b7a8ae35 finished dry run - now for real test 2012-05-07 18:36:28 -07:00
friendica
8a4e3cc370 don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration 2012-05-07 16:51:09 -07:00
friendica
189a31e628 If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
2012-05-07 15:54:49 -07:00
friendica
e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
friendica
8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
Vasudev Kamath
b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica
8ae83201cf consolidate item deletion so we can fix orphaned categories and file_as tags. 2012-05-05 07:05:32 -07:00
friendica
d0dd22af57 workaround to clean up orphaned filetags 2012-05-04 17:43:47 -07:00
friendica
7c6e8b30b2 only show remove category to item owner 2012-05-04 16:45:10 -07:00
friendica
10754ced3e category removal 2012-05-04 06:42:56 -07:00
friendica
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
15542a8690 yet another bug in remote_friends_in_common 2012-05-03 20:47:04 -07:00
friendica
f3e18df55d string update 2012-05-03 16:55:03 -07:00
Fabio Comuni
52915c6e68 validate_url() and validate_email() validate also IP address. 2012-05-03 15:28:23 +02:00
friendica
3ecde2d72f use mysql replace on cache items 2012-05-02 16:27:19 -07:00
friendica
8e1437ca8b fixing common friends 2012-05-02 16:15:59 -07:00
friendica
21e18db757 missing param 2012-05-02 02:18:54 -07:00
friendica
35dc4202a2 how did that happen? 2012-05-02 00:58:28 -07:00
friendica
a42a475e10 shuffle results of remote_common_friends widget 2012-05-02 00:44:37 -07:00
friendica
1b1f56f556 only validate once 2012-05-01 23:16:58 -07:00
friendica
dd27328390 perform basic validation 2012-05-01 23:15:39 -07:00
friendica
becdb1f508 final touches - show friends in common with total strangers from different sites 2012-05-01 21:22:27 -07:00
friendica
e247ed3de2 cross fingers 2012-05-01 20:36:35 -07:00
friendica
594803afca reduce the scope a bit 2012-05-01 20:33:19 -07:00
friendica
72dbc2faee fn not found 2012-05-01 20:11:35 -07:00
friendica
15c1850156 another one 2012-05-01 19:20:41 -07:00
friendica
1fc796b276 typo 2012-05-01 19:19:24 -07:00
friendica
8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
friendica
f24ffa8ef0 improve handling of relative feed url's 2012-05-01 17:10:26 -07:00
friendica
38ccd2e655 convert html entities to utf-8 before email header encoding 2012-05-01 15:49:22 -07:00
friendica
0ca4fa78c8 link socgraph to zrls 2012-05-01 01:34:47 -07:00
friendica
584ac68ae4 adding zrl support to social graphs 2012-05-01 01:16:47 -07:00
friendica
d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
Zach Prezkuta
a844093365 change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 2012-04-30 20:51:22 -06:00
friendica
da555286d6 missed a db field 2012-04-29 22:36:26 -07:00
friendica
928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica
ae2aa74444 not all profile selector choices have unique or direct translations 2012-04-29 20:05:29 -07:00
friendica
1ebde08415 log db error strings in all cases 2012-04-29 19:41:17 -07:00
friendica
e3fecb2557 improved db error logging 2012-04-29 17:34:54 -07:00
friendica
64060f82dc toggle to archive unfriends, though render them useless 2012-04-28 21:56:17 -07:00
friendica
4ff2e9a103 a few more continues that should be returns 2012-04-28 16:54:33 -07:00
friendica
44700b914d poller refactor: continue not valid in this context 2012-04-28 04:20:38 -07:00
friendica
f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica
26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Vasudev Kamath
214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
friendica
3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -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
e9e4fb664a allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets 2012-04-23 05:42:46 -07:00
friendica
2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
Michael Johnston
76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Michael Vogel
a3f08c44be API: RSS-Feeds are now shortened to 1000 characters. (With added link) 2012-04-22 18:00:24 +02:00
Vasudev Kamath
8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
Tobias Hößl
e3af818263 Typo 2012-04-17 19:31:06 +00:00
Tobias Hößl
720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica
fd2f7dd6ae turn on comment edit 2012-04-16 03:51:48 -07:00
friendica
0b838e4cc7 propagate edited comments 2012-04-16 02:09:00 -07:00
friendica
c8598e7da6 edited comments weren't being relayed 2012-04-16 01:35:27 -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
f994f9abc6 open contact edit in same window 2012-04-15 06:34:01 -07:00
friendica
31b1d353b2 Merge pull request #234 from copyninja/master
Executable permisson removal on files which are not elf/script
2012-04-14 14:50:54 -07:00
Simon L'nu
6278b2a923 string fix: typo. slow down scroll to top in dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Vasudev Kamath
41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Michael Vogel
e825a73f1d DBA: Reverting back to original source 2012-04-14 13:35:11 +02:00
friendica
9dd0ef2aeb bug #372 - category feeds 2012-04-14 04:19:41 -07:00
Michael Vogel
eb27c32065 DBA: Nothing really done .. 2012-04-14 13:17:58 +02:00
Michael Vogel
4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica
7c63ca8364 one more 2012-04-13 17:39:12 -07:00
friendica
0d0aa7495b additional marital status selectors 2012-04-13 17:34:02 -07:00
Fabio Comuni
f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni
4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
Fabio Comuni
67a2d5be77 validate_url allow naked subdomain if is "localhost" 2012-04-13 09:42:53 +02:00
friendica
df1904b204 stray debug statements, forgot to filter pending contacts 2012-04-12 23:14:41 -07:00
friendica
3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
Michael Vogel
572678fef9 Merge commit 'upstream/master'
Conflicts:

	include/dba.php
2012-04-13 00:10:41 +02:00
Michael Vogel
138caa4380 DBA: Deactivation of the mysqli-class for testing purposes. 2012-04-13 00:05:52 +02:00
friendica
73487989c0 query to find un-grouped contacts 2012-04-12 07:48:28 -07: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
friendica
5a78400f37 table cleanup 2012-04-12 05:15:45 -07: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
b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
friendica
640f258f18 cleanup photo menus 2012-04-10 19:33:32 -07:00
friendica
19b636e7e8 more backend work on mail2 followers 2012-04-10 19:15:52 -07:00
friendica
9b1bb53234 fix_mce_lf on profiles 2012-04-10 16:31:49 -07:00
friendica
14d68a0dc0 set default on get_avatar 2012-04-10 15:33:43 -07:00
friendica
3c66816938 Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull 2012-04-10 15:28:48 -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
Alexander Kampmann
1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718 fixed some typos 2012-04-09 14:27:52 +02:00
Alexander Kampmann
7ac4b83c39 made exceptions from the db optional
set address for updae mails correctly
2012-04-09 14:04:49 +02:00
Michael Vogel
fe257a2032 html2plain: changed behaviour for the "hr" element. 2012-04-09 12:54:02 +02:00
friendica
c1e2596807 more sane defaults datetime_convert 2012-04-08 18:09:21 -07:00
friendica
129130b0f7 fix empty string timezone 2012-04-08 18:01:49 -07:00
Alexander Kampmann
0d60dbef31 added exceptions to dba class
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates

added german translation for admin email
2012-04-09 00:45:10 +02:00
Michael Vogel
269f21ddc1 API: Added Public Timeline 2012-04-08 20:19:14 +02:00
Michael Vogel
763729f11a API: Now mentions could work as well - only my client doesn't really work 2012-04-08 17:51:05 +02:00
Michael Vogel
944f897d30 API: Basic support of the identica client added. 2012-04-08 17:23:38 +02:00
Michael Vogel
cb4c7cdb3e API: API is now enhanced. mentions, repeat and destroy now works. 2012-04-08 00:02:25 +02:00
Michael Vogel
cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
friendica
1440786c31 ignore utf8 offset error for unit tests 2012-04-07 02:31:41 -07:00
friendica
3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica
ecabe1d505 ignore removed plugins 2012-04-06 05:21:42 -07:00
friendica
13dfb40128 fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07:00
friendica
665b2c8107 revert config changes, we're getting duplicate keys 2012-04-06 03:10:46 -07:00
friendica
4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica
221726392e pass autoname(0) test 2012-04-05 18:44:36 -07:00
Michael Vogel
34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02: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
Alexander Kampmann
cbf4544887 added index to config and pconfig table
changed config.php to use REPLACE instead of INSERT, 
this removes one db hit.
2012-04-05 13:27:09 +02:00
friendica
37801dd6ed also block outbound 2012-04-04 20:48:35 -07:00
friendica
0c7710681c log disabled requests 2012-04-04 18:49:39 -07:00
friendica
71671e5b9a fix config storage of booleans 2012-04-04 17:51:59 -07:00
friendica
62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -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
Michael Vogel
3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
friendica
62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
friendica
1f74bd1b78 catch a couple more Oo smilies 2012-04-01 22:57:50 -07:00
friendica
5d35f0d54a add title to D* posts 2012-04-01 19:16:13 -07:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
Michael Vogel
5409825fe7 New script that checks if a script is running 2012-04-01 20:56:27 +02:00
Michael Vogel
4cf1e5aa21 poller: An optional lockfile is used to check if the poller is already running 2012-04-01 20:52:33 +02:00
friendica
9b4bef8ac4 that didn't quite work out 2012-04-01 06:46:12 -07:00
Michael Vogel
7d23149a61 Merge commit 'upstream/master' 2012-04-01 14:11:37 +02:00
friendica
f0b8d01615 try slightly better detection of html in feeds 2012-04-01 03:19:37 -07:00
friendica
ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
Simon
e97d90820d line 86: s/Friendika/Friendica/ 2012-04-01 04:52:45 -03:00
friendica
e6fd6bfd89 more error handling 2012-03-31 17:44:34 -07:00
friendica
53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica
0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf 2012-03-31 14:48:35 -07:00
Michael Vogel
59b45f7fc1 Several improvements 2012-03-31 16:28:39 +02:00
friendica
8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
Tobias Diekershoff
17c908973f catch OpenID login errors in cases when the OpenID server does not answers 2012-03-30 15:19:17 +02:00
friendica
bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica
87539dbec4 bug #352 - qcomment plugin disabled, qcomments still allowed 2012-03-30 02:22:57 -07:00
friendica
e2c295c01f another silly mistake 2012-03-29 21:44:30 -07:00
friendica
9332312ce9 silly mistake 2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4 zrl on mentions 2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica
5921dc6f16 typo in function name 2012-03-29 16:01:44 -07:00
friendica
4e4f7ac79f some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
friendica
a946b7cea3 Merge branch 'pull' 2012-03-28 19:57:28 -07:00
friendica
7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
Michael Vogel
bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni
7aec2fd68d filer: info() on item filed 2012-03-28 10:45:16 +02:00
friendica
0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica
20f9733250 don't expire filed items 2012-03-27 00:54:34 -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
b240b8489a language issues in enotify 2012-03-26 01:43:26 -07:00
friendica
021c647673 don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. 2012-03-25 21:43:17 -07:00
friendica
7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
friendica
873a55e918 enotify plugin hook 2012-03-25 05:06:11 -07:00
friendica
5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
friendica
6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica
d06ddeb1cc bug #346 - add oembed maxwidth to oembed request 2012-03-24 21:26:50 -07:00
friendica
3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica
3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica
528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -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
d81256d7b0 support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
Michael Vogel
792edfe9c8 New parameter in html2plain for plain text exports. More compatibility in API 2012-03-21 10:08:40 +01:00
friendica
6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
friendica
810e69ef0a more friend suggestions 2012-03-20 19:06:26 -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
5a5aadb743 add IP address to failed login log message 2012-03-19 21:58:21 -07:00
friendica
f7e380cdc6 Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
Smiley removal
2012-03-19 15:56:16 -07:00
Thomas
84f8e2eaa8 modified: include/text.php
Stupid bug fixed
2012-03-19 22:32:19 +00:00
friendica
a156ce196e Merge pull request #150 from fabrixxm/master
Add "logging_out" hook
2012-03-19 15:29:32 -07:00
friendica
9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
Thomas
e9b33a6f1f modified: include/text.php
deleted:    images/diaspora.png
	deleted:    images/smiley-bangheaddesk.gif
	deleted:    images/smiley-beard.png
	deleted:    images/smiley-shaka.gif
	deleted:    images/smiley-whitebeard.png

Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out.
2012-03-19 21:59:06 +00:00
friendica
139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
Fabio Comuni
ea4be0db89 Merge remote-tracking branch 'friendica/master' 2012-03-19 12:24:40 +01:00
friendica
2349852b4a support "no_smilies" 2012-03-19 03:18:39 -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
Michael Vogel
3393d80ac1 API: added max_id 2012-03-18 19:00:24 +01:00
Michael Vogel
77e77027b4 API: Now threading seems to work 2012-03-18 18:21:51 +01:00
Michael Vogel
6f10142b2e API: Seesmic is now working. Optimizing text export. 2012-03-18 17:52:51 +01: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
Tobias Hößl
72894b0e91 replace split() by explode(); split is deprecated 2012-03-18 10:36:49 +00:00
friendica
67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
Michael Vogel
f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
friendica
94fac6d767 queue optimisation - back off delivery attempts to once per hour after the first 12 hours. 2012-03-17 03:43:02 -07:00
Michael Vogel
8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica
e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
friendica
949c6d47b5 add "send pm" link to photo dropdown for Diaspora contacts 2012-03-16 15:19:38 -07:00
friendica
141ae076ad Merge branch 'pull' 2012-03-16 15:08:32 -07:00
friendica
58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -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
224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica
805087af67 whitespace 2012-03-16 05:41:29 -07:00
friendica
be1bd9ff4e notification for disapora comments 2012-03-16 05:19:29 -07:00
friendica
41d595d5bc Merge branch 'pull' 2012-03-15 16:39:21 -07:00
friendica
7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
Michael Vogel
b5120888cf html2bbcode: Disabled size conversion 2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01: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
4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica
be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica
5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
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
Fabio Comuni
c30342e2f7 add 'loggin_out' hook 2012-03-12 15:58:59 +01:00
friendica
3bc990f718 more save to file backend 2012-03-11 21:32:11 -07:00
friendica
93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Michael Vogel
6e7a190e91 Mail: Subject are now with working "Re:" 2012-03-12 00:22:12 +01:00
Michael Vogel
2ed6b3531e Removing test exports 2012-03-11 23:29:59 +01:00
Michael Vogel
d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
9ca5de8c28 Item cache now is one day. 2012-03-11 19:45:28 +01:00
Michael Vogel
9f76d96d46 Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works. 2012-03-11 19:11:25 +01:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica
5915325367 bug #328 2012-03-10 18:52:50 -08:00
Michael Vogel
670b571c8a Caching improved. 2012-03-10 18:19:00 +01:00
Michael Vogel
74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
Michael Vogel
e098147c24 New config options if ostatus polling should use the priority in the contacts 2012-03-10 11:29:40 +01:00
Michael Vogel
15916a2cb7 Mail: Removing signatures, gpg, unnecessary line breaks 2012-03-10 09:52:20 +01:00
Michael Vogel
11c29e0cba Merge commit 'upstream/master' 2012-03-09 11:41:23 +01:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -08:00
friendica
2050f886cc keep tony from talking to himself 2012-03-08 21:14:41 -08:00
friendica
395a9530dc still getting parent relays on remote systems 2012-03-07 18:23:55 -08:00
friendica
dd3b3c2454 revup 2012-03-07 15:54:37 -08:00
friendica
7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
friendica
1224e256b1 Merge branch 'pull' 2012-03-06 17:22:13 -08:00
friendica
88cd5800cf [privacy] rework latest fix 2012-03-06 17:21:14 -08:00
Simon L'nu
415ca107fd Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
2012-03-06 18:38:44 -05:00
Simon
1fae778421 Merge pull request #94 from beardy-unixer/master
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798 Merge pull request #99 from tomtom84/master
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
friendica
8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
Thomas
67456bad06 Fixed...merged with mainline THEN added beards. 2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb added beard smileys 2012-03-06 20:44:53 +00:00
friendica
eec4cff84b remove "smilie" expansion for Diaspora logo 2012-03-06 04:28:45 -08:00
friendica
23718bfc25 prevent duplicate likes 2012-03-06 02:17:55 -08:00
friendica
c37ffd2999 can_write_wall documentation 2012-03-05 15:04:43 -08:00
friendica
fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
friendica
4134fd3dce unused replacement variable displays %1 in all html2bbcode 'code' blocks 2012-03-04 16:26:16 -08:00
Fabio Comuni
685686b3e8 template proc: fix variables regexp 2012-03-03 00:00:38 +01:00
Fabio Comuni
aef737f376 template proc: allow isolation of var name between [ and ]
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni
0bf087c895 template proc: remove unused function and commented out code 2012-03-02 12:36:22 +01:00
Fabio Comuni
60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
Michael
52ea842e87 html2bbcode: don't convert sizes and fonts. 2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb expand multiple heart smilies e.g. <3333 2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7 Merge pull request #55 from fabrixxm/master
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
friendica
8207272fbc Merge branch 'pull' 2012-03-01 18:54:50 -08:00
friendica
58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b Enabled automated doc building. Changes:
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value 2012-03-01 11:32:49 +01:00
friendica
bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica
21803e0cd3 call time pass by reference deprecated 2012-02-28 14:54:17 -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
Tobias Hößl
1204210c69 wasn't actually changed before 2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4 Avoid a notice 2012-02-28 12:56:16 +00:00
friendica
6c0fa7a166 Merge branch 'pull' 2012-02-27 17:18:53 -08:00
friendica
d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Tobias Hößl
e33c2b8f89 Avoid a Notice 2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9 Avoid a Notice 2012-02-27 22:01:17 +00:00
Fabio Comuni
42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica
153e7beb19 add plugin hooks to enotify 2012-02-26 23:54:04 -08: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
friendica
bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
Michael
437e18d7a7 Merge remote branch 'upstream/master' 2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538 Avoid some notices 2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf Bugfix 2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a 1 Bugfix (missing $ character) and avoid some notices 2012-02-26 20:41:41 +00:00
root
aa92901b11 Wrong variable name 2012-02-26 14:29:17 +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
f3a225437b Comment notifications by e-mail now are threaded 2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f include/items.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
Michael
1cf1870512 poller.php: Test for moving to archive, vier-style: notifications fixed 2012-02-25 19:40:05 +01:00
Michael
dccefb3c36 "vier": The contacts are now working again. Line break before closing bbcodes removed. 2012-02-25 11:00:35 +01:00
friendica
18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica
9441ff5142 string update for 2.38 2012-02-24 22:47:43 -08:00
friendica
a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica
f5c5da742d attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
Michael
01301a6169 Bug fixed where mails where nearly empty. HTML mails can now be received. 2012-02-25 02:37:39 +01:00
Michael
a74b0746b1 multipart messages complete, message-id conversion done. 2012-02-25 01:10:45 +01:00
Michael
0ba45eb745 Sending mail as multipart/alternative (html and plain text) (very basic by now) 2012-02-24 08:50:42 +01:00
Michael
f6320f3319 Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact. 2012-02-24 07:11:26 +01:00
Michael
484a442f2b GIT problems ... 2012-02-23 20:59:34 +01:00
Michael
0409b5cdba Merge remote branch 'upstream/master'
Conflicts:
	include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael
311e35731c bbcode.php: A list or quote at the beginning wasn't detected 2012-02-23 20:51:44 +01:00
Tobias Diekershoff
85d09f48d0 fix img tag with size attribute 2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica
fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
friendica
41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
Michael Vogel
9f92bbb04c Removed the export of markdown articles. That was for testing purposes only. 2012-02-23 07:53:45 +01:00
friendica
808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica
3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1 restore poller normal operation 2012-02-22 20:31:33 -08:00
friendica
58a9c652de Merge pull request #45 from annando/master
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
friendica
f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica
390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica
91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica
3f2497ad20 add full email link to notification 2012-02-21 18:10:15 -08:00
friendica
f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
Fabio Comuni
01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica
5910fbf420 fill in notify msg with redirect link after we get the id 2012-02-21 00:02:42 -08:00
friendica
32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -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
friendica
6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica
11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr
3ef6344d41 include/nav.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6 include/api.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce poller.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177 acl_selectors.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a Scrape.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Michael
e2f276881e Some testing stuff 2012-02-20 11:15:22 +01:00
friendica
15e9933ddf include item links in web notification messages 2012-02-19 20:27:32 -08:00
Michael
0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael
064c843119 Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes. 2012-02-19 21:07:45 +01:00
Michael
31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
Simon L'nu
49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to /
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
friendica
5734d5f357 change notify messages for web 2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
Fabio Comuni
7bd43613fa oembed: revert changes from 48f5bd492d 2012-02-17 15:34:05 +01:00
friendica
48f5bd492d naked link with no protocol being passed from Diaspora 2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica
7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica
1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica
ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -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
fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica
134fdda75f refactor smilie code to allow for extensions and generation of a table of the entire list 2012-02-14 15:31:08 -08:00
Vasudev Kamath
e4b1c07727 cry, foot in mouth, cool, undecided and embarassed smiley's are mapped 2012-02-14 23:10:11 +05:30
friendica
803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
Fabio Comuni
850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
friendica
85c831bcbf finish translation of 'xxxxx wrote:' 2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr
9697e82331 Merge branch 'master' into bbcode 2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f Added [th] bbcode tag support. 2012-02-12 17:27:08 -08:00
friendica
3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c Fixed bbcode [li] and [*] handling. 2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d Added [quote=Name] bbcode support. 2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa Added [center] bbcode support. 2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px).
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. 2012-02-12 14:35:29 -08:00
friendica
330a876d81 bug #281 2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2 Added support for [ol] standard ordered list bbcode. 2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc Added support for [ul] standard unordered list bbcode. 2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes 2012-02-12 06:13:49 -08:00
Vasudev Kamath
495d0fb80f Merge branch 'master' of git://github.com/friendica/friendica 2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1 ;) :D and :-O are also enabled for wink laugh and surprised smiley's 2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8 do not display contact_block if config for num shown is 0 2012-02-11 23:49:05 -08:00
friendica
bb19c8ba4e kissing smilie may need escaping (thanks - Abinoam) 2012-02-11 21:46:48 -08:00
friendica
75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
friendica
d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica
b346f4464c send notify emails to community pages as well as people 2012-02-10 00:08:23 -08:00
friendica
2f2e331c33 bug #274 2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6 add render_location hook to both sets of conversations 2012-02-09 18:09:28 -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
ec26f88be9 render_location hook 2012-02-09 15:02:59 -08:00
friendica
171249966e add tag notifications to enotify 2012-02-09 14:06:17 -08:00
friendica
c506bb42a9 :coffee extended smilie 2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930 beer smilie 2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5 don't link tags enclosed inside Diaspora links 2012-02-07 02:16:28 -08:00
friendica
2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica
3d099bd99a beer 2012-02-06 01:08:00 -08:00
friendica
4cf6bd5469 do an optimise after an expunge 2012-02-02 18:02:08 -08:00
friendica
9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica
86c0eac27d transport for email contacts phase II 2012-01-31 20:03:46 -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
d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica
5161be67e9 logging of manage identities 2012-01-27 12:56:36 -08:00
friendica
94b9e9ce6d for people whose DB's are not updating 2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica
8fe5168259 restore diaspora test mode 2012-01-26 20:46:42 -08:00
friendica
167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica
10f768630b D* event formatting 2012-01-25 15:16:43 -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
dae0c1ded2 more robust cache api handling (was throwing errors on occasion) 2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3 backtrace errant input to base64url_decode 2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9 bug #254 2012-01-24 16:23:30 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
1f074cb44c shaka, slackr theme 2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2 nav: fix "See all notifications" 2012-01-23 09:23:37 +01:00
friendica
11aa83742e more logging of D* photo transactions 2012-01-22 15:25:29 -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
b5ec475906 bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC 2012-01-21 14:07:28 -08: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
d840943621 use reltoabs - primarily for github activity feeds 2012-01-17 16:30:32 -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
4b6990e1ff modularise successful authentication 2012-01-12 15:46:39 -08:00
friendica
aa1c28cf39 fine tuning diaspora markdown to bbcode 2012-01-11 22:49:17 -08:00
friendica
6573c94d6c modified item_photo_menu hook 2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c fix D* links+text smushed together 2012-01-11 14:03:27 -08:00
friendica
cf7008e575 post preview to loozah 2012-01-10 17:47:11 -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
3bdcb52471 markdown bug is Diaspora's. We can't fix it. 2012-01-08 17:20:03 -08:00
friendica
df0f7ef560 make network_to_name extensible 2012-01-08 02:08:20 -08:00
friendica
977a49ad93 fix images with links going to diaspora, the D* markdown processor changed and these are no longer working. 2012-01-08 00:57:36 -08:00
friendica
358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -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
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +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
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
d0b743529d support auto-friend page types for Diaspora 2012-01-04 14:30:25 -08:00
friendica
c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica
48a5a2484e new smiley 2012-01-04 00:04:19 -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
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica
184230e068 check count before foreach 2012-01-02 22:58:09 -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
1fbffc76b1 text: "turn off" logger() if module is "install" 2012-01-02 20:11:06 +01:00
Fabio Comuni
85fbdb00ac dba: leave unconnected if $server and $user are not defined 2012-01-02 20:10:23 +01:00
Fabio Comuni
f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica
0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica
3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica
a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica
da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -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
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
949d3f0ff1 preparation for 3rd generation email contacts 2011-12-23 01:38:06 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni
0dce36bdbc Merge remote-tracking branch 'friendica/master' 2011-12-22 16:35:58 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
friendica
dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
Fabio Comuni
7f2070ca91 Merge remote-tracking branch 'friendica/master' 2011-12-21 17:37:35 +01:00
friendica
7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
Fabio Comuni
ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica
63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b more data checking, cleans up some infrequent php errors 2011-12-19 16:51:57 -08:00
friendica
7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 2011-12-19 13:51:55 -08:00
Fabio Comuni
2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni
a6f3b58293 config: set/get arrays with pconfig 2011-12-19 18:01:38 +01:00
friendica
ad54a91d4d poco_load aborting after debug statement 2011-12-19 00:40:00 -08:00
friendica
dc46a01cd4 suggest query for no friends messed up 2011-12-18 13:03:20 -08:00
friendica
e6b538c046 add webfinger addr to gcontact for friend "connect" links 2011-12-18 00:50:17 -08:00
friendica
22d59350e9 improve the email regex a bit more 2011-12-16 14:31:39 -08:00
friendica
690b3f57b7 bug 241 - valid emails may contain + on lhs 2011-12-16 14:06:50 -08:00
friendica
193435e980 default suggestions not being collected properly 2011-12-15 13:52:52 -08:00
friendica
cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica
50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica
834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica
5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -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
be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica
adbc84c48e maintain backward compatibility with old PMs 2011-12-05 14:06:41 -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
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica
fb01d8bec5 fix incorrect default author 2011-12-04 03:54:40 -08:00
friendica
fb437a874e typo 2011-12-04 03:50:26 -08:00
friendica
f6dd834284 fix author-name when missing on comments 2011-12-04 03:45:09 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
29b5d398fd everybody group gets id 0 2011-11-30 23:01:42 -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
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -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
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica
1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica
4b95e8ebe8 rework the liveupdate fixes - what a mess 2011-11-24 18:26:06 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -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
aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica
191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica
72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica
6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica
fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
friendica
6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
Fabio Comuni
590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01: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
Fabio Comuni
844a36e2b6 Merge remote-tracking branch 'friendica/master' 2011-11-17 13:40:27 +01:00
Fabio Comuni
02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
friendica
c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
fabrixxm
d0bf9d371c Merge pull request #6 from fabrixxm/master
small fix
2011-11-16 02:30:38 -08:00
Fabio Comuni
ef8b5bc682 fix localize item tag 2011-11-16 11:27:20 +01:00
friendica
7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica
485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
Fabio Comuni
962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
friendica
973620a9e6 translate vimeo and youtube bbcode to naked links so D* will oembed them again 2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
friendica
02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -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
friendica
ab6bf767df Merge pull request #3 from fabrixxm/master
fix for #191 and some other
2011-11-12 04:06:14 -08:00
Friendika
d23867f5a0 incorrect total use for get_feedtags 2011-11-12 02:53:53 -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
02f21fb74c some testbubble fixes 2011-11-10 19:53:13 -08:00
Friendika
199da623ff testbubble showing post jot-tools on edit page - these are not changed so should not be visible 2011-11-10 18:20:25 -08:00
Friendika
83e55cf9f4 bbcode list styles 2011-11-09 19:32:54 -08:00
Friendika
15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika
05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
Friendika
20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika
02a1fdacd7 strip duplicate code blocks bb2d* 2011-11-08 15:38:06 -08:00
fabrixxm
eeec29c6be Merge pull request #2 from fabrixxm/master
Oauth1 support in API
2011-11-08 00:18:37 -08:00
Friendika
9fabdbf2c9 D* scaled images not containing link to original size 2011-11-07 20:41:12 -08:00
Friendika
99a548d4ac fix friend suggest link in testbubble 2011-11-07 17:25:40 -08:00
Fabio Comuni
00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni
41cbd84a74 api: login with oauth 2011-11-07 17:36:58 +01:00
Fabio Comuni
10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika
327105a4ea try and fix diaspora multiple items queued issue 2011-11-06 16:48:13 -08:00
Friendika
f07c0b2cfb implement signed_retractions 2011-11-05 14:45:29 -07:00
Friendika
a203820efe reduce polling load 2011-11-04 15:21:46 -07:00
Friendika
0130052b2c bbcode lists 2011-11-03 21:30:01 -07:00
Friendika
014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika
bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -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
0975ea8610 add attachments to Diaspora posts 2011-11-01 17:30:52 -07:00
Friendika
573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika
ae7425dadb don't send diaspora profile updates in batch mode 2011-11-01 14:24:56 -07:00
Friendika
05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika
f4518c646a fixes to diaspora profiles, batch mode duplicates, social graph table name 2011-11-01 00:50:41 -07:00
Friendika
e28b143fb6 perform poco_load 2011-10-31 20:54:24 -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
e4dd2a5a9a begin the name change 2011-10-28 17:29:13 -07:00
Friendika
b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika
2914ffb396 log scale_diaspora_image 2011-10-28 04:35:10 -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
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
Fabio Comuni
ff7fc68382 oauthapi: authorize app 2011-10-26 17:15:36 +02:00
Fabio Comuni
dc212de960 Merge remote-tracking branch 'friendika/master' 2011-10-26 12:15:38 +02:00
Friendika
6d6136cdb5 fix diaspora cache 2011-10-25 20:30:01 -07:00
Friendika
d9f64deda0 sql error 2011-10-25 20:05:21 -07:00
Friendika
72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Fabio Comuni
afce790e56 oembed: wrap in iframe only html from remote service 2011-10-25 14:59:31 +02:00
Friendika
ae12074337 fix tag import for tag owner 2011-10-24 23:55:29 -07:00
Friendika
318f179408 D* formatting updates [code/blockquote] 2011-10-24 21:29:57 -07:00
Friendika
b20afbc9e4 @ tags becoming # tags during atom transit 2011-10-24 20:33:54 -07:00
Friendika
1a7badb405 use iframe for oembed - untrusted content 2011-10-24 20:10:46 -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
2905df527f fix oembed video thumb display ratio 2011-10-24 17:31:14 +02:00
Fabio Comuni
40ea48bdab fix vimeo oembed bbcode regexp 2011-10-24 17:28:48 +02:00
Fabio Comuni
75d4f33233 move html for oembeded videos in template. fix oembed discovery 2011-10-24 17:28:28 +02:00
Fabio Comuni
ac474cf53c try to use oembed on vimeo tag 2011-10-24 14:39:39 +02: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
Fabio Comuni
306036c626 cache api 2011-10-24 13:02:38 +02:00
Friendika
fe2c8a1845 Merge branch 'master' into tag 2011-10-23 19:06:04 -07:00
Friendika
3512adda33 never enough comments 2011-10-23 19:05:32 -07:00
Friendika
6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika
0b2c5bf8f5 fix queue_fns 2011-10-23 01:54:51 -07:00
Friendika
7cbb69d87f tagging 2011-10-23 00:24:37 -07:00
Friendika
0ada550a02 queue indexes 2011-10-22 01:29:26 -07:00
fabrixxm
a06c9768be Merge pull request #34 from fabrixxm/master
fixs to oembed
2011-10-21 07:32:12 -07:00
Fabio Comuni
6769436f3b oembed. fix html2bbcode when oembed html contains span and utf8 chars 2011-10-21 16:26:29 +02:00
Friendika
6e76c86ad2 queue api + queue limits 2011-10-21 03:33:34 -07:00
Friendika
d1833cabf6 fix hex2bin for empty input 2011-10-20 19:11:34 -07:00
Friendika
01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Fabio Comuni
b06588ffa1 Initial work adding oauth to api 2011-10-20 15:57:35 +02:00
Friendika
da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika
96c0598737 diaspora_reshare - even more logging 2011-10-20 03:56:10 -07:00
Friendika
796056f810 provide link to missing d* images 2011-10-20 02:21:57 -07:00
Friendika
852ece39f4 more reshare logging to see what's going on 2011-10-20 02:07:38 -07:00
Friendika
33af8b0e20 diaspora_reshare - another try 2011-10-20 01:16:03 -07:00
Friendika
df996a8b5e fix for errant top-level posts from feeds 2011-10-19 21:54:33 -07:00
Friendika
c4179d989f more debug reshare 2011-10-19 21:34:48 -07:00
Friendika
10b2661176 suppress blank diaspora messages which are awaiting a photo that hasn't arrived 2011-10-19 15:18:41 -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
1148cbab22 fix img link format diaspora share/asphoto 2011-10-19 00:29:43 -07:00
Friendika
9043e704f8 diaspora reshares 2011-10-18 15:56:35 -07:00
Friendika
32808a934d string update 2011-10-18 04:28:36 -07:00
Friendika
fb5bddb98f a few issues with diaspora_profile 2011-10-18 01:12:51 -07:00
Friendika
42a9817350 "cubbi.es" 2011-10-17 17:39:25 -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
de44072172 works on login form 2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Friendika
5dcc10a5d9 working on long-term solution to relay issue 2011-10-15 03:26:37 -07:00
Friendika
af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika
05e26e4895 handle diaspora profile update message 2011-10-13 18:32:02 -07:00
Friendika
89c771a26e remove queued items for contact when removing contact 2011-10-13 15:39:05 -07:00
Friendika
4eae1e5d8a don't propagate deletions for other people's stuff 2011-10-13 15:32:43 -07:00
Friendika
2911bf9434 sql issue item_store 2011-10-13 01:00:06 -07:00
Friendika
3db43d5a39 storage race condition 2011-10-12 02:21:18 -07:00
Friendika
3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do 2011-10-11 20:38:09 -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
e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' 2011-10-10 16:48:38 +02:00
Friendika
3174847de8 bug #177 - birthday month on profile incorrect if October or later and no year 2011-10-10 01:03:34 -07:00
Friendika
1d05c564d4 missing arg to diaspora_transmit from share/unshare 2011-10-07 15:49:41 -07:00
Devlon Duthie
f5fc8dabe5 Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme 2011-10-07 01:25:08 -05:00
Friendika
2802c142cb local_deliver testing 2011-10-06 19:10:57 -07:00
Friendika
53efeb8d1f local deliver 1 2011-10-06 17:27:37 -07:00
Friendika
ce11d231b8 use strpos instead of strstr, faster 2011-10-05 21:04:53 -07:00
Friendika
d0bef869db ensure D* photos only attached once 2011-10-05 21:02:00 -07:00
Friendika
4c0ee7f41f bug 173 2011-10-05 20:48:00 -07:00
Friendika
7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika
7df6cb850e Merge branch 'pull' 2011-10-05 15:37:17 -07:00
Friendika
b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Tobias Diekershoff
feaba3d300 point Diaspora* to the foundation homepage instead of joindiaspora.com 2011-10-05 21:01:48 +02:00
Friendika
924d419378 added prepare_body hooks 2011-10-05 02:35:25 -07:00
Friendika
6c521017f5 document backward compat issue 2011-10-04 22:03:57 -07:00
Friendika
ab50521971 yikes 2011-10-04 22:00:45 -07:00
Friendika
7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
Friendika
aeb83fa063 document multi-pass mode on consume_feed 2011-10-04 04:38:58 -07:00
Friendika
07b09300a9 improve feed import performance 2011-10-04 03:06:34 -07:00
Friendika
c6ac438735 item_store: prevent storing a duplicate item with same uri+uid 2011-10-03 06:04:17 -07:00
Fabio Comuni
4d5580ab77 fix typo 2011-10-03 09:38:58 +02:00
Fabio Comuni
2465b3274a Merge remote-tracking branch 'friendika/master' 2011-10-03 08:13:40 +02:00
Friendika
8f9656da92 basic support for AS friend requests 2011-10-02 16:18:01 -07:00
Friendika
7c1968907d attack of the zombie orphans 2011-10-02 05:32:05 -07:00
Fabio Comuni
60e0f79b9f Merge remote-tracking branch 'friendika/master' 2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29 fix star icon viewing profile page as unlogged user 2011-09-30 14:31:01 +02:00
Friendika
52557b011d possible sql errors 2011-09-29 21:56:44 -07:00
Friendika
097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Friendika
c1221cc052 add display_item hook to 'search|new' message display 2011-09-29 15:52:31 -07:00
Friendika
ffa3b67365 fix nav-selected duepuntozero 2011-09-28 23:10:23 -07:00
Friendika
a1786cbf61 fixes for statusnet/identi.ca empty vcard page - which appears to be deprecated. Scrape the feed for everything we used to get from the vcard. 2011-09-28 04:35:44 -07:00
Fabio Comuni
41617ee987 fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme 2011-09-28 10:30:32 +02:00
Fabio Comuni
c120cc8ea9 added missing "delete selected items" link 2011-09-28 09:32:53 +02:00
Fabio Comuni
dccd2da356 Merge remote-tracking branch 'friendika/master' 2011-09-28 09:27:59 +02:00
Friendika
4f9c072d66 requeue deliveries on 503 errors which have 'retry-after' headers 2011-09-27 19:27:47 -07:00
Fabio Comuni
e986fc3e30 quattro: actions in wall_item
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Friendika
25ac93f44d Merge pull request #3 from fabrixxm/master
Works on UI
2011-09-27 01:04:54 -07:00
Friendika
8d3910c78c sql error diaspora re-queue 2011-09-27 00:58:59 -07:00
Fabio Comuni
e9638b6980 Adds theme info file to define 'parent' theme from where load tpl files 2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Friendika
e04d9b8646 bug #165 2011-09-26 23:39:47 -07:00
Friendika
ec16525c86 expire expired accounts from poller 2011-09-26 05:43:22 -07:00
Fabio Comuni
8d93eefea8 remove global $lang var in templates. can't work as intended 2011-09-26 12:18:39 +02:00
Fabio Comuni
968e7bb3b1 Fixes for testbubble 2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
116fc7fcf2 zot endpoint 2011-09-26 02:25:43 -07:00
Devlon Duthie
3426ce5f94 Merge remote-tracking branch 'upstream/master' 2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3 really commiting files this time, still getting the hang of git.
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Friendika
6a9e22550d . 2011-09-24 05:45:34 -07:00
Friendika
3a2bf8ab7c w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator 2011-09-23 03:12:31 -07:00
Friendika
d6b446d63f starting the big delivery shakeup 2011-09-22 04:11:39 -07:00
Friendika
542aa22eb9 provide ability to unset session language 2011-09-21 16:00:17 -07:00
Friendika
030e1e82c3 finish up ability to switch languages without function collision 2011-09-21 15:37:16 -07:00
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika
11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika
9115e9c90b no need to scrape Twitter profile photo from page - it's no longer there. 2011-09-20 18:07:33 -07:00
Friendika
8294dde936 typo in Twitter probe update 2011-09-20 17:59:18 -07:00
Friendika
38444aedd7 improvements to Twitter probe 2011-09-20 17:56:44 -07:00
Friendika
1c8e89bd03 social bookmark API, oexchange enhancements 2011-09-20 16:31:45 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika
9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika
c2ccb78869 template escapes 2011-09-19 19:51:14 -07:00
Friendika
63277b57fc template escapes 2011-09-19 19:46:18 -07:00
Friendika
97deaa3118 resume strict verification of Diaspora messages 2011-09-19 03:36:41 -07:00
Friendika
fd18b42a5a Check all keys before use 2011-09-19 03:30:59 -07:00
Friendika
2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika
48ee3fa3b9 build diaspora public (batch) message 2011-09-18 20:17:44 -07:00
Friendika
5b3f645939 account expiration structures 2011-09-18 19:53:45 -07:00
Friendika
8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika
e2e29b2dea only header encode if necessary 2011-09-18 17:16:02 -07:00
Friendika
5899c9f406 bug #157 - allow deleted group to be revived, but warn of side effects 2011-09-18 06:20:18 -07:00
Friendika
da05ef2ae4 rfc2047 encode notification email headers 2011-09-18 04:34:17 -07:00
Friendika
309df84172 again fix bbcode image sizes 2011-09-18 00:19:19 -07:00
Friendika
5f4ab62fe3 fix bbcode image size 2011-09-18 00:16:18 -07:00
Friendika
ce77c7287e show real profile link location on hover 2011-09-16 15:40:34 -07:00
Friendika
6c4ad7df3a public D* post fix 2011-09-16 14:57:41 -07:00
Friendika
d7243be2ea log the D* publc messages 2011-09-16 14:51:25 -07:00
Friendika
5a6a3cab8e may fix diaspora send 2011-09-16 14:46:04 -07:00
Friendika
9b5d5eca07 Merge branch 'friday' 2011-09-16 06:51:33 -07:00
Friendika
9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Fabio Comuni
6b6f45f9f1 quattro: initial style of conversations 2011-09-16 12:51:14 +02:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika
80f94bb12b federation friday update 2011-09-15 17:47:16 -07:00
Fabio Comuni
d9bce6b852 Fix issue 151 2011-09-15 11:05:09 +02:00
Friendika
cdf2fe859f don't escape underscore within links going to diaspora 2011-09-14 21:35:13 -07:00
Friendika
1778e4a315 bloody ampersands 2011-09-14 20:47:49 -07:00
Friendika
5c0e135fe9 diaspora protocol changes 2011-09-14 19:33:42 -07:00
Friendika
1248a561e1 group_public_members sql query typo 2011-09-13 15:26:47 -07:00
Friendika
43da1429cc import image sizes from html source 2011-09-13 04:53:17 -07:00
Friendika
08fc3e91b6 bug #148 email subscription issue 2011-09-12 22:24:36 -07:00
Friendika
ff572487a3 smilie hook 2011-09-12 03:21:39 -07:00
Friendika
17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika
7a06c7c3bf bug #146 - br HTML tags showing up in events 2011-09-11 15:44:07 -07:00
Friendika
0e441fe196 bug #147 comments not working on private notes page 2011-09-11 15:09:57 -07:00
Friendika
0c0a604396 block imap function from spitting out errors to the page 2011-09-10 03:14:00 -07:00
Friendika
ebb9af8946 One day we'll have ignored all purely numeric hashtags like #33. Found yet another edge case. 2011-09-09 17:35:26 -07:00
Friendika
d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika
f5c9de19d5 network insecure warnings on feeds 2011-09-09 01:37:46 -07:00
Friendika
1e8b3278b0 share not available in display module, as no editor window to paste into 2011-09-08 22:07:16 -07:00
Friendika
3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
49ffd30e1c global lang array in templates 2011-09-08 14:09:45 +02:00
Friendika
fdd372a798 speed up friend requests and avoid parse errors by using hcard address instead of profile url 2011-09-07 22:49:58 -07:00
Friendika
a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni
20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika
e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika
260d652168 scrape_url - use feed url if no name can be found 2011-09-04 05:07:25 -07:00
Friendika
1d01b3a088 Merge branch 'pull' 2011-09-04 00:51:42 -07:00
Friendika
9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika
c0a2cc3e98 diaspora has no timezone - use UTC for events 2011-09-03 07:40:05 -07:00
Friendika
59a6a04e26 format events for diaspora 2011-09-03 07:13:12 -07:00
Friendika
c8f61ef890 no plink on imported D* posts 2011-09-03 05:23:36 -07:00
Friendika
b026dcb860 match bbcode multiline 2011-09-03 04:36:45 -07:00
Friendika
93b9d71377 completely enclose ~f hashtags so they don't get hijacked by D* 2011-09-02 05:13:38 -07:00
Friendika
1621630b06 login_hook 2011-09-01 06:29:29 -07:00
Friendika
0cfc8570d2 save plink for diaspora items so likes will point to right post 2011-08-31 21:46:37 -07:00
Fabio Comuni
8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni
5ce6f893a6 Apps popup menu in navbar 2011-08-31 16:18:03 +02:00
Friendika
c60d45752d translate D* images (markdown) before links, they overlap and conflict 2011-08-30 23:24:45 -07:00
Friendika
f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika
b11a0efff1 This *might* fix Diaspora @ tags - or it might not. 2011-08-30 20:20:17 -07:00
Friendika
f0a4a6af61 relayed likes did not verify 2011-08-30 19:20:56 -07:00
Friendika
f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
0f1bc6e957 log every possible diaspora return for posts and comments 2011-08-29 22:50:41 -07:00
Friendika
454882812e wrong time format string, 24hr clock 2011-08-29 18:01:59 -07:00
Friendika
7e79b140f0 don't deliver on first pass if already queued 2011-08-29 17:52:31 -07:00
Friendika
177e0e15d7 allow zero delivery interval on dedicated servers 2011-08-29 00:59:44 -07:00
Friendika
391330d95f better handling of relayed Diaspora comments 2011-08-29 00:51:08 -07:00
Friendika
bfc708e07b logging on notifier 2011-08-28 23:05:06 -07:00
Friendika
88e6e4699a Merge branch 'pull' 2011-08-28 23:01:42 -07:00
Friendika
51615f57ac flag top level post 2011-08-28 23:00:45 -07:00
Friendika
b61d535f81 remove item from queue 2011-08-28 22:59:49 -07:00
Friendika
846c4cea7c implement delivery queue in case notifier gets killed 2011-08-28 21:41:42 -07:00
Friendika
f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika
030dcbd467 Merge branch 'pull' 2011-08-28 05:05:32 -07:00
Friendika
4572f32603 cleanup 2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b allow comment relaying for comments which were never Diaspora signed 2011-08-28 05:00:30 -07:00
Friendika
ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
fabrixxm
3bbdbee87c Merge pull request #163 from fabrixxm/master
API and IT translation: smal fixes
2011-08-27 00:10:25 -07:00
Friendika
721db93e84 check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up 2011-08-26 17:52:24 -07:00
Friendika
144f241c5d fix bad embeds 2011-08-26 15:21:21 -07:00
fabrixxm
fcf45db075 API: fix friends profile, statuses etc 2011-08-26 16:35:51 +02:00
Friendika
506853adcd break up delivery into per-person processes 2011-08-26 07:29:22 -07:00
Friendika
1861dc1fae don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error 2011-08-26 01:32:22 -07:00
Friendika
a4739aef91 more logging diaspora pubdeliver 2011-08-25 20:35:55 -07:00
Friendika
c15c53d307 one more little tweak to linkificator 2011-08-25 20:12:56 -07:00
Friendika
5eb08d43b6 tweak to bbcode linkificator 2011-08-25 20:09:32 -07:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
1b33ba6587 third attempt to get rid of this stupid warning 2011-08-25 06:01:40 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Friendika
8f6ae2b660 missing salmon key? report it. 2011-08-24 20:40:08 -07:00
Friendika
d6f9e0e2a4 change the way public feeds work just to fix statusnet's bug, because they won't 2011-08-24 05:58:31 -07:00
Friendika
a775474dff cleaned up the conditions on when to and when not to relay. 2011-08-24 04:42:28 -07:00