| Commit message (Expand) | Author | Age | Files | Lines |
* | make nav badges big enough to be clickable on small touch devices | friendica | 2015-03-13 | 1 | -0/+5 |
* | invoke tgroup_check() on diaspora posts/comments in case the recipient is a f... | friendica | 2015-03-13 | 1 | -19/+34 |
* | update to-do list | friendica | 2015-03-13 | 3 | -3962/+2153 |
* | revert that | friendica | 2015-03-12 | 1 | -4/+25 |
* | try to allow translation of ax regs | friendica | 2015-03-12 | 1 | -29/+52 |
* | support a fair number of the common AX regs | friendica | 2015-03-12 | 1 | -5/+68 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-12 | 3 | -68/+99 |
|\ |
|
| * | Merge pull request #927 from dawnbreak/master | RedMatrix | 2015-03-13 | 3 | -68/+99 |
| |\ |
|
| | * | Some cleanups. | Klaus Weidenbach | 2015-03-13 | 3 | -68/+99 |
* | | | Add some AX vars to openid server. | friendica | 2015-03-12 | 1 | -11/+28 |
|/ / |
|
* | | more JS=1 weirdness | friendica | 2015-03-12 | 1 | -1/+1 |
* | | reduce the occurrence of duplicated notice() messages | friendica | 2015-03-12 | 1 | -5/+8 |
* | | prepare for demise of google code | friendica | 2015-03-12 | 2 | -1/+9 |
* | | try and add some regs | friendica | 2015-03-12 | 2 | -1/+3 |
* | | Merge pull request #926 from dawnbreak/master | Klaus | 2015-03-12 | 1 | -56/+46 |
|\| |
|
| * | Fix JavaScript problems on channels where you are not allowed to upload photos. | Klaus Weidenbach | 2015-03-12 | 1 | -56/+46 |
|/ |
|
* | add generic_addon_settings template and minor fixes | Mario Vavti | 2015-03-12 | 3 | -2/+19 |
* | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-12 | 1 | -1/+1 |
|\ |
|
| * | substr() is a mysql alias for substring(). substring() is in the SQL standard... | Habeas Codice | 2015-03-12 | 1 | -1/+1 |
* | | some work on feature/addon settings | Mario Vavti | 2015-03-12 | 3 | -43/+32 |
|/ |
|
* | openid stuff | friendica | 2015-03-11 | 2 | -36/+50 |
* | Merge branch 'master' into openid | friendica | 2015-03-11 | 14 | -25/+105 |
|\ |
|
| * | remove the now redundant audio/video buttons and label the editor text style ... | friendica | 2015-03-11 | 8 | -11/+36 |
| * | Merge pull request #925 from unary/fixinsert | RedMatrix | 2015-03-12 | 1 | -1/+1 |
| |\ |
|
| | * | add missing %d for abook_closeness | Michael Johnston | 2015-03-11 | 1 | -1/+1 |
| * | | make embeds bookmarkable | friendica | 2015-03-11 | 1 | -1/+1 |
| * | | turn parse_url into the definitive url attaching mechanism | friendica | 2015-03-11 | 2 | -3/+35 |
| * | | parse_url changes for oembed/zvideo/etc. | friendica | 2015-03-11 | 1 | -8/+22 |
| |/ |
|
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-11 | 1 | -1/+4 |
| |\ |
|
| | * | update sample-nginx.conf redirect to check for args | Mario Vavti | 2015-03-11 | 1 | -1/+4 |
| * | | don't relay diaspora comments to sys channel | friendica | 2015-03-11 | 1 | -0/+6 |
| |/ |
|
* | | Merge branch 'master' into openid | friendica | 2015-03-11 | 12 | -177/+16 |
|\| |
|
| * | skip trying to come up with an intelligent way to decide what photos should g... | friendica | 2015-03-11 | 2 | -20/+2 |
| * | cleanup of old delegation stuff | friendica | 2015-03-10 | 6 | -152/+5 |
| * | allow urls using the zot: or zots: URL schemes to exist without getting filte... | friendica | 2015-03-10 | 1 | -1/+1 |
| * | sql optimisation for affinity searches. A new index was added which wasn't ad... | friendica | 2015-03-10 | 3 | -4/+8 |
* | | openid server | friendica | 2015-03-11 | 1 | -0/+237 |
* | | first cut openid server. Mostly just getting it architecturally prepared - as... | friendica | 2015-03-10 | 1 | -1/+1 |
|/ |
|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-10 | 1 | -31/+58 |
|\ |
|
| * | Merge pull request #923 from dawnbreak/master | RedMatrix | 2015-03-11 | 1 | -31/+58 |
| |\ |
|
| | * | Fix SQL query for removing orphan hooks. | Klaus Weidenbach | 2015-03-10 | 1 | -31/+58 |
* | | | Change logic of "don't create a status post for this photo upload" and turn i... | friendica | 2015-03-10 | 5 | -15/+8 |
|/ / |
|
* | | Merge pull request #922 from dawnbreak/master | RedMatrix | 2015-03-11 | 2 | -80/+77 |
|\| |
|
| * | View upload photo button only if you have permission. | Klaus Weidenbach | 2015-03-10 | 2 | -80/+77 |
|/ |
|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-10 | 2 | -8/+65 |
|\ |
|
| * | collapse jot tools to submenu on small and extra small screens | Mario Vavti | 2015-03-10 | 2 | -8/+65 |
* | | diaspora's spammy permission model seems to have leaked through our firehose.... | friendica | 2015-03-10 | 1 | -2/+5 |
|/ |
|
* | missing include | friendica | 2015-03-10 | 1 | -0/+1 |
* | channel delegation | friendica | 2015-03-10 | 8 | -23/+117 |
* | buttons for admin_accounts + admin_channels | friendica | 2015-03-09 | 5 | -7/+14 |