Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-10 | 1 | -31/+58 |
|\ | |||||
| * | Merge pull request #923 from dawnbreak/master | RedMatrix | 2015-03-11 | 1 | -31/+58 |
| |\ | | | | | | | Fix SQL query for removing orphan hooks. | ||||
| | * | Fix SQL query for removing orphan hooks. | Klaus Weidenbach | 2015-03-10 | 1 | -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 ↵ | friendica | 2015-03-10 | 5 | -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/master | RedMatrix | 2015-03-11 | 2 | -80/+77 |
|\| | | | | | View upload photo button only if you have permission. | ||||
| * | View upload photo button only if you have permission. | Klaus Weidenbach | 2015-03-10 | 2 | -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_merge | friendica | 2015-03-10 | 2 | -8/+65 |
|\ | |||||
| * | collapse jot tools to submenu on small and extra small screens | Mario Vavti | 2015-03-10 | 2 | -8/+65 |
| | | |||||
* | | diaspora's spammy permission model seems to have leaked through our ↵ | friendica | 2015-03-10 | 1 | -2/+5 |
|/ | | | | firehose. Don't let it. | ||||
* | missing include | friendica | 2015-03-10 | 1 | -0/+1 |
| | |||||
* | channel delegation | friendica | 2015-03-10 | 8 | -23/+117 |
| | |||||
* | buttons for admin_accounts + admin_channels | friendica | 2015-03-09 | 5 | -7/+14 |
| | |||||
* | increase the cell padding (any jokes about padded cells will be ignored) | friendica | 2015-03-09 | 1 | -1/+1 |
| | |||||
* | more work on queue optimisations | friendica | 2015-03-09 | 5 | -10/+43 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-09 | 1 | -2/+2 |
|\ | |||||
| * | Whoops... should've actually checked the pg manual before merging #920 :-) | Habeas Codice | 2015-03-09 | 1 | -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, ↵ | friendica | 2015-03-09 | 2 | -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. | ||||
* | whitespace | friendica | 2015-03-09 | 1 | -2/+1 |
| | |||||
* | make network page default options work more or less universally instead of ↵ | friendica | 2015-03-09 | 4 | -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_merge | friendica | 2015-03-09 | 2 | -2/+5 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-09 | 2 | -51/+33 |
| |\ | |||||
| * | | make areYouSure alert also if default post perms change | Mario Vavti | 2015-03-09 | 2 | -2/+5 |
| | | | |||||
* | | | up the count of directory tags | friendica | 2015-03-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-09 | 1 | -5/+12 |
|\| | |||||
| * | add transition effect for border-color | Mario Vavti | 2015-03-09 | 1 | -1/+4 |
| | | |||||
| * | some more hover magic for field checkbox | Mario Vavti | 2015-03-09 | 1 | -5/+9 |
| | | |||||
* | | Allow site to over-ride directory options. Bugger off. | friendica | 2015-03-09 | 2 | -51/+33 |
|/ | |||||
* | fix comanche regions after comanche refactor a few days ago | friendica | 2015-03-09 | 2 | -1/+2 |
| | |||||
* | Merge pull request #921 from solstag/closenessfix | RedMatrix | 2015-03-09 | 1 | -1/+1 |
|\ | | | | | Fix missing value in insert for default closeness | ||||
| * | Fix missing value in insert for default closeness | Alexandre Hannud Abdo | 2015-03-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #920 from dawnbreak/master | habeascodice | 2015-03-08 | 4 | -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 Weidenbach | 2015-03-08 | 2 | -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 Weidenbach | 2015-03-08 | 3 | -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. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-08 | 4 | -41/+24 |
|\ \ | |||||
| * | | add hover effect to checkbox field | Mario Vavti | 2015-03-08 | 1 | -0/+5 |
| | | | |||||
| * | | remove unused variables | Mario Vavti | 2015-03-08 | 1 | -5/+0 |
| | | | |||||
| * | | copy/paste typo | Mario Vavti | 2015-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-08 | 5 | -10/+15 |
| |\ \ | |||||
| * | | | port boxy scheme | Mario Vavti | 2015-03-08 | 4 | -36/+19 |
| | |/ | |/| | |||||
* | | | change default affinity (abook_closeness) to 80 for all new connections ↵ | friendica | 2015-03-08 | 4 | -4/+22 |
| |/ |/| | | | | | going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness | ||||
* | | add reddress to profile - but all is not as it seems. Copy to clipboard is ↵ | friendica | 2015-03-07 | 3 | -6/+9 |
| | | | | | | | | blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-07 | 2 | -4/+0 |
|\| | |||||
| * | hopefully fix #919 | Mario Vavti | 2015-03-07 | 2 | -4/+0 |
| | | |||||
* | | directory: fix public forum listing | friendica | 2015-03-07 | 2 | -4/+6 |
|/ | |||||
* | when fixing "naked links" make sure not to double link double urls as seen ↵ | friendica | 2015-03-06 | 2 | -2/+2 |
| | | | | in archive.org - which has the complete unescaped target url, scheme and all, as part of its own. | ||||
* | remove unused var | Mario Vavti | 2015-03-06 | 1 | -2/+0 |
| | |||||
* | add more css files | Mario Vavti | 2015-03-06 | 7 | -9/+39 |
| | |||||
* | if we have not got a schema also look for default.css | Mario Vavti | 2015-03-06 | 1 | -8/+12 |
| | |||||
* | create schema/dark.css and create a sample | Mario Vavti | 2015-03-06 | 5 | -8/+17 |
| | |||||
* | narrow navbar fixes | Mario Vavti | 2015-03-06 | 1 | -27/+58 |
| |