aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* core fixes to allow statusnet connector to workfriendica2014-05-061-4/+4
|
* setup: check for open https port with an invalid cert, even if configured to ↵friendica2014-05-062-12/+26
| | | | use http. Also a bit more word-smithing on the resultant error text but it's still not perfect.
* log pickupsfriendica2014-05-051-0/+2
|
* You wouldn't think we need this text, but we really do.friendica2014-05-051-10/+13
|
* added text on concensus building and hints on when to make a feature ↵friendica2014-05-051-1/+13
| | | | optional or a plugin.
* try againfriendica2014-05-051-2/+9
|
* revertfriendica2014-05-051-1/+2
|
* improved cookie securityfriendica2014-05-051-0/+1
|
* add message_id to reshared items so that we can eventually notify the ↵friendica2014-05-052-1/+8
| | | | original poster via an activity that their item was shared.
* put permissions dialog inside the form element - should fix issue #444friendica2014-05-051-2/+2
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-05-054-34/+47
|\
| * fix some issues with nav-tabs overrides and make their background transparentmarijus2014-05-052-11/+20
| |
| * Height auto or mini-height 120px. The latter.jeroenpraat2014-05-051-2/+2
| |
| * Fixed some wrapping problems when the user has set a larger font size. And ↵jeroenpraat2014-05-053-23/+27
| | | | | | | | some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page.
* | minor text change.friendica2014-05-052-2/+2
|/
* UI for deleting chatroomsfriendica2014-05-046-7/+37
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-05-044-3/+8
|\
| * Merge pull request #442 from cvogeley/masterRedMatrix2014-05-052-1/+6
| |\ | | | | | | system notifications mark seen link
| | * Add link to system notifications pageChristian Vogeley2014-05-042-1/+5
| | | | | | | | | | | | to mark notifications seen
| | * system notifications mark seen linkChristian Vogeley2014-05-042-1/+2
| | |
| * | Merge pull request #443 from sasiflo/masterRedMatrix2014-05-051-1/+1
| |\ \ | | | | | | | | ifpending repaired again. Hope it works as intended now.
| | * | ifpending repaired again. Hope it works as intended now.sasiflo2014-05-041-1/+1
| |/ /
| * / Dark schema: Quick fix for new search dropdownjeroenpraat2014-05-041-1/+1
| |/
* / issue #432 permission changes lost editing webpage (and other non-post items)friendica2014-05-042-6/+11
|/
* hopefully this will fix itfriendica2014-05-042-3/+3
|
* Merge pull request #441 from sasiflo/masterRedMatrix2014-05-041-1/+2
|\ | | | | ifpending repaired. Show page "all contacts" directly if no pending conn...
| * ifpending repaired. Show page "all contacts" directly if no pending connections.sasiflo2014-05-041-1/+2
|/ | | | | Tried to repair. Think the merge of flags was wrong in the last commit.
* Merge pull request #440 from solstag/masterRedMatrix2014-05-042-5666/+5705
|\ | | | | Update pt-br translation.
| * Update pt-br translation.Alexandre Hannud Abdo2014-05-032-5666/+5705
|/
* Share area (jot) the same max-width as the conversation area. Please revert ↵jeroenpraat2014-05-031-0/+4
| | | | when unwanted
* Dark schema: I forgot the dropdown menu.jeroenpraat2014-05-033-0/+56
|
* fix search_item.tplmarijus2014-05-031-42/+53
|
* more easter eggsfriendica2014-05-032-1/+7
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-05-023-2/+30
|\
| * Dark schema: last bits. From now on, only updates.jeroenpraat2014-05-023-2/+28
| |
| * Dark schema: comment border fixjeroenpraat2014-05-021-0/+2
| |
* | make folks from certain other networks feel more at home herefriendica2014-05-021-0/+8
| |
* | weekly updatefriendica2014-05-0255-802/+890
|/
* and enable the colourpickerfriendica2014-05-011-1/+1
|
* missed the templatefriendica2014-05-011-0/+1
|
* make the comment border colour configurablefriendica2014-05-013-1/+8
|
* shift login box on small screensfriendica2014-05-012-1/+1
|
* allow birthdays with just a year (no month or day).friendica2014-05-012-8/+13
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-05-014-5/+13
|\
| * Merge pull request #439 from oohlaf/fixesRedMatrix2014-05-024-5/+13
| |\ | | | | | | Fix unwanted GET {0} requests
| | * Also for notifications.Olaf Conradi2014-05-022-3/+6
| | |
| | * Fix unwanted GET {0} requestsOlaf Conradi2014-05-022-2/+7
| |/ | | | | | | | | | | Because of image prefetch of browsers the <img src="{0}"> templates cause unwanted /{0} requests to the webserver. Templates are changed to use a data-src attribute.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-05-013-7/+17
|\|
| * Dark schema: there are some minor issues left, but this one should go firstjeroenpraat2014-05-013-1/+6
| |
| * A little bit less darkjeroenpraat2014-05-011-1/+1
| |