aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
| * Merge pull request #925 from unary/fixinsertRedMatrix2015-03-121-1/+1
| |\ | | | | | | add missing %d for abook_closeness
| | * 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 ↵friendica2015-03-112-20/+2
| | | | | | | | get a status post - leave it manual.
| * cleanup of old delegation stufffriendica2015-03-106-152/+5
| |
| * allow urls using the zot: or zots: URL schemes to exist without getting ↵friendica2015-03-101-1/+1
| | | | | | | | filtered away.
| * sql optimisation for affinity searches. A new index was added which wasn't ↵friendica2015-03-103-4/+8
| | | | | | | | added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
* | openid serverfriendica2015-03-111-0/+237
| |
* | first cut openid server. Mostly just getting it architecturally prepared - ↵friendica2015-03-101-1/+1
|/ | | | as there may be a few twists and turns ahead.
* 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.
| | * Fix SQL query for removing orphan hooks.Klaus Weidenbach2015-03-101-31/+58
| | | | | | | | | | | | | | | initialize some variables before using them. commented out some unused variables.
* | | Change logic of "don't create a status post for this photo upload" and turn ↵friendica2015-03-105-15/+8
|/ / | | | | | | it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
* | Merge pull request #922 from dawnbreak/masterRedMatrix2015-03-112-80/+77
|\| | | | | View upload photo button only if you have permission.
| * View upload photo button only if you have permission.Klaus Weidenbach2015-03-102-80/+77
|/ | | | | | | | | | Check if post_photos permission is available otherwise hide the photo upload button. Or should we show the button and just disable it with a title, about missing permission to upload photos? In comments we use the same icon, but just add [img] bb-code. Should we provide this if no permission to upload photos. Do we need different icons for [img] and photo upload buttons?
* 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 ↵friendica2015-03-101-2/+5
|/ | | | firehose. Don't let it.
* 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
| | | | | | | | | | replace if(cond,val,val) with case when cond then val else val end, works on both DBs
* | Bring simple editor formatting functions back to the main editor (bold, ↵friendica2015-03-092-0/+37
|/ | | | italic, underline, quote, code) so as to maintain parity and consistency with comments. Currently this will make the editor toolbar seem a bit cluttered but be aware that the second button group (attach and link tools) will be reduced to two buttons (attach and link) when the next phase of this work is completed. The third group of tools are optional features and will only be presented based on personal choice. Visual editors may need to disable, relocate, or redefine these buttons.
* whitespacefriendica2015-03-091-2/+1
|
* make network page default options work more or less universally instead of ↵friendica2015-03-094-7/+17
| | | | just from the navbar, and fix some saved-search weirdness related to the delete-term icon
* 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 closeness
| * 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
|\ | | | | Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
| * Fixing (un)blocking accounts in /admin/users.Klaus Weidenbach2015-03-082-62/+87
| | | | | | | | | | | | When I look at the instructions in sql_conventions about setting bit flags I don't understand how this could have worked before. Changed the behavior for (un)blocking so that it should work now.
| * Add alert to admin page about old PHP version.Klaus Weidenbach2015-03-083-311/+297
| | | | | | | | | | | | | | | | | | | | | | | | Add an alert message to admin summary page when a PHP version < 5.4 was detected as this has reached EOL and will not be supported with the new SabreDAV library. Some styleguide optimisation. Add NULL_DATE example to doc/sql_conventions.bb. Display a "0" when no plugins active in summary page. Added some more numbers to summary admin page, expired accounts, channels. Hope I interpreted them right. I have no idea how to get blocked accounts.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 02:03:12 +0000