Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
friendica
60871555f5
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
2012-04-12 06:50:11 -07:00
Fabio Comuni
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
friendica
967ed8e23f
Merge https://github.com/friendica/friendica into pull
2012-04-10 20:51:04 -07:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
Simon L'nu
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
2012-04-10 23:34:55 -04:00
Simon L'nu
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:34:39 -04:00
friendica
0fa932853c
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
2012-04-10 20:09:51 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
friendica
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
friendica
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
...
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
friendica
92c20895e0
use local_user for tag completion if available. See bug #368
2012-04-09 04:55:52 -07:00
friendica
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
friendica
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
friendica
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
6bc7e6e09f
add network_tabs hook
2012-04-05 21:42:47 -07:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
friendica
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
2012-04-05 02:15:03 -07:00
friendica
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
2012-04-04 20:45:48 -07:00
Michael Johnston
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 23:08:16 -04:00
friendica
f63636ed14
well that was a stupid mistake...
2012-04-04 17:19:46 -07:00
friendica
60c57704c6
better handling of reshares containing embeds
2012-04-04 02:02:23 -07:00
friendica
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
friendica
466188ebd7
re-opened bug #363
2012-04-03 20:14:37 -07:00
friendica
96abee53e4
this is better
2012-04-03 19:20:39 -07:00
friendica
dbe16afcd4
include contact_widgets for categories_widget when doing updates
2012-04-03 19:16:02 -07:00
friendica
4b762ff923
suppress duplicates in search
2012-04-03 02:44:29 -07:00
friendica
5d0d9f8772
make contact ssl_policy change a function since it is used in a few places
2012-04-02 23:07:26 -07:00
friendica
f4721955db
more ssl policy fixes and prevent delivery to soapbox when using local delivery
2012-04-02 21:01:19 -07:00
friendica
e1de2e3de0
don't change ssl settings on local photos for remote contact
2012-04-02 19:38:13 -07:00
friendica
9391fc965d
bug #363 and a couple of other reported ssl link issues
2012-04-02 17:43:11 -07:00
friendica
2352e6c1cb
make the "new calendar" (javascript interactive) the default
2012-04-02 01:46:35 -07:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
Thomas Willingham
210586eaed
Merge remote-tracking branch 'upstream/master'
2012-04-02 00:29:27 +01:00
Thomas Willingham
8406803473
modified: mod/newmember.php
...
Add a link to the quick start
2012-04-02 00:27:47 +01:00
friendica
f95db4382e
check for style.php existence before inclusion
2012-04-01 16:21:55 -07:00
Thomas Willingham
d0ddd380e7
Moved Diaspora notes away from top, per user request
2012-04-02 00:18:03 +01:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
friendica
ea10bba147
fix "between yourself and You" in mail list
2012-03-31 20:08:32 -07:00
friendica
2147e0a71f
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
2012-03-31 16:08:40 -07:00
