Fabrixxm
|
0fb08e3642
|
nav: pass $baseurl to template
|
2012-06-29 05:29:29 -04:00 |
|
friendica
|
43036bee98
|
wrong column name (- vs _)
|
2012-06-28 21:32:49 -07:00 |
|
friendica
|
1830ecc9ba
|
remote_self feeds are not private
|
2012-06-28 18:52:49 -07:00 |
|
friendica
|
a3edbf7e5d
|
create third privacy state - public post but not searchable or publicly visible
|
2012-06-28 17:43:29 -07:00 |
|
friendica
|
43d3721fa9
|
css smiley class
|
2012-06-28 16:42:40 -07:00 |
|
friendica
|
d7f35c81db
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-28 16:05:28 -07:00 |
|
friendica
|
de93c61e0d
|
remove titles in ostatus even when edited date differs from created date
|
2012-06-28 16:04:00 -07:00 |
|
Zach Prezkuta
|
cd9ce0ecb3
|
fix logic for nested lists--should be OR, not AND
|
2012-06-27 21:21:26 -06:00 |
|
Sebastian Egbers
|
587b081a38
|
moved api direct message formating to own function.
added same formating to direct reply message, when posting a new message.
|
2012-06-26 08:54:01 +02:00 |
|
Sebastian Egbers
|
0f0fb2e2f3
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-06-26 08:33:41 +02:00 |
|
friendica
|
a4b407eb54
|
stray s
|
2012-06-25 22:01:32 -07:00 |
|
friendica
|
d32d0e2154
|
typos
|
2012-06-25 21:39:07 -07:00 |
|
friendica
|
78ede4744f
|
add event titles to discovered birthday events
|
2012-06-25 21:37:38 -07:00 |
|
friendica
|
0f0ffce1b6
|
change required doco
|
2012-06-25 21:27:34 -07:00 |
|
friendica
|
359a98cd22
|
change event behaviour so that title is required but description is not
|
2012-06-25 21:20:08 -07:00 |
|
friendica
|
fbaca4b742
|
event summary/title
|
2012-06-25 20:55:27 -07:00 |
|
friendica
|
53f0aee82d
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-25 18:16:55 -07:00 |
|
friendica
|
f1991a5952
|
propagate remote deletes
|
2012-06-25 18:15:56 -07:00 |
|
Zach Prezkuta
|
5773241537
|
add some debug logging
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
c0c50ece0f
|
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
8bb7ab88fb
|
Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
|
2012-06-25 19:03:03 -06:00 |
|
friendica
|
f0b41709eb
|
improve remote delete forwarding
|
2012-06-25 17:45:33 -07:00 |
|
friendica
|
fad2679c7e
|
Merge https://github.com/friendica/friendica into pull
Conflicts:
include/bbcode.php
|
2012-06-25 16:05:42 -07:00 |
|
friendica
|
b044cd922d
|
typos in bbcode, add service class restrictions to jot uploads
|
2012-06-25 16:03:46 -07:00 |
|
Simon L'nu
|
939ebe16f8
|
fix typo and syntax error
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-06-25 18:49:36 -04:00 |
|
friendica
|
cb450d3365
|
Merge pull request #360 from fermionic/more-nested-lists
allow nested [ol] and [ul] lists too
|
2012-06-25 14:20:16 -07:00 |
|
Zach Prezkuta
|
fa7e803f73
|
fix check for parent of StatusNet API post
|
2012-06-25 08:26:12 -06:00 |
|
Zach Prezkuta
|
4293de7554
|
allow nested [ol] and [ul] lists too
|
2012-06-25 08:26:00 -06:00 |
|
Sebastian Egbers
|
8c251aebc7
|
fixed direct message reply in api call.
|
2012-06-25 16:25:34 +02:00 |
|
Sebastian Egbers
|
af1d4bb632
|
modified api message reply to set title to conversion title, when replying.
|
2012-06-25 15:53:56 +02:00 |
|
Sebastian Egbers
|
020deedd7c
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-06-25 13:59:39 +02:00 |
|
friendica
|
7ea5917bf7
|
more service class functionality
|
2012-06-25 03:25:06 -07:00 |
|
friendica
|
35a098e0dc
|
service limits for photo uploads
|
2012-06-25 01:37:44 -07:00 |
|
friendica
|
ad6c82bdea
|
implement "follow" service limits
|
2012-06-24 22:23:17 -07:00 |
|
friendica
|
c464bc494c
|
add like/dislike to profiles
|
2012-06-24 21:16:55 -07:00 |
|
friendica
|
7f3813e9b0
|
service class basics
|
2012-06-24 00:56:27 -07:00 |
|
fermionic
|
49ecf58163
|
Merge pull request #357 from fermionic/fix-relayable-signature-handle
ok now I'm just making silly mistakes--take out premature function locki...
|
2012-06-23 21:29:52 -07:00 |
|
Zach Prezkuta
|
59ebe6f111
|
ok now I'm just making silly mistakes--take out premature function locking code
|
2012-06-23 22:28:28 -06:00 |
|
friendica
|
92a997365f
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-23 21:11:41 -07:00 |
|
friendica
|
1574396d04
|
sort out some "like" issues
|
2012-06-23 21:11:18 -07:00 |
|
fermionic
|
642880f89a
|
Merge pull request #356 from fermionic/fix-relayable-signature-handle
use author handle instead of sender handle
|
2012-06-23 21:08:43 -07:00 |
|
Zach Prezkuta
|
0877c5b687
|
use author handle instead of sender handle
|
2012-06-23 22:04:20 -06:00 |
|
Zach Prezkuta
|
5d2eed3517
|
allow bare URLS to make it through to Diaspora
|
2012-06-23 22:02:08 -06:00 |
|
Zach Prezkuta
|
1f96839674
|
small optimization
|
2012-06-23 20:01:29 -06:00 |
|
Zach Prezkuta
|
4ef33ac6eb
|
fix BB-to-Diaspora list formatting
|
2012-06-23 19:57:59 -06:00 |
|
Max Weller
|
cbf1cab0da
|
Merge remote-tracking branch 'sebastian/master'
|
2012-06-23 22:59:03 +02:00 |
|
Max Weller
|
e3c36dfd1d
|
add reliable way to get server version
|
2012-06-23 22:52:50 +02:00 |
|
Max Weller
|
11b6beae06
|
make it selectable
|
2012-06-23 22:39:11 +02:00 |
|
Max Weller
|
111ace5abd
|
I want HTML code!
|
2012-06-23 22:35:43 +02:00 |
|
Max Weller
|
9d462c6b6a
|
new param getUserObjects to avoid retransmitting the whole user info objects
|
2012-06-23 19:38:15 +02:00 |
|
Max Weller
|
2c992c5969
|
bugfix
|
2012-06-23 19:35:01 +02:00 |
|
Max Weller
|
f45c881815
|
changes on api_direct_messages_box to allow to retrieve conversations and all messages
|
2012-06-23 19:29:58 +02:00 |
|
Max Weller
|
d8a376666c
|
modified direct_messages
|
2012-06-23 19:21:48 +02:00 |
|
Zach Prezkuta
|
90f8454190
|
allow linking to Diaspora's scaled-down images
|
2012-06-23 11:02:15 -06:00 |
|
friendica
|
7a346bc756
|
this is going to take some more debug before it can be roller out
|
2012-06-23 07:43:56 -07:00 |
|
friendica
|
63141c73d8
|
debugging
|
2012-06-23 07:26:45 -07:00 |
|
friendica
|
a132eda2cf
|
cokmment likes not propagating
|
2012-06-23 06:41:37 -07:00 |
|
friendica
|
1ba0d73a9a
|
make feeds work with comment likes/dislikes
|
2012-06-23 06:13:11 -07:00 |
|
friendica
|
f55e8e831c
|
typo
|
2012-06-23 06:04:56 -07:00 |
|
friendica
|
49360b0a64
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-23 05:47:31 -07:00 |
|
friendica
|
22ca358a8c
|
like comments
|
2012-06-23 05:46:15 -07:00 |
|
friendica
|
7614d35cad
|
liking comments backend
|
2012-06-23 04:44:48 -07:00 |
|
Michael Vogel
|
a81af2e042
|
Merge remote branch 'upstream/master'
Conflicts:
include/bb2diaspora.php
|
2012-06-23 12:50:00 +02:00 |
|
Michael Vogel
|
7a4ad4564d
|
Diaspora: Messages are now looking better
|
2012-06-23 12:42:01 +02:00 |
|
Zach Prezkuta
|
9c9e727042
|
cleanup lists and more comment signature stuff
|
2012-06-22 20:45:37 -06:00 |
|
Zach Prezkuta
|
7b219649a4
|
expand support for BB code-to-Diaspora conversion
|
2012-06-22 20:45:37 -06:00 |
|
Vasudev Kamath
|
6e4760dd9c
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-06-23 08:11:35 +05:30 |
|
Sebastian Egbers
|
cd25c3b5dd
|
added replyto and subject to direct messages.
|
2012-06-22 14:54:31 +02:00 |
|
Sebastian Egbers
|
c14270ac64
|
modified conversion to use x function for parameter checking.
|
2012-06-22 13:35:36 +02:00 |
|
Max Weller
|
6fe8a13b64
|
Added ORDER BY clause for conversation view
|
2012-06-21 12:55:03 +02:00 |
|
Max Weller
|
0f5a6bfcdb
|
Added statuses/show parameter ?conversation=true
|
2012-06-21 10:53:48 +02:00 |
|
friendica
|
53c9ea7606
|
show last.fm source in username
|
2012-06-20 23:04:55 -07:00 |
|
friendica
|
91a3a2d551
|
follow last.fm scrobbles
|
2012-06-20 22:59:01 -07:00 |
|
Zach Prezkuta
|
73c6f40ebc
|
create new signed text for relayables right when relaying them
|
2012-06-20 20:52:09 -06:00 |
|
friendica
|
bf0ab10caf
|
undefined unmark_for_death
|
2012-06-20 16:35:49 -07:00 |
|
friendica
|
0d0f129d04
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-20 05:06:20 -07:00 |
|
friendica
|
f0db196288
|
iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources
|
2012-06-20 05:04:51 -07:00 |
|
friendica
|
961c633773
|
Merge pull request #344 from ridcully/master
exclude_replies for twitter api
|
2012-06-20 01:01:55 -07:00 |
|
friendica
|
b3bf48782f
|
allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed.
|
2012-06-19 20:59:22 -07:00 |
|
friendica
|
1dd33770ed
|
plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook
|
2012-06-19 18:26:40 -07:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
ff2f7dfeef
|
Added App::get_cached_avatar_image usage on conversation wall of Normal View
|
2012-06-19 16:05:39 -07:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
6df74b8cd9
|
Now using App::get_cached_avatar_image for navigation bar
|
2012-06-19 16:05:39 -07:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
ac50c9e84d
|
Beginning to use App::get_cached_avatar_image for loading profile images in conversations
|
2012-06-19 16:05:38 -07:00 |
|
Sebastian Egbers
|
eab3938471
|
added exclude_replies option to api call statuses/user_timeline.
|
2012-06-19 16:27:23 +02:00 |
|
Sebastian Egbers
|
43532b7414
|
added exclude_replies option to api call statuses/home_timeline.
|
2012-06-19 16:15:19 +02:00 |
|
friendica
|
dbceef04e8
|
exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there
|
2012-06-18 20:21:54 -07:00 |
|
Zach Prezkuta
|
7cd516e34f
|
fix some whitespace issues
|
2012-06-18 21:06:54 -06:00 |
|
Zach Prezkuta
|
42fa47e8f7
|
rotate uploaded images if an EXIF rotation is present
|
2012-06-18 21:02:11 -06:00 |
|
friendica
|
341a5a2672
|
public forum author using private posting, correct the comment permissions downstream.
|
2012-06-18 17:19:56 -07:00 |
|
Thomas Willingham
|
371bdfb19d
|
Typo breaking tag notifications
|
2012-06-18 22:00:18 +01:00 |
|
Michael
|
6eaca19f41
|
Merge branch 'master' of github.com:annando/friendica
Conflicts:
include/oembed.php
|
2012-06-18 08:51:12 +02:00 |
|
Michael
|
d53414a333
|
OEmbed: Don't output the width of images
|
2012-06-18 08:49:35 +02:00 |
|
Michael Vogel
|
cc56f33b80
|
New option in the bbcode parser to disable oembed.
|
2012-06-18 01:29:08 +02:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
8af9fe8df7
|
Added missing backticks to navigation bar query
|
2012-06-17 23:39:28 +03:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
b0021a4637
|
Enabled Profile photo revisions to be displayed in navigation bar
|
2012-06-17 23:22:37 +03:00 |
|
Michael Vogel
|
3968e77f9e
|
New function to convert bbcode to markdown.
|
2012-06-17 19:49:05 +02:00 |
|
friendica
|
7c2d27e275
|
rev update
|
2012-06-16 17:29:42 -07:00 |
|
Hauke Zuehl
|
cc7d849ce3
|
Merge remote branch 'upstream/master'
|
2012-06-16 19:49:04 +02:00 |
|
fermionic
|
950dacbbdd
|
Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
Diaspora dont check more signatures than diaspora does
|
2012-06-16 09:49:19 -07:00 |
|
Zach Prezkuta
|
3132ed2979
|
more cleanup
|
2012-06-16 10:45:26 -06:00 |
|
Zach Prezkuta
|
577cfdd314
|
some cleanup of obsolete code
|
2012-06-16 10:41:25 -06:00 |
|
Zach Prezkuta
|
0ff86e28bb
|
fix small typo for logging command in api.php
|
2012-06-16 10:25:46 -06:00 |
|
Zach Prezkuta
|
0946c4a375
|
still need the original author information for comments and likes
|
2012-06-16 10:25:33 -06:00 |
|
Zach Prezkuta
|
09eb52810b
|
update signature checking for relayables
|
2012-06-16 10:25:32 -06:00 |
|
Hauke Zuehl
|
f9a40ccbde
|
Merge remote branch 'upstream/master'
|
2012-06-16 18:04:59 +02:00 |
|
Hauke Zuehl
|
1231dd72f0
|
Check if $rr exists
|
2012-06-16 15:07:23 +02:00 |
|
friendica
|
4faf0e609f
|
rev update
|
2012-06-16 03:35:45 -07:00 |
|
friendica
|
ff45e11284
|
redundant log entry
|
2012-06-14 17:55:30 -07:00 |
|
friendica
|
2efee75557
|
also mark for death if there isn't any xml to be found
|
2012-06-14 17:38:39 -07:00 |
|
friendica
|
267681844d
|
poll even if contact hasn't responded recently, so we can update the termination status
|
2012-06-14 17:27:07 -07:00 |
|
friendica
|
be090cc851
|
better handling of dead contacts
|
2012-06-14 16:56:46 -07:00 |
|
friendica
|
79e2ae3791
|
syntax on sql
|
2012-06-13 22:34:48 -07:00 |
|
friendica
|
edeca6d815
|
remove php version restriction on archive widget
|
2012-06-13 20:59:19 -07:00 |
|
friendica
|
b0a0c1ef4d
|
couple of little fixes to enotify positional params
|
2012-06-13 20:03:18 -07:00 |
|
friendica
|
7d8b087f4a
|
fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.
|
2012-06-13 19:59:20 -07:00 |
|
friendica
|
24bf4632af
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-13 16:25:57 -07:00 |
|
friendica
|
85876be48a
|
Merge https://github.com/fabrixxm/friendica into pull
Conflicts:
util/messages.po
|
2012-06-13 16:25:09 -07:00 |
|
friendica
|
36491462ba
|
Merge pull request #333 from Erkan-Yilmaz/master
missing bracket
|
2012-06-13 16:21:15 -07:00 |
|
friendica
|
d908c9dd71
|
disable archive widget for PHP < 5.3
|
2012-06-13 16:17:45 -07:00 |
|
Erkan Yilmaz
|
e8e1de3603
|
add missing bracket
|
2012-06-13 20:41:53 +02:00 |
|
fabrixxm
|
feab17bfea
|
enotify: fix stupid typo
|
2012-06-13 12:08:34 -04:00 |
|
fabrixxm
|
46cb8174fa
|
enotify: rework strings to more easy to translate
|
2012-06-13 11:55:21 -04:00 |
|
friendica
|
a424fecdae
|
this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March
|
2012-06-12 22:52:34 -07:00 |
|
friendica
|
bbdb8751e5
|
that was it
|
2012-06-12 21:39:39 -07:00 |
|
friendica
|
82ad881c85
|
think this will fix it
|
2012-06-12 21:38:10 -07:00 |
|
friendica
|
d955813f22
|
tracking another edge case
|
2012-06-12 21:34:28 -07:00 |
|
friendica
|
08af43f396
|
edge case
|
2012-06-12 21:30:17 -07:00 |
|
friendica
|
920ea2e1c7
|
archive widget
|
2012-06-12 20:46:30 -07:00 |
|
friendica
|
832d9eeaaf
|
more fixes
|
2012-06-12 16:17:34 -07:00 |
|
friendica
|
08b3126dae
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-12 02:48:00 -07:00 |
|
friendica
|
1dd52c20cf
|
move parens to proper place
|
2012-06-12 02:47:05 -07:00 |
|
Michael Vogel
|
a1c407e017
|
Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php"
|
2012-06-12 12:39:28 +03:00 |
|
friendica
|
b6ff71acaa
|
survive bad/un-parseable input to datetime_convert
|
2012-06-12 02:06:29 -07:00 |
|
friendica
|
645c2f9092
|
Merge pull request #331 from mexon/upstream
Add a hook for post-processing remote items
|
2012-06-12 00:52:36 -07:00 |
|
Matthew Exon
|
33a4e45f6b
|
Add a hook for post-processing remote items after they've been stored in the database and have an ID
|
2012-06-12 07:58:12 +02:00 |
|
friendica
|
b7e2f802d8
|
revert an optimisation that was wrong
|
2012-06-11 21:50:10 -07:00 |
|
friendica
|
24e85c95b6
|
date based profile wall filter - backend
|
2012-06-11 19:36:04 -07:00 |
|
friendica
|
75104416e0
|
reduce reverted edits due to edit arriving before original
|
2012-06-11 18:14:49 -07:00 |
|
friendica
|
09f74be14c
|
variable confusion in poller, don't allow negative page offsets
|
2012-06-11 17:24:16 -07:00 |
|
friendica
|
3b9c3d886d
|
sheesh
|
2012-06-11 16:21:27 -07:00 |
|
Vasudev Kamath
|
11974b4d94
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-06-11 20:47:11 +05:30 |
|
friendica
|
afa8815411
|
bug #447 - make followed feeds private
|
2012-06-11 05:28:08 -07:00 |
|
friendica
|
da7773a259
|
ostatus hub subscription issues
|
2012-06-07 19:53:39 -07:00 |
|
friendica
|
ba2452a076
|
png support for embedded private photos
|
2012-06-07 16:02:56 -07:00 |
|
Fabio Comuni
|
2438c6e45d
|
png support: update database.sql, fix some typos, fix tinymce image browser
|
2012-06-07 20:17:31 +02:00 |
|
Fabio Comuni
|
7cc8c369cb
|
Add support for PNG images with alpha
|
2012-06-07 17:42:13 +02:00 |
|
fabrixxm
|
1d832618a4
|
fix a random profile error message
|
2012-06-07 08:49:33 -04:00 |
|
friendica
|
6477c24919
|
more logging on subscribe_to_hub
|
2012-06-06 23:10:32 -07:00 |
|
friendica
|
5389efffa9
|
add email probe logging, limit typo check to main addon files and skip additional support files
|
2012-06-05 19:28:04 -07:00 |
|
Vasudev Kamath
|
12474e3c2e
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-06-04 12:04:17 +05:30 |
|