aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lots of little Diaspora issuesfriendica2014-08-284-10/+46
|
* retro-actively set standalone directory fix, also a fix for directory ↵friendica2014-08-282-1/+12
| | | | endless scroll when you hit the end.
* remove noisy log statementfriendica2014-08-281-2/+0
|
* when updating the commented timestamp on the parent post (item_store) don't ↵friendica2014-08-282-2/+5
| | | | include any time travelling posts. They can mess up the conversation sort order in a big way until they're actually published.
* 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 Manager
| | * 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 ↵friendica2014-08-286-58/+106
|/ | | | emulation (and many other uses)
* 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 ↵friendica2014-08-282-4/+4
| | | | driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places.
* make blocks, webpages, and layouts postable (pre-filled forms if supplied ↵friendica2014-08-284-10/+31
| | | | from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save.
* begin embeddable/shareable design elements (blocks, webpages, layouts, ↵friendica2014-08-272-2/+34
| | | | menus, etc.)
* ability to create/edit/delete custom profile field definitions - read the ↵friendica2014-08-274-1/+91
| | | | source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later.
* 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
| | | | a channel level since there are privacy issues and quirks and trade-offs.
* 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 links load on the same window(tab)
| | * notifications open in the same window(tab)tuscanhobbit2014-08-276-6/+6
| | |
| | * Merge pull request #1 from friendica/masterPaolo T2014-08-18331-24096/+35390
| | |\ | | | | | | | | Red master has been merged
* | | | 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
| | | | | | | | | | | | a whole slew of FIXMEs
* | | 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
| | | | | | | | | | | | | | | | | | | | as an option.
| * | | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'upstream'marijus2014-08-2215-138/+275
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-08-2228-780/+663
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2114-469/+360
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-203-196/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-207-239/+373
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-192-5927/+6256
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | take off the kid glovesfriendica2014-08-264-52/+41
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | get rid of template "auto generated" warningsfriendica2014-08-2515-75/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | more diaspora stuff - most of the basic bits are there except queueing and ↵friendica2014-08-2518-12/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs