aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-304-910/+973
|\ \
| * | update nl + Friendica>RedMatrix in two text filesJeroen2014-08-304-910/+973
* | | insecure network filterfriendica2014-08-302-2/+41
|/ /
* | various diaspora issuesfriendica2014-08-295-22/+82
* | doc updatefriendica2014-08-2946-990/+1157
* | more queue tweaksfriendica2014-08-282-2/+2
* | the queue driver is universal now - we don't need to filter it.friendica2014-08-281-1/+1
* | except for a typofriendica2014-08-281-3/+1
* | fix saving of extended profile attributesfriendica2014-08-281-0/+38
* | lots of little Diaspora issuesfriendica2014-08-284-10/+46
* | retro-actively set standalone directory fix, also a fix for directory endless...friendica2014-08-282-1/+12
* | remove noisy log statementfriendica2014-08-281-2/+0
* | when updating the commented timestamp on the parent post (item_store) don't i...friendica2014-08-282-2/+5
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-282-11/+3
|\ \
| * \ Merge pull request #575 from encyclomundi/masterRedMatrix2014-08-291-1/+1
| |\ \
| | * | change the name of the app from Channel Select to Channel ManagerCharles2014-08-281-1/+1
| |/ /
| * | minor css fixes and cleanupmarijus2014-08-281-10/+2
* | | Ability to close comments at a certain date/time - needed for loom.io emulati...friendica2014-08-286-58/+106
|/ /
* | let's make this "specific" since that's what it is.friendica2014-08-282-1/+3
* | really really really fix lockview - maybefriendica2014-08-281-2/+3
* | consistency: the diaspora post plugin uses "diaspora_enable". The protocol dr...friendica2014-08-282-4/+4
* | make blocks, webpages, and layouts postable (pre-filled forms if supplied fro...friendica2014-08-284-10/+31
* | begin embeddable/shareable design elements (blocks, webpages, layouts, menus,...friendica2014-08-272-2/+34
* | ability to create/edit/delete custom profile field definitions - read the sou...friendica2014-08-274-1/+91
* | mind numbing drudgery continued...friendica2014-08-274-85/+76
* | Admin setting for Diaspora Protocol enable. We may want to have this also at ...friendica2014-08-272-0/+4
* | thanks thomas...friendica2014-08-271-0/+68
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-276-6/+6
|\ \
| * | Merge pull request #574 from tuscanhobbit/masterRedMatrix2014-08-276-6/+6
| |\|
| | * notifications open in the same window(tab)tuscanhobbit2014-08-276-6/+6
| | * Merge pull request #1 from friendica/masterPaolo T2014-08-18331-24096/+35390
| | |\
* | | | compatibility notesfriendica2014-08-272-1/+2
|/ / /
* | | place to store multiple choice and select items for extensible profilesfriendica2014-08-263-2/+12
* | | and ... we've got a comment coming the other wayfriendica2014-08-261-0/+1
* | | more hard workfriendica2014-08-264-123/+159
* | | works one way sort of - now to go the other way - which will require fixing ...friendica2014-08-264-29/+51
* | | houston we have liftofffriendica2014-08-262-12/+14
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-266-77/+48
|\ \ \
| * | | make vcard and contact block widget look-alikemarijus2014-08-272-46/+38
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-261-0/+1
| |\ \ \
| | * | | Revert - see comments.Thomas Willingham2014-08-261-3/+3
| | * | | HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer itThomas Willingham2014-08-261-2/+3
| * | | | add background color to widgetsmarijus2014-08-264-31/+9
| * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2623-82/+489
| |\| | |
| * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-1/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-252-295/+378
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-241-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-242-1/+114
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2416-748/+765
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-23121-1922/+2405
| |\ \ \ \ \ \ \ \ \