aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-11-281-2/+14
|\
| * Merge pull request #216 from omigeot/masterfriendica2013-11-271-2/+14
| |\ | | | | | | Make CSS classes for ACL "lock" icon customizable
| | * 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 ↵Olivier Migeot2013-11-271-2/+14
| | | | | | | | | | | | | | | | selector's icon (e.g. icon-lock/icon-unlock instead of lock/unlock). Unless a theme supports it, they'll stay at their former values. Dunno if it's the best way to achieve this, though.
* | | | 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 ↵friendica2013-11-272-23/+10
|/ | | | with the same hubloc_url.
* 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 ↵friendica2013-11-261-1/+1
| | | | don't need a post coming back that we just sent out).
* link the plugins at both ends so that each can discover a post that was ↵friendica2013-11-261-11/+6
| | | | imported/exported to/from the other and keep track of updates accordingly
* 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
| | | | the dependent js scripts
* will be doing some stuff for which handcrafting xmlrpc requests is too ↵friendica2013-11-261-0/+1371
| | | | bloody painful. xmlrpc is long dead, but it's the language of wordpress - which is far from dead.
* make font-asewome optional. Also include jquery.browser in js/main.js so we ↵friendica2013-11-253-5/+46
| | | | can turn off the migration toolkit.
* 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 little
| * 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 and ID, minor changes to admin summary table
| * 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
| | | | | | | | would only work on edited posts. This may be a wordpress version issue because you'd think somebody would've noticed it before.
* | Add some message_id meta information for wordpress posts so we'll know where ↵friendica2013-11-242-1/+15
| | | | | | | | to send comments
* | 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
|\| | | | | replaced icons and shade of red
| * 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 table
| * 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 scalable
| * 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 prominent
| * make profile-jot-text placeholder more prominentmarijus2013-11-231-2/+14
| |
* | Merge pull request #207 from git-marijus/masterfriendica2013-11-234-10/+17
|\| | | | | search should respect max items to load as well
| * typomarijus2013-11-231-1/+1
| |
| * use placeholder for profile-jot-text and some minor alignmentmarijus2013-11-232-4/+5
| |
| * use same font for textarea aswell and some simplificationmarijus2013-11-221-5/+8
| |
| * missing input type and use same font for password and text inputmarijus2013-11-222-4/+5
| |
| * Merge branch 'master' of https://github.com/friendica/redmarijus2013-11-2269-607/+1825
| |\