aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-132-50/+43
|\
| * reverting recent db driver changes - won't install cleanly, won't update clea...friendica2012-04-121-1/+1
| * settings: remove call to profile_load()Fabio Comuni2012-04-121-4/+0
| * settings: move tabs to aside. add a new template "generic_links_widget.tpl"Fabio Comuni2012-04-121-45/+42
* | Merge commit 'upstream/master'Michael Vogel2012-04-1114-60/+130
|\|
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-101-2/+2
| |\
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+4
| | |\
| | * | [fix] absolute links in docs and newmember.php; breaks sub-dir installsSimon L'nu2012-04-101-2/+2
| * | | visit "random profile" featurefriendica2012-04-102-1/+11
| | |/ | |/|
| * | profile redir - goto correct profile page even if contact blocked, you just c...friendica2012-04-101-2/+4
| |/
| * more backend work on mail2 followersfriendica2012-04-101-9/+54
| * make editplain work everywherefriendica2012-04-102-5/+22
| * move all fix_mce to one function so it can easily be undonefriendica2012-04-102-4/+2
| * duplicate community postsfriendica2012-04-101-4/+4
| * fix_mce_lf contact edit pagefriendica2012-04-101-1/+1
| * fix_mce_lf on profilesfriendica2012-04-101-10/+11
| * Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-092-14/+6
| * Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-091-2/+2
| * use local_user for tag completion if available. See bug #368friendica2012-04-091-1/+1
| * send zrl after dfrn_request homecoming for manual entriesfriendica2012-04-081-1/+1
| * fix to wall_upload photos default permissions to use cid rather than uid.friendica2012-04-083-5/+10
* | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+29
|/
* tag tests cont.friendica2012-04-071-1/+0
* some work on testsfriendica2012-04-071-0/+1
* Merge branch 'pull'friendica2012-04-0592-0/+0
|\
| * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0598-291/+756
| |\
* | | add network_tabs hookfriendica2012-04-051-2/+6
| |/ |/|
* | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2phpfriendica2012-04-052-1/+3
* | let's catch d* disabled at a higher level and not waste any resources on it.friendica2012-04-041-0/+7
* | correct some filer dialog weirdness caused by introduction of categoriesMichael Johnston2012-04-041-1/+2
* | well that was a stupid mistake...friendica2012-04-041-1/+1
* | better handling of reshares containing embedsfriendica2012-04-041-8/+8
* | display settings hooksfriendica2012-04-031-1/+4
* | re-opened bug #363friendica2012-04-031-0/+10
* | this is betterfriendica2012-04-031-3/+2
* | include contact_widgets for categories_widget when doing updatesfriendica2012-04-031-0/+2
* | suppress duplicates in searchfriendica2012-04-031-7/+7
* | make contact ssl_policy change a function since it is used in a few placesfriendica2012-04-021-43/+2
* | more ssl policy fixes and prevent delivery to soapbox when using local deliveryfriendica2012-04-021-5/+0
* | don't change ssl settings on local photos for remote contactfriendica2012-04-021-9/+0
* | bug #363 and a couple of other reported ssl link issuesfriendica2012-04-021-1/+32
* | make the "new calendar" (javascript interactive) the defaultfriendica2012-04-021-4/+4
* | allow users to set categories on their postsMichael Johnston2012-04-013-7/+46
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-04-0215-121/+404
|\ \
| * | check for style.php existence before inclusionfriendica2012-04-011-1/+2
| * | send unverified private mail using zrlfriendica2012-04-013-6/+164
| * | fix "between yourself and You" in mail listfriendica2012-03-311-8/+5
| * | ensure all new users get a timezone. We'll use UTC until they choose otherwise.friendica2012-03-311-2/+2
| * | handle escaped file chars in display and searchfriendica2012-03-313-5/+5
| * | register hooks for a COPA pluginfriendica2012-03-311-0/+7