Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 1 | -0/+29 |
|\ | | | | | API: Support of the statusnet application | ||||
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 6 | -15/+218 |
| |\ | |||||
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 2 | -50/+43 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | ||||
| * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 14 | -60/+130 |
| |\ \ \ | |||||
| * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | function name typo | friendica | 2012-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | track requested profile error msg | friendica | 2012-04-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | zrl on random profile | friendica | 2012-04-14 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | pass zrl's to/through global directory | friendica | 2012-04-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | well that was a silly mistake... | friendica | 2012-04-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | setting wasn't being applied | friendica | 2012-04-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 4 | -4/+179 |
|\ \ \ \ | |||||
| * | | | | bug #369 - show contacts who are not in any groups | friendica | 2012-04-12 | 1 | -0/+65 |
| | | | | | |||||
| * | | | | extended the "interesting" profile attributes | friendica | 2012-04-12 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | send link directly to profile tab | friendica | 2012-04-12 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | stray log statements | friendica | 2012-04-12 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | profile change activities | friendica | 2012-04-12 | 2 | -7/+102 |
| | | | | | |||||
| * | | | | allow setting default new friend notify | friendica | 2012-04-12 | 2 | -1/+11 |
| | | | | | |||||
| * | | | | turn off new friend activity by default | friendica | 2012-04-12 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* / | | | admin: change global theme settings | Fabio Comuni | 2012-04-13 | 1 | -9/+37 |
|/ / / | |||||
* | | | reverting recent db driver changes - won't install cleanly, won't update ↵ | friendica | 2012-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | cleanly, and leaks DB credentials over the web if there's a connection problem | ||||
* | | | settings: remove call to profile_load() | Fabio Comuni | 2012-04-12 | 1 | -4/+0 |
| | | | |||||
* | | | settings: move tabs to aside. add a new template "generic_links_widget.tpl" | Fabio Comuni | 2012-04-12 | 1 | -45/+42 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master: | ||||
| * | | | [fix] absolute links in docs and newmember.php; breaks sub-dir installs | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | visit "random profile" feature | friendica | 2012-04-10 | 2 | -1/+11 |
| |/ / |/| | | |||||
* | | | profile redir - goto correct profile page even if contact blocked, you just ↵ | friendica | 2012-04-10 | 1 | -2/+4 |
|/ / | | | | | | | can't do anything. | ||||
* | | more backend work on mail2 followers | friendica | 2012-04-10 | 1 | -9/+54 |
| | | |||||
* | | make editplain work everywhere | friendica | 2012-04-10 | 2 | -5/+22 |
| | | |||||
* | | move all fix_mce to one function so it can easily be undone | friendica | 2012-04-10 | 2 | -4/+2 |
| | | |||||
* | | duplicate community posts | friendica | 2012-04-10 | 1 | -4/+4 |
| | | |||||
* | | fix_mce_lf contact edit page | friendica | 2012-04-10 | 1 | -1/+1 |
| | | |||||
* | | fix_mce_lf on profiles | friendica | 2012-04-10 | 1 | -10/+11 |
| | | |||||
* | | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 2 | -14/+6 |
| | | | | | | | | | | 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? | ||||
* | | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 1 | -2/+2 |
| | | | | | | | | | | 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. | ||||
* | | use local_user for tag completion if available. See bug #368 | friendica | 2012-04-09 | 1 | -1/+1 |
| | | |||||
* | | send zrl after dfrn_request homecoming for manual entries | friendica | 2012-04-08 | 1 | -1/+1 |
| | | |||||
* | | fix to wall_upload photos default permissions to use cid rather than uid. | friendica | 2012-04-08 | 3 | -5/+10 |
|/ | |||||
* | tag tests cont. | friendica | 2012-04-07 | 1 | -1/+0 |
| | |||||
* | some work on tests | friendica | 2012-04-07 | 1 | -0/+1 |
| | |||||
* | Merge branch 'pull' | friendica | 2012-04-05 | 92 | -0/+0 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 98 | -291/+756 |
| |\ | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
* | | | add network_tabs hook | friendica | 2012-04-05 | 1 | -2/+6 |
| |/ |/| | |||||
* | | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php | friendica | 2012-04-05 | 2 | -1/+3 |
| | | |||||
* | | let's catch d* disabled at a higher level and not waste any resources on it. | friendica | 2012-04-04 | 1 | -0/+7 |
| | | |||||
* | | correct some filer dialog weirdness caused by introduction of categories | Michael Johnston | 2012-04-04 | 1 | -1/+2 |
| | | |||||
* | | well that was a stupid mistake... | friendica | 2012-04-04 | 1 | -1/+1 |
| | | |||||
* | | better handling of reshares containing embeds | friendica | 2012-04-04 | 1 | -8/+8 |
| | | |||||
* | | display settings hooks | friendica | 2012-04-03 | 1 | -1/+4 |
| | |