aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* break up poller into separate processesfriendica2012-04-274-432/+529
|
* add tooltip title to common_tabsfriendica2012-04-271-1/+1
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-10/+14
|\
| * Diabook-dark update, it's almost useable now (if you're lenient).Thomas Willingham2012-04-283-10/+13
| |
| * Added "important changes" to admin menu for admins who don't followThomas Willingham2012-04-281-0/+1
| | | | | | | | the github properly.
* | PRIVACY: if wall is blocked, don't provide public keywords in HTML metafriendica2012-04-271-2/+4
|/
* string updatefriendica2012-04-271-75/+99
|
* implement contact archivalfriendica2012-04-278-19/+56
|
* archive contact flagfriendica2012-04-273-2/+7
|
* pass zrl to dfrn_request as fallbackfriendica2012-04-271-0/+5
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-275-58/+84
|\
| * Merge pull request #274 from cvogeley/masterfriendica2012-04-271-22/+24
| |\ | | | | | | cleanzero: nav.tpl: Another attempt to improve lower tab behaviour
| | * another attempt to fix lower tab behaviour on small screens, community back ↵Christian Vogeley2012-04-271-22/+24
| |/ | | | | | | in tab area
| * Merge pull request #273 from simonlnu/masterSimon2012-04-274-24/+14
| |\ | | | | | | fix netsearch-box dupe and stuff
| | * remove extra netsearch-box and fixSimon L'nu2012-04-274-24/+14
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #272 from simonlnu/masterSimon2012-04-274-12/+46
| |\ | | | | | | fix contact-friend stuff on profile sidebar
| | * fix contact-friend stuff on profile sidebarSimon L'nu2012-04-274-12/+46
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
| |/ | | | | | | | | | | | | * remotes/upstream/master: put community back on the lower tab. It belongs with message streams * master:
* / rev updatefriendica2012-04-272-249/+298
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-274-20/+34
|\
| * Merge pull request #271 from simonlnu/masterSimon2012-04-274-20/+34
| |\ | | | | | | fix some css errors
| | * fix some css errorsSimon L'nu2012-04-274-20/+34
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
| |/ | | | | | | | | | | | | * remotes/upstream/master: fix view contacts * master:
* / put community back on the lower tab. It belongs with message streamsfriendica2012-04-271-4/+3
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-275-1/+63
|\
| * Merge pull request #270 from simonlnu/masterSimon2012-04-265-1/+63
| |\ | | | | | | fix 2 issues
| | * fix 2 issues. contacts img in finder; wall filer titleSimon L'nu2012-04-275-1/+63
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-270-0/+0
| |/ | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: reset qcomment selector after insert. put fakelink back in birthday notice birthday contact link goes to event page instead of remote profile make comment edit icons look more like base theme rev update * master:
* / fix view contactsfriendica2012-04-271-1/+1
|/
* reset qcomment selector after insert.friendica2012-04-261-0/+1
|
* put fakelink back in birthday noticefriendica2012-04-261-1/+1
|
* birthday contact link goes to event page instead of remote profilefriendica2012-04-261-1/+1
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-261-5/+5
|\
| * Merge pull request #269 from simonlnu/masterSimon2012-04-261-5/+5
| |\ | | | | | | fix s/color/colour/g issue
| | * fix s/color/colour/g issueSimon L'nu2012-04-261-5/+5
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-260-0/+0
| |/ | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: small-fix add link "remove account" to /mod/settings.php * master:
* | make comment edit icons look more like base themefriendica2012-04-265-29/+37
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-2680-1518/+4867
|\|
| * Merge pull request #267 from tomtom84/masterfriendica2012-04-262-1/+11
| |\ | | | | | | add link "remove account" to /mod/settings.php
| | * diabook-themes: small-fixtommy tomson2012-04-261-1/+6
| | |
| | * add link "remove account" to /mod/settings.phptommy tomson2012-04-261-0/+5
| | |
| * | Merge pull request #268 from simonlnu/masterSimon2012-04-2664-1515/+3857
| |\ \ | | |/ | |/| announced dipsy change. re-tie your boots, we're in for a wee ride ;)
| | * announced dipsy change. re-tie your boots, we're in for a wee ride ;)Simon L'nu2012-04-2664-1515/+3857
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-260-0/+0
| |/ | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update, fix autoname test "random" failure duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design added BBCODE thing in comments add cleanzero theme * master:
| * Merge pull request #265 from cvogeley/masterfriendica2012-04-2614-2/+999
| |\ | | | | | | cleanzero theme added
| | * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-0/+71
| | | | | | | | | | | | to avoid breaking of design
| | * duepuntozero: move community and manage link to upper right area + css fixes ↵Christian Vogeley2012-04-251-2/+5
| | | | | | | | | | | | to avoid breaking of design
| | * added BBCODE thing in commentsChristian Vogeley2012-04-251-0/+38
| | |
| | * add cleanzero themeChristian Vogeley2012-04-2512-0/+885
| | |