Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-30 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | DE update to the strings | Tobias Diekershoff | 2012-04-30 | 4 | -868/+766 | |
| * | | | | | | | | provide "xxx joined yyy" notifications | friendica | 2012-04-30 | 1 | -11/+34 | |
| | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | activitystreams schema constants for "join group" | friendica | 2012-04-29 | 1 | -0/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #276 from tomtom84/master | friendica | 2012-04-29 | 1 | -6/+10 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | close one menu (like the notifications menu) when another one is opened (like... | tommy tomson | 2012-04-30 | 1 | -6/+10 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | missed a db field | friendica | 2012-04-29 | 1 | -1/+1 | |
| * | | | | | | typo in profile_selectors, fix remote tagging | friendica | 2012-04-29 | 3 | -21/+37 | |
| * | | | | | | not all profile selector choices have unique or direct translations | friendica | 2012-04-29 | 1 | -6/+12 | |
| * | | | | | | log db error strings in all cases | friendica | 2012-04-29 | 1 | -3/+3 | |
| * | | | | | | admin page to manage failed updates | friendica | 2012-04-29 | 4 | -3/+83 | |
| * | | | | | | improved db error logging | friendica | 2012-04-29 | 3 | -124/+157 | |
| |/ / / / / | ||||||
| * | | | | | the heart should really be red. | friendica | 2012-04-29 | 1 | -1/+1 | |
| * | | | | | fix location change notification | friendica | 2012-04-29 | 1 | -1/+1 | |
| * | | | | | enhanced profile reporting for single values | friendica | 2012-04-29 | 1 | -15/+51 | |
| * | | | | | add db field for removed account, which will also be the first test of update... | friendica | 2012-04-29 | 3 | -4/+13 | |
| * | | | | | toggle to archive unfriends, though render them useless | friendica | 2012-04-28 | 1 | -0/+15 | |
| * | | | | | indicate successful updates | friendica | 2012-04-28 | 1 | -4/+8 | |
| * | | | | | diabook-themes: small fix | tommy tomson | 2012-04-29 | 2 | -2/+2 | |
| * | | | | | diabook-themes: bug/css-fixes | tommy tomson | 2012-04-29 | 23 | -98/+126 | |
| * | | | | | some constants for the db update failure possibilities | friendica | 2012-04-28 | 1 | -0/+8 | |
| * | | | | | bring back the email and logging of update failures, but without the transact... | friendica | 2012-04-28 | 2 | -25/+19 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-28 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #275 from cvogeley/master | friendica | 2012-04-28 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | small bugfix. sometimes also avatar pics were rescaled | Christian Vogeley | 2012-04-28 | 1 | -1/+1 | |
| | |/ / / | ||||||
| * / / / | a few more continues that should be returns | friendica | 2012-04-28 | 3 | -133/+148 | |
| |/ / / | ||||||
| * | / | poller refactor: continue not valid in this context | friendica | 2012-04-28 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
| * | | break up poller into separate processes | friendica | 2012-04-27 | 4 | -432/+529 | |
| * | | add tooltip title to common_tabs | friendica | 2012-04-27 | 1 | -1/+1 | |
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 4 | -10/+14 | |
| |\ \ | ||||||
| | * | | Diabook-dark update, it's almost useable now (if you're lenient). | Thomas Willingham | 2012-04-28 | 3 | -10/+13 | |
| | * | | Added "important changes" to admin menu for admins who don't follow | Thomas Willingham | 2012-04-28 | 1 | -0/+1 | |
| | |/ | ||||||
| * / | PRIVACY: if wall is blocked, don't provide public keywords in HTML meta | friendica | 2012-04-27 | 1 | -2/+4 | |
| |/ | ||||||
* | | Merge remote branch 'upstream/master' | zottel | 2012-04-28 | 14 | -363/+485 | |
|\| | ||||||
| * | string update | friendica | 2012-04-27 | 1 | -75/+99 | |
| * | implement contact archival | friendica | 2012-04-27 | 8 | -19/+56 | |
| * | archive contact flag | friendica | 2012-04-27 | 3 | -2/+7 | |
| * | pass zrl to dfrn_request as fallback | friendica | 2012-04-27 | 1 | -0/+5 | |
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 5 | -58/+84 | |
| |\ | ||||||
| | * | Merge pull request #274 from cvogeley/master | friendica | 2012-04-27 | 1 | -22/+24 | |
| | |\ | ||||||
| | | * | another attempt to fix lower tab behaviour on small screens, community back i... | Christian Vogeley | 2012-04-27 | 1 | -22/+24 | |
| | |/ | ||||||
| * | | rev update | friendica | 2012-04-27 | 2 | -249/+298 | |
* | | | Merge remote branch 'upstream/master' | zottel | 2012-04-27 | 7 | -62/+161 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #273 from simonlnu/master | Simon | 2012-04-27 | 4 | -24/+14 | |
| |\ \ | ||||||
| | * | | remove extra netsearch-box and fix | Simon L'nu | 2012-04-27 | 4 | -24/+14 | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-27 | 0 | -0/+0 | |
| |/ / | ||||||
| * | | Merge pull request #272 from simonlnu/master | Simon | 2012-04-27 | 4 | -12/+46 | |
| |\ \ | | |/ | |/| | ||||||
| | * | fix contact-friend stuff on profile sidebar | Simon L'nu | 2012-04-27 | 4 | -12/+46 | |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-27 | 0 | -0/+0 | |
| |/ | ||||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 4 | -20/+34 | |
| |\ |