aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #238 from annando/masterfriendica2012-04-151-0/+29
|\
| * Merge commit 'upstream/master'Michael Vogel2012-04-146-15/+218
| |\
| * \ Merge commit 'upstream/master'Michael Vogel2012-04-132-50/+43
| |\ \
| * \ \ Merge commit 'upstream/master'Michael Vogel2012-04-1114-60/+130
| |\ \ \
| * | | | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+29
* | | | | function name typofriendica2012-04-151-1/+1
* | | | | track requested profile error msgfriendica2012-04-141-0/+1
* | | | | zrl on random profilefriendica2012-04-141-1/+1
| |_|_|/ |/| | |
* | | | pass zrl's to/through global directoryfriendica2012-04-141-1/+1
* | | | well that was a silly mistake...friendica2012-04-131-2/+2
* | | | setting wasn't being appliedfriendica2012-04-131-2/+2
* | | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-134-4/+179
|\ \ \ \
| * | | | bug #369 - show contacts who are not in any groupsfriendica2012-04-121-0/+65
| * | | | extended the "interesting" profile attributesfriendica2012-04-121-1/+8
| * | | | send link directly to profile tabfriendica2012-04-121-3/+3
| * | | | stray log statementsfriendica2012-04-121-2/+0
| * | | | profile change activitiesfriendica2012-04-122-7/+102
| * | | | allow setting default new friend notifyfriendica2012-04-122-1/+11
| * | | | turn off new friend activity by defaultfriendica2012-04-121-1/+1
| | |_|/ | |/| |
* / | | admin: change global theme settingsFabio Comuni2012-04-131-9/+37
|/ / /
* | | 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 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
|/
* 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