aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more private forums, default privacy group for new contactsfriendica2012-05-1713-34/+131
* tell browser not to cache permission denied (private) photos so that after au...friendica2012-05-172-5/+22
* setup delivery chain for private groups (work in progress)friendica2012-05-173-24/+29
* bring in the *much better* xml parser from the original zot branchfriendica2012-05-161-0/+164
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-162-2/+2
|\
| * Merge pull request #301 from simonlnu/masterSimon2012-05-162-2/+2
| |\
| | * fix admin links...Simon L'nu2012-05-162-2/+2
* | | rev updatefriendica2012-05-162-3/+3
|/ /
* | merged from wrong projectfriendica2012-05-161-4/+0
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-164-18/+21
|\ \
| * | Merge pull request #300 from simonlnu/masterSimon2012-05-162-2/+2
| |\|
| | * *sigh*. fix dark *again*Simon L'nu2012-05-162-2/+2
| * | Merge pull request #299 from simonlnu/masterSimon2012-05-164-16/+19
| |\|
| | * get rid of the monstrosity for .button. need to find alternate solutionSimon L'nu2012-05-164-16/+19
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-160-0/+0
| |/
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-157-83/+154
|\|
| * Merge pull request #298 from simonlnu/masterSimon2012-05-157-83/+154
| |\
| | * slight re-design of wall stuff and css/font cleaningSimon L'nu2012-05-167-83/+154
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1532-5273/+6292
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-140-0/+0
* | | Merge https://github.com/friendica/dir into dpullfriendica2012-05-151-0/+4
|\ \ \ | |/ / |/| |
| * | initial commitfriendica2012-05-151-0/+4
| /
* | update tinymce to 3.5.0.1friendica2012-05-1526-4805/+5696
* | rev updatefriendica2012-05-152-22/+30
* | DE stringsTobias Diekershoff2012-05-152-400/+506
* | slackr drop shadows extendedfriendica2012-05-141-1/+15
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-146-192/+215
|\ \
| * \ Merge pull request #297 from mexon/upstreamfriendica2012-05-141-1/+1
| |\ \ | | |/ | |/|
| | * Allow plugins to modify the contact photo menuMatthew Exon2012-05-151-1/+1
| * | Merge pull request #296 from simonlnu/masterSimon2012-05-135-191/+214
| |\ \
| | * | finish dipsy light colour fixesSimon L'nu2012-05-145-191/+214
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-142-67/+67
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1320-252/+4973
| | |\|
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-120-0/+0
* | | | rev updatefriendica2012-05-142-47/+47
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-132-18/+24
|\ \ \ | | |/ | |/|
| * | diabook-theme: small fixestommy tomson2012-05-132-18/+24
* | | rev updatefriendica2012-05-132-67/+67
|/ /
* | rename get_language() to get_browser_language()friendica2012-05-134-6/+6
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-1222-6589/+4277
|\|
| * Merge pull request #295 from simonlnu/masterSimon2012-05-1211-54/+89
| |\
| | * css fixes; new screenshotsSimon L'nu2012-05-1211-54/+89
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-124-391/+575
| | |\ | | |/ | |/|
| * | Merge pull request #294 from mschmitt/masterfriendica2012-05-124-391/+575
| |\ \
| | * | Ĝisdatigis la esperantlingvan tradukaĵon al 100%.Martin Schmitt2012-05-124-391/+575
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-120-0/+0
| | |/ | |/|
| * | diabook-theme: fix in earthlayerstommy tomson2012-05-123-29/+26
| * | diabook-theme: some fixestommy tomson2012-05-123-0/+519
| * | Merge pull request #293 from simonlnu/masterSimon2012-05-128-6152/+3105
| |\ \ | | |/ | |/|
| | * finished migrating dispy light - maybeSimon L'nu2012-05-128-6152/+3105
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:51:34 +0000