aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add republish to quick privacy settings (settings page)friendica2013-10-011-0/+4
* Merge pull request #162 from beardy-unixer/masterfriendica2013-10-015-318/+117
|\
| * Do PCSS properlyThomas Willingham2013-10-015-318/+117
| * revert thatThomas Willingham2013-10-011-1/+1
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-10-01156-1468/+4026
| |\ | |/ |/|
* | rev updatefriendica2013-10-011-1/+1
* | Merge pull request #161 from zzottel/masterfriendica2013-10-012-1/+6
|\ \
| * | Add possibility to use a block a channel menu (set channel_menublock to the l...zottel2013-10-012-1/+6
|/ /
* | add link to channel source management in settings if channel_sources feature ...friendica2013-09-301-0/+9
* | implement republish permission for use in sourced channelsfriendica2013-09-308-38/+68
* | small fixesfriendica2013-09-302-3/+12
* | directory sync - this will either work, or it won't work, or it will possibly...friendica2013-09-308-74/+225
* | there's no $a in comanche_block() (zottel)friendica2013-09-302-2/+3
* | Merge pull request #160 from oohlaf/fixesfriendica2013-09-301-5/+0
|\ \
| * | ret_secret is not usedOlaf Conradi2013-09-301-5/+0
|/ /
* | there's our directory sync packet (aka transaction log). Now we just have to ...friendica2013-09-291-4/+14
* | clean up the default page definition - get rid of right_aside which is illegalfriendica2013-09-293-7/+8
* | log any attempt to call mod_magicfriendica2013-09-291-0/+2
* | RSS feeds as channel sources. It's feasible and within reach, however there's...friendica2013-09-291-45/+35
* | remove the "Similar Interests" link until somebody makes it workfriendica2013-09-292-1/+3
* | sources management pagefriendica2013-09-296-0/+205
* | Ugh, typoThomas Willingham2013-09-291-1/+1
* | Add kdevelop files to .gitignoreThomas Willingham2013-09-291-1/+4
* | Missing includeThomas Willingham2013-09-291-1/+1
* | TypoThomas Willingham2013-09-291-1/+1
* | Issue #117Thomas Willingham2013-09-292-10/+18
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-292-3/+2
|\ \
| * | Prevent toolbar overlapping comanche nav links.Thomas Willingham2013-09-281-1/+0
| * | Fix Comanche menusThomas Willingham2013-09-281-2/+2
* | | Issue #158friendica2013-09-294-6/+13
|/ /
* | close commentfriendica2013-09-282-1/+2
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-2833-0/+1400
|\ \
| * \ Merge pull request #157 from 0xAF/masterfriendica2013-09-2833-0/+1400
| |\ \
| | * | Add colorpicker jquery plugin for themesStanislav Lechev [0xAF]2013-09-2833-0/+1400
| |/ /
* | | fix can_comment_on_post when viewing wall-to-wallfriendica2013-09-284-15/+35
* | | string updatefriendica2013-09-281-536/+589
* | | doc updatesfriendica2013-09-2869-334/+587
|/ /
* | convert to plaintext before matching words in body. Otherwise every post I ma...friendica2013-09-261-1/+5
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-263-2/+31
|\ \
| * | Actually, lets add a content wrapper while we're in there.Thomas Willingham2013-09-271-0/+2
| * | TypoThomas Willingham2013-09-271-1/+1
| * | Issue #131Thomas Willingham2013-09-272-2/+11
| * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2013-09-278-11/+39
| |\ \
| * | | Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty ce...Thomas Willingham2013-09-272-1/+19
* | | | aggregate channelsfriendica2013-09-261-26/+86
| |/ / |/| |
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-262-2/+6
|\ \ \
| * \ \ Merge pull request #155 from oohlaf/fixesOlaf Conradi2013-09-261-1/+5
| |\ \ \ | | |/ / | |/| |
| | * | Add explanation why public comments are disabled.Olaf Conradi2013-09-261-1/+5
| * | | TypoThomas Willingham2013-09-261-1/+1
* | | | structure for channel unionsfriendica2013-09-267-10/+34
|/ / /