aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* assets updatefriendica2014-04-282-3/+7
* minor revisionfriendica2014-04-271-1/+1
* assets updatefriendica2014-04-272-9/+7
* work tree cleanup - found these which hadn't been committed.friendica2014-04-265-0/+138
* Unfortunate omissionfriendica2014-04-261-3/+1
* got the presence bit.friendica2014-04-261-1/+1
* basic chatterbot support - though these would still require additional functi...friendica2014-04-262-1/+51
* I'm not sure I care any more.friendica2014-04-262-11/+4
* A useful hookfriendica2014-04-251-0/+5
* Set a default directory server from a hard-wired list if one was not previous...friendica2014-04-258-45/+39
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-253-2041/+2152
|\
| * quickfix for #write-pages behind navbarmarijus2014-04-241-2/+0
| * Merge pull request #429 from solstag/masterRedMatrix2014-04-242-2039/+2152
| |\
| | * update pt-br translationAlexandre Hannud Abdo2014-04-232-2039/+2152
* | | missed the string update on an earlier checkinfriendica2014-04-252-3526/+3524
* | | A future "comanche UI" is going to need lists of available building blocks. S...friendica2014-04-251-0/+25
* | | doc/strings updatefriendica2014-04-2515-21/+61
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-233-1919/+2019
|\ \
| * \ Merge pull request #430 from cvogeley/mastercvogeley2014-04-231-0/+4
| |\ \ | | |/ | |/|
| | * A bit less z-indexChristian Vogeley2014-04-231-1/+1
| | * A CSS cheat to make the item-tools usable againChristian Vogeley2014-04-231-0/+4
| * | Merge pull request #425 from tuscanhobbit/masterPaolo T2014-04-222-1919/+2015
| |\ \
| | * | IT: strings updatedPaolo Tacconi2014-04-222-1919/+2015
* | | | ability to unset a layout and subthread is probably close to working again.friendica2014-04-233-53/+151
|/ / /
* | | nb-no updatefriendica2014-04-212-2382/+2569
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-212-11/+9
|\ \ \
| * | | Attempt to reduce the support burden of access and register policy.Thomas Willingham2014-04-211-9/+9
| * | | Merge pull request #423 from cvogeley/masterRedMatrix2014-04-211-2/+0
| |\ \ \ | | | |/ | | |/|
| | * | Alignment of icons in .item-toolChristian Vogeley2014-04-211-2/+0
| |/ /
* | | Setting to undo/clear auto permissionsfriendica2014-04-214-6/+17
* | | subthread is still borked (~75% Friendica code which has never been translate...friendica2014-04-201-5/+5
|/ /
* | bring back the toolicon colourfriendica2014-04-202-11/+15
* | fix vcard truncation and escapingfriendica2014-04-202-20/+18
* | bug fix on wall-item-dislike positionfriendica2014-04-202-4/+3
* | Merge pull request #422 from cvogeley/mastercvogeley2014-04-201-1/+6
|\ \
| * | Position fix in commentsChristian Vogeley2014-04-201-1/+6
|/ /
* | this should fix mention notification that aren't plus taggedfriendica2014-04-191-4/+20
* | the comment input box is still a couple pixels off but this aligns the conver...friendica2014-04-191-2/+2
* | another minor position tweakfriendica2014-04-191-1/+1
* | minor alignment issues after the wall-item-tools button conversionfriendica2014-04-191-1/+2
* | Merge pull request #418 from jmankiewicz/mod-profpicpermRedMatrix2014-04-203-10/+133
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/red into mod-profpicpermsirius2014-04-20179-5836/+10970
| |\ \
| * | | Now we also refresh permissions after the user posted connedit.sirius2014-04-202-3/+64
| * | | Added permission handling of profile-photossirius2014-04-202-16/+29
| * | | Merging in conflictsirius2014-04-1619-94/+129
| |\ \ \
| * | | | Added hackish support for permissions-sync between profile and profile-picturessirius2014-04-142-4/+41
* | | | | Merge pull request #416 from cvogeley/masterRedMatrix2014-04-202-9/+67
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cssChristian Vogeley2014-04-201-3/+6
| * | | | ok we need that divChristian Vogeley2014-04-201-1/+1
| * | | | Add descriptions to drop downChristian Vogeley2014-04-201-7/+7