Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | only list undeleted hublocs in zot_finger | friendica | 2013-11-28 | 1 | -4/+7 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-28 | 2 | -3488/+3481 |
|\ | |||||
| * | Merge pull request #217 from omigeot/master | friendica | 2013-11-28 | 2 | -3488/+3481 |
| |\ | | | | | | | Plurals for conversation.php | ||||
| | * | Plurals for conversation.php | Olivier Migeot | 2013-11-28 | 2 | -3488/+3481 |
| |/ | |||||
* / | zot doco | friendica | 2013-11-28 | 1 | -17/+96 |
|/ | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-28 | 1 | -2/+14 |
|\ | |||||
| * | Merge pull request #216 from omigeot/master | friendica | 2013-11-27 | 1 | -2/+14 |
| |\ | | | | | | | Make CSS classes for ACL "lock" icon customizable | ||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Olivier Migeot | 2013-11-28 | 1 | -0/+101 |
| | |\ | | |/ | |/| | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Olivier Migeot | 2013-11-27 | 2 | -23/+10 |
| | |\ | |||||
| | * | | Quick hack to allow themes/modules to use different CSS classes for the ACL ↵ | Olivier Migeot | 2013-11-27 | 1 | -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 wp | friendica | 2013-11-28 | 3 | -1/+44 |
|/ / / | |||||
* | | | add photos to red-to-wordpress comments | friendica | 2013-11-27 | 1 | -0/+20 |
| | | | |||||
* | | | add xmlrpc method for importing red comments | friendica | 2013-11-27 | 1 | -0/+81 |
| |/ |/| | |||||
* | | reduce the likelihood that a given channel will have 30-40 valid hublocs ↵ | friendica | 2013-11-27 | 2 | -23/+10 |
|/ | | | | with the same hubloc_url. | ||||
* | re-enable jquery migration tool until we sort out all the issues | friendica | 2013-11-27 | 2 | -3/+3 |
| | |||||
* | more loop prevention | friendica | 2013-11-26 | 1 | -0/+8 |
| | |||||
* | ensure that drop_item doesn't recurse | friendica | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | add terms and categories, fix a delivery loop (stops at one cycle but we ↵ | friendica | 2013-11-26 | 1 | -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 ↵ | friendica | 2013-11-26 | 1 | -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 side | friendica | 2013-11-26 | 2 | -25/+65 |
| | |||||
* | api fixes | friendica | 2013-11-26 | 2 | -5/+22 |
| | |||||
* | allow editing posts on connectors that support edits | friendica | 2013-11-26 | 1 | -1/+3 |
| | |||||
* | add drop_item hook | friendica | 2013-11-26 | 1 | -0/+3 |
| | |||||
* | create jquery-compat to hold deprecated jquery functions, load it before all ↵ | friendica | 2013-11-26 | 5 | -44/+77 |
| | | | | the dependent js scripts | ||||
* | will be doing some stuff for which handcrafting xmlrpc requests is too ↵ | friendica | 2013-11-26 | 1 | -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 ↵ | friendica | 2013-11-25 | 3 | -5/+46 |
| | | | | can turn off the migration toolkit. | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-25 | 1 | -0/+1 |
|\ | |||||
| * | no underlined drop icon | 23n | 2013-11-25 | 1 | -0/+1 |
| | | |||||
* | | sort out the preview icons | friendica | 2013-11-25 | 4 | -5/+9 |
| | | |||||
* | | wp-to-red: now supports editing, titles, and native permalinks | friendica | 2013-11-25 | 2 | -3/+21 |
|/ | |||||
* | Merge pull request #215 from git-marijus/master | friendica | 2013-11-25 | 1 | -30/+24 |
|\ | | | | | polish up share button a little | ||||
| * | polish up share button a little | marijus | 2013-11-25 | 1 | -30/+24 |
|/ | |||||
* | Merge pull request #214 from tuscanhobbit/master | friendica | 2013-11-25 | 3 | -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 summary | tuscanhobbit | 2013-11-24 | 3 | -15/+16 |
| | | |||||
* | | force HTML notification mails to use predefined colours. | friendica | 2013-11-25 | 2 | -2/+2 |
| | | |||||
* | | wordpress publish hook was called before the meta storage hook so the plugin ↵ | friendica | 2013-11-24 | 1 | -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 ↵ | friendica | 2013-11-24 | 2 | -1/+15 |
| | | | | | | | | to send comments | ||||
* | | wordpress-to-red cross-posting tool ported from Friendica | friendica | 2013-11-24 | 2 | -0/+325 |
| | | |||||
* | | add recipient name to the rest of the notification emails | friendica | 2013-11-24 | 2 | -38/+48 |
| | | |||||
* | | Merge pull request #213 from tuscanhobbit/master | friendica | 2013-11-23 | 8 | -16/+14 |
|\| | | | | | replaced icons and shade of red | ||||
| * | redbasic nav bar gradient is now similar to the red shade in the logo | tuscanhobbit | 2013-11-23 | 1 | -8/+6 |
| | | |||||
| * | replaced rhash icon | tuscanhobbit | 2013-11-23 | 7 | -8/+8 |
| | | |||||
* | | Merge pull request #212 from tuscanhobbit/master | friendica | 2013-11-23 | 2 | -8/+11 |
|\| | | | | | a reference to account_id was missing in user admin table | ||||
| * | a reference to account_id was missing in user admin table | tuscanhobbit | 2013-11-23 | 2 | -8/+11 |
|/ | |||||
* | rev update | friendica | 2013-11-23 | 1 | -1/+1 |
| | |||||
* | Merge pull request #210 from git-marijus/master | friendica | 2013-11-23 | 1 | -2/+2 |
|\ | | | | | make profile-jot-text and -title height scalable | ||||
| * | make profile-jot-text and -title height scalable | marijus | 2013-11-23 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #209 from git-marijus/master | friendica | 2013-11-23 | 1 | -2/+14 |
|\| | | | | | make profile-jot-text placeholder more prominent | ||||
| * | make profile-jot-text placeholder more prominent | marijus | 2013-11-23 | 1 | -2/+14 |
| | | |||||
* | | Merge pull request #207 from git-marijus/master | friendica | 2013-11-23 | 4 | -10/+17 |
|\| | | | | | search should respect max items to load as well |