Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-23 20:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8920 commits 7 branches 31 tags 160 MiB
Commit graph

3038 commits

Author SHA1 Message Date
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