Commit graph

2216 commits

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