aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* more work on queue optimisationsfriendica2015-03-095-10/+43
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-091-2/+2
|\
| * Whoops... should've actually checked the pg manual before merging #920 :-)Habeas Codice2015-03-091-2/+2
* | Bring simple editor formatting functions back to the main editor (bold, itali...friendica2015-03-092-0/+37
|/
* whitespacefriendica2015-03-091-2/+1
* make network page default options work more or less universally instead of ju...friendica2015-03-094-7/+17
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-092-2/+5
|\
| * Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-092-51/+33
| |\
| * | make areYouSure alert also if default post perms changeMario Vavti2015-03-092-2/+5
* | | up the count of directory tagsfriendica2015-03-091-1/+1
| |/ |/|
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-091-5/+12
|\|
| * add transition effect for border-colorMario Vavti2015-03-091-1/+4
| * some more hover magic for field checkboxMario Vavti2015-03-091-5/+9
* | Allow site to over-ride directory options. Bugger off.friendica2015-03-092-51/+33
|/
* fix comanche regions after comanche refactor a few days agofriendica2015-03-092-1/+2
* Merge pull request #921 from solstag/closenessfixRedMatrix2015-03-091-1/+1
|\
| * Fix missing value in insert for default closenessAlexandre Hannud Abdo2015-03-091-1/+1
|/
* Merge pull request #920 from dawnbreak/masterhabeascodice2015-03-084-371/+382
|\
| * Fixing (un)blocking accounts in /admin/users.Klaus Weidenbach2015-03-082-62/+87
| * Add alert to admin page about old PHP version.Klaus Weidenbach2015-03-083-311/+297
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-084-41/+24
|\ \
| * | add hover effect to checkbox fieldMario Vavti2015-03-081-0/+5
| * | remove unused variablesMario Vavti2015-03-081-5/+0
| * | copy/paste typoMario Vavti2015-03-081-1/+1
| * | Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-085-10/+15
| |\ \
| * | | port boxy schemeMario Vavti2015-03-084-36/+19
| | |/ | |/|
* | | change default affinity (abook_closeness) to 80 for all new connections going...friendica2015-03-084-4/+22
| |/ |/|
* | add reddress to profile - but all is not as it seems. Copy to clipboard is bl...friendica2015-03-073-6/+9
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-072-4/+0
|\|
| * hopefully fix #919Mario Vavti2015-03-072-4/+0
* | directory: fix public forum listingfriendica2015-03-072-4/+6
|/
* when fixing "naked links" make sure not to double link double urls as seen in...friendica2015-03-062-2/+2
* remove unused varMario Vavti2015-03-061-2/+0