aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | css-fixes in diabook-derivatestommy tomson2012-03-308-32/+29
| | * | catch OpenID login errors in cases when the OpenID server does not answersTobias Diekershoff2012-03-301-1/+5
| * | | don't delete contact from a friend request if friendship was already establishedfriendica2012-03-302-2/+6
| |/ /
| * | css-fixes in diabook-derivatestommy tomson2012-03-306-9/+19
| * | quattro-green: added Description to the theme.phpTobias Diekershoff2012-03-301-0/+1
| |/
| * quattro-green: adopted quattro option for centered displayTobias Diekershoff2012-03-302-1/+56
| * Merge branch 'pull'friendica2012-03-30170-6/+18107
| |\
| | * Merge pull request #187 from tomtom84/mastertomtom842012-03-30170-6/+18107
| | |\
| | | * add themes diabook-red & diabook-aerithtommy tomson2012-03-30170-6/+18107
| | |/
| * / string updatefriendica2012-03-301-964/+1230
| |/
| * rename "file as" to "save to folder"friendica2012-03-303-4/+4
| * Merge branch 'pull'friendica2012-03-302-29/+128
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-304-5/+5
| | |\
| | * | quattro-greey: apply theming to private mailTobias Diekershoff2012-03-302-29/+128
| * | | bug #352 - qcomment plugin disabled, qcomments still allowedfriendica2012-03-301-2/+5
| | |/ | |/|
| * | zrl into people searchesfriendica2012-03-294-5/+5
| |/
| * another silly mistakefriendica2012-03-292-5/+5
| * silly mistakefriendica2012-03-291-2/+3
| * zrl on mentionsfriendica2012-03-291-0/+6
| * use zrl to get home againfriendica2012-03-297-17/+54
| * Merge branch 'pull'friendica2012-03-296-58/+44
| |\
| | * Merge pull request #186 from simonlnu/masterSimon2012-03-296-58/+44
| | |\
| | | * tweaking stuff in dispys. i thought i fixed the login screens, but they're b0...Simon L'nu2012-03-296-58/+44
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-292-4/+3
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2931-135/+657
| | | |\
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-290-0/+0
| * | | | provide a way to specify an admin account for siteinfo if more than one have ...friendica2012-03-291-1/+5
| |/ / /
| * | / typo in function namefriendica2012-03-292-4/+3
| | |/ | |/|
| * | theme file_as combobox for 2.0friendica2012-03-292-1/+8
| * | css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
| * | Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2813-111/+513
| |\ \ | | |/ | |/|
| | * quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| | * message: remove tabs, move new message link to aside, all message with gmail-...Fabio Comuni2012-03-284-47/+96
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2822-130/+316
| | |\
| | * | quattro: tpl for "file as"Fabio Comuni2012-03-281-0/+12
| * | | some reported warnings cleaned upfriendica2012-03-283-8/+11
| * | | Merge branch 'pull'friendica2012-03-2810-78/+317
| |\ \ \
| | * \ \ Merge pull request #184 from annando/masterfriendica2012-03-2810-78/+317
| | |\ \ \
| * | | | | network permission idsfriendica2012-03-281-1/+23
| * | | | | wrong var for notify totalfriendica2012-03-281-1/+1
| * | | | | fix notification totalfriendica2012-03-281-2/+3
| * | | | | improved rw notificationsfriendica2012-03-282-2/+28
| |/ / / /
| * | | | Merge branch 'pull'friendica2012-03-2812-22/+108
| |\ \ \ \
| | * | | | add a searchbox to "find friends" for global searchtommy tomson2012-03-288-9/+70
| | * | | | bugfix in diabooktommy tomson2012-03-285-13/+38
| | | |_|/ | | |/| |
| * / | | bug #349 - email notls settingfriendica2012-03-282-2/+2
| |/ / /
* | / / Several improvementsMichael Vogel2012-03-312-2/+6
| |/ / |/| |
* | | Merge commit 'upstream/master'Michael Vogel2012-03-28598-11992/+36509
|\| |
| * | Merge branch 'pull'friendica2012-03-284-11/+14
| |\ \
| | * \ Merge pull request #183 from simonlnu/masterSimon2012-03-282-12/+4
| | |\ \