| Commit message (Expand) | Author | Age | Files | Lines |
* | prevent posting before acl got populated since this will disregard the defaul... | marijus | 2014-11-08 | 6 | -10/+11 |
* | Merge pull request #680 from pafcu/master | RedMatrix | 2014-11-09 | 2 | -2/+6 |
|\ |
|
| * | Fix merge conflict | Stefan Parviainen | 2014-11-08 | 315 | -13484/+19854 |
| |\
| |/
|/| |
|
* | | Document reinstalling, or saying don't do that without explicitly stating don... | Thomas Willingham | 2014-11-08 | 1 | -2/+10 |
* | | Merge pull request #678 from zzottel/master | zzottel | 2014-11-07 | 2 | -3/+4 |
|\ \ |
|
| * | | update to German help files | zottel | 2014-11-07 | 2 | -3/+4 |
* | | | Merge pull request #677 from zzottel/master | zzottel | 2014-11-07 | 2 | -6218/+6443 |
|\| | |
|
| * | | update to German strings | zottel | 2014-11-07 | 2 | -6218/+6443 |
|/ / |
|
* | | tgroup_check - decrypt if obscured before checking body text for reshares | friendica | 2014-11-07 | 1 | -1/+9 |
* | | revert that bit | friendica | 2014-11-07 | 1 | -7/+1 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 2 | -6/+7 |
|\ \ |
|
| * | | provide lockstate for photo edit | marijus | 2014-11-07 | 2 | -6/+7 |
* | | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 |
* | | | rev update | friendica | 2014-11-07 | 2 | -522/+609 |
* | | | doc updates | friendica | 2014-11-07 | 102 | -406/+1576 |
|/ / |
|
* | | include self in load_contact_links so you don't get a connect menu entry for ... | friendica | 2014-11-06 | 1 | -3/+2 |
* | | Merge pull request #676 from magicoli/master | RedMatrix | 2014-11-07 | 2 | -6/+6 |
|\ \ |
|
| * | | fix nbsp tag typoes in french translation | Olivier van Helden (hal) | 2014-11-07 | 2 | -6/+6 |
|/ / |
|
* | | visible flag reversed | friendica | 2014-11-06 | 1 | -1/+1 |
* | | Provide a way to mark photos as adult and hide them from the default album vi... | friendica | 2014-11-06 | 4 | -32/+45 |
* | | Merge pull request #675 from zzottel/master | RedMatrix | 2014-11-07 | 1 | -3/+3 |
|\ \ |
|
| * | | don't overwrite $x (contains import_xchan result) with role permissions | zottel | 2014-11-06 | 1 | -3/+3 |
|/ / |
|
* | | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 |
* | | make sure the "tagcloud" actually shows hashtags. So we don't confuse folks w... | friendica | 2014-11-06 | 1 | -1/+1 |
* | | category tagblock | friendica | 2014-11-06 | 3 | -1/+34 |
* | | logging changes, untranslated string | friendica | 2014-11-05 | 2 | -4/+4 |
* | | crude skeleton for location manager and the UI sucks but at least it's on a w... | friendica | 2014-11-05 | 3 | -28/+71 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-05 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge pull request #674 from pafcu/master | RedMatrix | 2014-11-06 | 1 | -1/+1 |
| |\ \ |
|
* | | | | some minor cleanup of unreported (and as yet undiscovered) issues with permis... | friendica | 2014-11-05 | 4 | -3/+7 |
|/ / / |
|
* | | | release the navbar in landscape mode on small devices | marijus | 2014-11-05 | 1 | -0/+7 |
* | | | changed notification description | friendica | 2014-11-04 | 1 | -1/+1 |
* | | | minor adjustments to make the form work as designed | friendica | 2014-11-04 | 2 | -8/+12 |
* | | | ok heads up - potentially destabilising change. I've tried to sort out all th... | friendica | 2014-11-04 | 10 | -42/+81 |
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-04 | 1 | -11/+0 |
|\ \ \ |
|
| * | | | Remove legacy custom/ | Thomas Willingham | 2014-11-04 | 1 | -11/+0 |
* | | | | configurable visual alerts/notifications | friendica | 2014-11-04 | 5 | -73/+206 |
|/ / / |
|
* | | | it appears bootbox was lost in a bootstrap upgrade | friendica | 2014-11-04 | 3 | -1/+901 |
* | | | class > id mixup | marijus | 2014-11-04 | 1 | -1/+1 |
* | | | missing </div> | marijus | 2014-11-04 | 1 | -2/+3 |
* | | | wall posted comment to a top-level wall post which arrived via a route (e.g. ... | friendica | 2014-11-03 | 1 | -0/+3 |
* | | | posted-date-selector - spacing was slightly off in dropdown entries | friendica | 2014-11-03 | 1 | -0/+4 |
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-03 | 5 | -91/+99 |
|\ \ \ |
|
| * | | | innodb issue | Thomas Willingham | 2014-11-03 | 1 | -2/+3 |
| * | | | one </div> to much and css fixes | marijus | 2014-11-03 | 2 | -79/+79 |
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-11-03 | 3 | -1/+377 |
| |\ \ \ |
|
| * | | | | if uploading a photo go away to album | marijus | 2014-11-03 | 1 | -2/+7 |
| * | | | | if deleting a photo go away to album | marijus | 2014-11-03 | 2 | -8/+10 |
* | | | | | various UI issues related to having an enormous number of entries in the post... | friendica | 2014-11-03 | 3 | -5/+47 |
| |/ / /
|/| | | |
|
* | | | | provide example import script | friendica | 2014-11-03 | 3 | -1/+377 |
|/ / / |
|