aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge conflictStefan Parviainen2014-11-08315-13484/+19854
|\
| * Document reinstalling, or saying don't do that without explicitly stating ↵Thomas Willingham2014-11-081-2/+10
| | | | | | | | don't do that.
| * Merge pull request #678 from zzottel/masterzzottel2014-11-072-3/+4
| |\ | | | | | | update to German help files
| | * update to German help fileszottel2014-11-072-3/+4
| | |
| * | Merge pull request #677 from zzottel/masterzzottel2014-11-072-6218/+6443
| |\| | | | | | | update to German strings
| | * 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
| | | | | | | | yourself
| * Merge pull request #676 from magicoli/masterRedMatrix2014-11-072-6/+6
| |\ | | | | | | fix nbsp tag typoes in french translation
| | * 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 ↵friendica2014-11-064-32/+45
| | | | | | | | view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional.
| * Merge pull request #675 from zzottel/masterRedMatrix2014-11-071-3/+3
| |\ | | | | | | don't overwrite $x (contains import_xchan result) with role permissions
| | * 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 ↵friendica2014-11-061-1/+1
| | | | | | | | with categories.
| * 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 ↵friendica2014-11-053-28/+71
| | | | | | | | webpage and you don't have to do it by hand.
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-11-051-1/+1
| |\
| | * Merge pull request #674 from pafcu/masterRedMatrix2014-11-061-1/+1
| | |\ | | | | | | | | Fix duplicate element id
| * | | some minor cleanup of unreported (and as yet undiscovered) issues with ↵friendica2014-11-054-3/+7
| |/ / | | | | | | | | | permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems.
| * | 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 ↵friendica2014-11-0410-42/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
| * | 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
| | | | | | | | | | | | was posted to a forum) had no route, hence downstream recipients report route mismatch
| * | 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 ↵friendica2014-11-033-5/+47
| | |/ / | |/| | | | | | | | | | posted_date selector including years/months that had no posts
| * | | provide example import scriptfriendica2014-11-033-1/+377
| |/ /
| * | php warningsfriendica2014-11-021-23/+23
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-026-24/+23
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 14:52:01 +0000