aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* only list undeleted hublocs in zot_fingerfriendica2013-11-281-4/+7
* Merge https://github.com/friendica/red into zpullfriendica2013-11-282-3488/+3481
|\
| * Merge pull request #217 from omigeot/masterfriendica2013-11-282-3488/+3481
| |\
| | * Plurals for conversation.phpOlivier Migeot2013-11-282-3488/+3481
| |/
* / zot docofriendica2013-11-281-17/+96
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-11-281-2/+14
|\
| * Merge pull request #216 from omigeot/masterfriendica2013-11-271-2/+14
| |\
| | * Merge branch 'master' of https://github.com/friendica/redOlivier Migeot2013-11-281-0/+101
| | |\ | | |/ | |/|
| | * Merge branch 'master' of https://github.com/friendica/redOlivier Migeot2013-11-272-23/+10
| | |\
| | * | Quick hack to allow themes/modules to use different CSS classes for the ACL s...Olivier Migeot2013-11-271-2/+14
* | | | synchronise deletion of comments between red and wpfriendica2013-11-283-1/+44
|/ / /
* | | add photos to red-to-wordpress commentsfriendica2013-11-271-0/+20
* | | add xmlrpc method for importing red commentsfriendica2013-11-271-0/+81
| |/ |/|
* | reduce the likelihood that a given channel will have 30-40 valid hublocs with...friendica2013-11-272-23/+10
|/
* re-enable jquery migration tool until we sort out all the issuesfriendica2013-11-272-3/+3
* more loop preventionfriendica2013-11-261-0/+8
* ensure that drop_item doesn't recursefriendica2013-11-261-1/+1
* add terms and categories, fix a delivery loop (stops at one cycle but we don'...friendica2013-11-261-1/+1
* link the plugins at both ends so that each can discover a post that was impor...friendica2013-11-261-11/+6
* delete from the wp side as well as from the red sidefriendica2013-11-262-25/+65
* api fixesfriendica2013-11-262-5/+22
* allow editing posts on connectors that support editsfriendica2013-11-261-1/+3
* add drop_item hookfriendica2013-11-261-0/+3
* create jquery-compat to hold deprecated jquery functions, load it before all ...friendica2013-11-265-44/+77
* will be doing some stuff for which handcrafting xmlrpc requests is too bloody...friendica2013-11-261-0/+1371
* make font-asewome optional. Also include jquery.browser in js/main.js so we c...friendica2013-11-253-5/+46
* Merge https://github.com/friendica/red into zpullfriendica2013-11-251-0/+1
|\
| * no underlined drop icon23n2013-11-251-0/+1
* | sort out the preview iconsfriendica2013-11-254-5/+9
* | wp-to-red: now supports editing, titles, and native permalinksfriendica2013-11-252-3/+21
|/
* Merge pull request #215 from git-marijus/masterfriendica2013-11-251-30/+24
|\
| * polish up share button a littlemarijus2013-11-251-30/+24
|/
* Merge pull request #214 from tuscanhobbit/masterfriendica2013-11-253-15/+16
|\
| * admin user table now shows the channel list, minor changes to summarytuscanhobbit2013-11-243-15/+16
* | force HTML notification mails to use predefined colours.friendica2013-11-252-2/+2
* | wordpress publish hook was called before the meta storage hook so the plugin ...friendica2013-11-241-5/+14
* | Add some message_id meta information for wordpress posts so we'll know where ...friendica2013-11-242-1/+15
* | wordpress-to-red cross-posting tool ported from Friendicafriendica2013-11-242-0/+325
* | add recipient name to the rest of the notification emailsfriendica2013-11-242-38/+48
* | Merge pull request #213 from tuscanhobbit/masterfriendica2013-11-238-16/+14
|\|
| * redbasic nav bar gradient is now similar to the red shade in the logotuscanhobbit2013-11-231-8/+6
| * replaced rhash icontuscanhobbit2013-11-237-8/+8
* | Merge pull request #212 from tuscanhobbit/masterfriendica2013-11-232-8/+11
|\|
| * a reference to account_id was missing in user admin tabletuscanhobbit2013-11-232-8/+11
|/
* rev updatefriendica2013-11-231-1/+1
* Merge pull request #210 from git-marijus/masterfriendica2013-11-231-2/+2
|\
| * make profile-jot-text and -title height scalablemarijus2013-11-231-2/+2
* | Merge pull request #209 from git-marijus/masterfriendica2013-11-231-2/+14
|\|
| * make profile-jot-text placeholder more prominentmarijus2013-11-231-2/+14
* | Merge pull request #207 from git-marijus/masterfriendica2013-11-234-10/+17
|\|