aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | invoke tgroup_check() on diaspora posts/comments in case the recipient is a f...friendica2015-03-131-19/+34
|/ /
* | update to-do listfriendica2015-03-133-3962/+2153
* | revert thatfriendica2015-03-121-4/+25
* | try to allow translation of ax regsfriendica2015-03-121-29/+52
* | support a fair number of the common AX regsfriendica2015-03-121-5/+68
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-123-68/+99
|\ \
| * \ Merge pull request #927 from dawnbreak/masterRedMatrix2015-03-133-68/+99
| |\ \
| | * | Some cleanups.Klaus Weidenbach2015-03-133-68/+99
* | | | Add some AX vars to openid server.friendica2015-03-121-11/+28
|/ / /
* | | more JS=1 weirdnessfriendica2015-03-121-1/+1
* | | reduce the occurrence of duplicated notice() messagesfriendica2015-03-121-5/+8
* | | prepare for demise of google codefriendica2015-03-122-1/+9
* | | try and add some regsfriendica2015-03-122-1/+3
* | | Merge pull request #926 from dawnbreak/masterKlaus2015-03-121-56/+46
|\| |
| * | Fix JavaScript problems on channels where you are not allowed to upload photos.Klaus Weidenbach2015-03-121-56/+46
|/ /
* | add generic_addon_settings template and minor fixesMario Vavti2015-03-123-2/+19
* | Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-121-1/+1
|\ \
| * | substr() is a mysql alias for substring(). substring() is in the SQL standard...Habeas Codice2015-03-121-1/+1
* | | some work on feature/addon settingsMario Vavti2015-03-123-43/+32
|/ /
* | openid stufffriendica2015-03-112-36/+50
* | Merge branch 'master' into openidfriendica2015-03-1114-25/+105
|\ \
| * | remove the now redundant audio/video buttons and label the editor text style ...friendica2015-03-118-11/+36
| * | Merge pull request #925 from unary/fixinsertRedMatrix2015-03-121-1/+1
| |\ \
| | * | add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| * | | make embeds bookmarkablefriendica2015-03-111-1/+1
| * | | turn parse_url into the definitive url attaching mechanismfriendica2015-03-112-3/+35
| * | | parse_url changes for oembed/zvideo/etc.friendica2015-03-111-8/+22
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-111-1/+4
| |\ \
| | * | update sample-nginx.conf redirect to check for argsMario Vavti2015-03-111-1/+4
| * | | don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
| |/ /
* | | Merge branch 'master' into openidfriendica2015-03-1112-177/+16
|\| |
| * | skip trying to come up with an intelligent way to decide what photos should g...friendica2015-03-112-20/+2
| * | cleanup of old delegation stufffriendica2015-03-106-152/+5
| * | allow urls using the zot: or zots: URL schemes to exist without getting filte...friendica2015-03-101-1/+1
| * | sql optimisation for affinity searches. A new index was added which wasn't ad...friendica2015-03-103-4/+8
* | | openid serverfriendica2015-03-111-0/+237
* | | first cut openid server. Mostly just getting it architecturally prepared - as...friendica2015-03-101-1/+1
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-101-31/+58
|\ \
| * \ Merge pull request #923 from dawnbreak/masterRedMatrix2015-03-111-31/+58
| |\ \
| | * | Fix SQL query for removing orphan hooks.Klaus Weidenbach2015-03-101-31/+58
* | | | Change logic of "don't create a status post for this photo upload" and turn i...friendica2015-03-105-15/+8
|/ / /
* | | Merge pull request #922 from dawnbreak/masterRedMatrix2015-03-112-80/+77
|\| |
| * | View upload photo button only if you have permission.Klaus Weidenbach2015-03-102-80/+77
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-102-8/+65
|\ \
| * | collapse jot tools to submenu on small and extra small screensMario Vavti2015-03-102-8/+65
* | | diaspora's spammy permission model seems to have leaked through our firehose....friendica2015-03-101-2/+5
|/ /
* | missing includefriendica2015-03-101-0/+1
* | channel delegationfriendica2015-03-108-23/+117
* | buttons for admin_accounts + admin_channelsfriendica2015-03-095-7/+14
* | increase the cell padding (any jokes about padded cells will be ignored)friendica2015-03-091-1/+1