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 |
|
Michael Vogel
|
e9d7f85297
|
network: Small changes
|
2012-07-07 20:40:15 +02: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 |
|
Michael Vogel
|
dafc84390d
|
Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...)
|
2012-07-05 23:36:00 +02: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 |
|
Michael Vogel
|
bcca817b9a
|
Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr.
|
2012-06-30 09:25:22 +02:00 |
|
Michael Vogel
|
65268d25e6
|
Merge remote branch 'upstream/master'
Conflicts:
include/items.php
|
2012-06-29 21:43:49 +02:00 |
|
Michael Vogel
|
52569e536e
|
Tests considering removing of the title
|
2012-06-29 21:40:54 +02: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 |
|