aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #680 from pafcu/masterRedMatrix2014-11-092-2/+6
|\
| * Fix merge conflictStefan Parviainen2014-11-08315-13484/+19854
| |\ | |/ |/|
* | Document reinstalling, or saying don't do that without explicitly stating don...Thomas Willingham2014-11-081-2/+10
* | Merge pull request #678 from zzottel/masterzzottel2014-11-072-3/+4
|\ \
| * | update to German help fileszottel2014-11-072-3/+4
* | | Merge pull request #677 from zzottel/masterzzottel2014-11-072-6218/+6443
|\| |
| * | update to German stringszottel2014-11-072-6218/+6443
|/ /
* | tgroup_check - decrypt if obscured before checking body text for resharesfriendica2014-11-071-1/+9
* | revert that bitfriendica2014-11-071-7/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-072-6/+7
|\ \
| * | provide lockstate for photo editmarijus2014-11-072-6/+7
* | | fix broken photo edits when adult flag is changedfriendica2014-11-071-8/+7
* | | rev updatefriendica2014-11-072-522/+609
* | | doc updatesfriendica2014-11-07102-406/+1576
|/ /
* | include self in load_contact_links so you don't get a connect menu entry for ...friendica2014-11-061-3/+2
* | Merge pull request #676 from magicoli/masterRedMatrix2014-11-072-6/+6
|\ \
| * | fix nbsp tag typoes in french translationOlivier van Helden (hal)2014-11-072-6/+6
|/ /
* | visible flag reversedfriendica2014-11-061-1/+1
* | Provide a way to mark photos as adult and hide them from the default album vi...friendica2014-11-064-32/+45
* | Merge pull request #675 from zzottel/masterRedMatrix2014-11-071-3/+3
|\ \
| * | don't overwrite $x (contains import_xchan result) with role permissionszottel2014-11-061-3/+3
|/ /
* | provide a lockstate for photo uploadsmarijus2014-11-061-1/+4
* | make sure the "tagcloud" actually shows hashtags. So we don't confuse folks w...friendica2014-11-061-1/+1
* | category tagblockfriendica2014-11-063-1/+34
* | logging changes, untranslated stringfriendica2014-11-052-4/+4
* | crude skeleton for location manager and the UI sucks but at least it's on a w...friendica2014-11-053-28/+71
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-051-1/+1
|\ \
| * \ Merge pull request #674 from pafcu/masterRedMatrix2014-11-061-1/+1
| |\ \
* | | | some minor cleanup of unreported (and as yet undiscovered) issues with permis...friendica2014-11-054-3/+7
|/ / /
* | | release the navbar in landscape mode on small devicesmarijus2014-11-051-0/+7
* | | changed notification descriptionfriendica2014-11-041-1/+1
* | | minor adjustments to make the form work as designedfriendica2014-11-042-8/+12
* | | ok heads up - potentially destabilising change. I've tried to sort out all th...friendica2014-11-0410-42/+81
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-041-11/+0
|\ \ \
| * | | Remove legacy custom/Thomas Willingham2014-11-041-11/+0
* | | | configurable visual alerts/notificationsfriendica2014-11-045-73/+206
|/ / /
* | | it appears bootbox was lost in a bootstrap upgradefriendica2014-11-043-1/+901
* | | class > id mixupmarijus2014-11-041-1/+1
* | | missing </div>marijus2014-11-041-2/+3
* | | wall posted comment to a top-level wall post which arrived via a route (e.g. ...friendica2014-11-031-0/+3
* | | posted-date-selector - spacing was slightly off in dropdown entriesfriendica2014-11-031-0/+4
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-035-91/+99
|\ \ \
| * | | innodb issueThomas Willingham2014-11-031-2/+3
| * | | one </div> to much and css fixesmarijus2014-11-032-79/+79
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-033-1/+377
| |\ \ \
| * | | | if uploading a photo go away to albummarijus2014-11-031-2/+7
| * | | | if deleting a photo go away to albummarijus2014-11-032-8/+10
* | | | | various UI issues related to having an enormous number of entries in the post...friendica2014-11-033-5/+47
| |/ / / |/| | |
* | | | provide example import scriptfriendica2014-11-033-1/+377
|/ / /
* | | php warningsfriendica2014-11-021-23/+23