aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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 ↵friendica2015-03-084-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 ↵friendica2015-03-073-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_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 ↵friendica2015-03-062-2/+2
| | | | in archive.org - which has the complete unescaped target url, scheme and all, as part of its own.
* remove unused varMario Vavti2015-03-061-2/+0
|
* add more css filesMario Vavti2015-03-067-9/+39
|
* if we have not got a schema also look for default.cssMario Vavti2015-03-061-8/+12
|
* create schema/dark.css and create a sampleMario Vavti2015-03-065-8/+17
|
* narrow navbar fixesMario Vavti2015-03-061-27/+58
|
* add ability to use css files with schemesMario Vavti2015-03-061-1/+9
|
* reverse smilie storage alsofriendica2015-03-063-595/+2501
|
* major cleanup of directory optionsfriendica2015-03-055-53/+42
|
* make alpahabetic searches start with Afriendica2015-03-051-5/+36
|
* reverse the logic of "don't show emoticons" setting which seems awkwardfriendica2015-03-051-1/+1
|
* straighten out some directory stuff, which required some Comanche structural ↵friendica2015-03-057-39/+106
| | | | changes
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-051-1/+2
|\
| * Merge pull request #918 from dawnbreak/masterRedMatrix2015-03-061-1/+2
| |\ | | | | | | RedDAV: fix renaming files.
| | * RedDAV: fix renaming files.Klaus2015-03-061-1/+2
| | | | | | | | | | | | How can no one have spot this bug yet?!? Is no one using WebDAV? Took me 2 days to figure out it was not my RedDAV rewrite, but that this should have never worked. :-!
* | | make destructive queue management functions an expert optionfriendica2015-03-052-2/+5
|/ /
* | should be -nefriendica2015-03-053-3/+4
| |
* | whitespace and minor restructuringMario Vavti2015-03-052-87/+82
| |
* | only show theme settings if we have any themesMario Vavti2015-03-051-0/+2
| |
* | update theme screenshotMario Vavti2015-03-051-0/+0
| |
* | restructure display settingsMario Vavti2015-03-056-88/+131
| |
* | can not use element id more than onceMario Vavti2015-03-051-1/+1
| |
* | fix theme preview image cssMario Vavti2015-03-052-2/+2
| |
* | only allow theme selection forms if there are any themes to selectMario Vavti2015-03-052-3/+6
| |
* | fix theme preview disappearingMario Vavti2015-03-051-1/+1
| |