aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-10-133-7/+12
|\
| * Merge pull request #179 from git-marijus/masterfriendica2013-10-132-3/+8
| |\ | | | | | | reorder items in private-mail - the delete button is on the right side e...
| | * reorder items in private-mail - the delete button is on the right side ↵marijus2013-10-132-3/+8
| |/ | | | | | | everywhere else...
| * Merge pull request #178 from cvogeley/masterfriendica2013-10-121-3/+3
| |\ | | | | | | New icons in private mails section
| | * New icons in private mails sectionChristian Vogeley2013-10-131-3/+3
| | |
* | | remove the disabled flag on individual permissions and improve the text to ↵friendica2013-10-134-3/+11
|/ / | | | | | | | | | | show that settings may be inherited. The reason for this change is that we want the individual settings to be stored regardless of the inherited settings, because if somebody changes the higher precedence privacy settings it could leave all their existing contacts with no permissions and this could be a support nightmare. So this way if somebody starts off with "anybody on the network can send me their stream and posts" and later changes it to "only specific connections can send me their stream and posts", the individual setting will already be set for all their connections. The previous behaviour is that this setting would have been disabled so none of their existing connections will have this specific permission. Old-timers who were here and made lots of connections before this commit - will have to edit all their connections if they change their privacy settings from lesser restrictive to be more restrictive.
* | Merge https://github.com/friendica/red into zpullfriendica2013-10-123-2402/+2872
|\ \
| * \ Merge pull request #177 from tuscanhobbit/masterfriendica2013-10-122-2401/+2871
| |\ \ | | |/ | |/| Updated italian translation
| | * updated italian translationtuscanhobbit2013-10-122-183/+294
| | |
| | * Update italian translationp.tacconi2013-10-112-2375/+2734
| | |
| | * Merge pull request #2 from friendica/masterPaolo T2013-10-11620-15378/+50942
| | |\ | | | | | | | | Upgraded to latest red
| * | \ Merge pull request #176 from oohlaf/fixesOlaf Conradi2013-10-121-1/+1
| |\ \ \ | | | | | | | | | | Typo in replaced variable for #getzot
| | * | | Typo in replaced variableOlaf Conradi2013-10-121-1/+1
| |/ / /
* / / / directory date order (sort=date)friendica2013-10-121-1/+1
|/ / /
* | | show private message conversant in sidebar because without a reply you may ↵friendica2013-10-124-3/+15
| | | | | | | | | | | | not remember who it is/was.
* | | mail recallfriendica2013-10-114-1/+36
| | |
* | | more iconsfriendica2013-10-113-4/+3
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2013-10-115-21/+37
|\ \ \
| * \ \ Merge pull request #174 from zzottel/masterfriendica2013-10-111-1/+1
| |\ \ \ | | | | | | | | | | fix alt_pager to work if item count is higher than page['itemspage'] (th...
| | * | | fix alt_pager to work if item count is higher than page['itemspage'] (threads)zottel2013-10-111-1/+1
| | | |/ | | |/|
| * | | Dark schema, and associated fixes.Thomas Willingham2013-10-113-19/+35
| | | |
| * | | TypoThomas Willingham2013-10-111-1/+1
| |/ /
* | | bug 175 - categories not updated when editingfriendica2013-10-113-159/+234
| | |
* | | doc updatesfriendica2013-10-11107-410/+2650
|/ /
* | fix search to display more than one itemfriendica2013-10-101-3/+3
| |
* | more readability improvementsfriendica2013-10-101-2/+2
| |
* | set the colour of the active nav element so it doesn't get washed outfriendica2013-10-104-18/+24
| |
* | Easier to load a chosen schema if one has a chosen schema to load...friendica2013-10-101-0/+1
| |
* | fix blue lockfriendica2013-10-101-0/+5
| |
* | Merge https://github.com/friendica/red into zpullfriendica2013-10-107-962/+1123
|\ \
| * \ Merge pull request #173 from beardy-unixer/masterfriendica2013-10-101-0/+6
| |\ \ | | | | | | | | Don't send a quintillion emails every time mysql restarts.
| | * | Don't send a quintillion emails every time mysql restarts.Thomas Willingham2013-10-101-0/+6
| | | |
| * | | Add "scheme default" button for nav colours.Thomas Willingham2013-10-101-0/+1
| |/ /
| * | *sigh* I swear I DID test this first...Thomas Willingham2013-10-101-2/+2
| | |
| * | Various schema issues.Thomas Willingham2013-10-104-22/+22
| | |
| * | But remember to set the expert flagThomas Willingham2013-10-101-0/+4
| | |
| * | Basic schema support - but no actual schemas.Thomas Willingham2013-10-103-3/+45
| | |
| * | Merge pull request #170 from git-marijus/masterfriendica2013-10-101-2/+2
| |\ \ | | | | | | | | get rid of the clean font because it looks weird in some browsers
| | * | get rid of the clean font because it looks weird in some browsersmarijus2013-10-101-2/+2
| | | |
| * | | Merge pull request #172 from tobiasd/DE20131010atobiasd2013-10-103-7819/+1076
| |\ \ \ | | | | | | | | | | DE: update to the strings (for real)
| | * | | DE: update to the strings (for real)Tobias Diekershoff2013-10-103-7819/+1076
| |/ / /
| * | | Merge pull request #171 from tobiasd/DE20131010tobiasd2013-10-102-23/+6874
| |\ \ \ | | |/ / | |/| | DE: update to the strings
| | * | DE: update to the stringsTobias Diekershoff2013-10-102-23/+6874
| |/ /
* / / Add install instructions for cloning WebDAV component (which I think is best ↵friendica2013-10-102-0/+27
|/ / | | | | | | if we make optional). There may be webserver dependencies so let's just call this a plugin of sorts, but different than normal plugins because if it's installed it will be tightly integrated with everything we do. Eventually we may provide a static repository or select a specific sabre-dav version so that we're immune from changes upstream which break stuff we're doing; but for now we'll use the fruux main repository and install using the trunk.
* | more icon tweaks - this could be going on for some time; try to get icon ↵friendica2013-10-105-9/+9
| | | | | | | | code (and all theme stuff) out of main code and into templates, but on the short term provide both so nothing breaks.
* | more icon conversions - savedsearch listings need more work. The drop icon ↵friendica2013-10-094-13/+13
| | | | | | | | should be hidden unless the entry is being hovered.
* | delete iconsfriendica2013-10-092-1/+10
| |
* | more redbasic icon workfriendica2013-10-093-6/+11
| |
* | Merge pull request #169 from git-marijus/masterfriendica2013-10-092-16/+12
|\ \ | | | | | | pimp up the searchbar a little and hoping it is the right way to do it...
| * | might be better that waymarijus2013-10-091-4/+2
| | |