aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Discover page: when importing public items, alter the item so that it has the...friendica2014-04-101-0/+19
* move the deleted flag setting to encode_item_flags() where it belongs now tha...friendica2014-04-101-4/+3
* Include the entire original item when notifying other channels of deletions a...friendica2014-04-104-8/+3
* improve the appearance of the ACL selector in a hackish way on the short term -friendica2014-04-092-4/+4
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-0925-83/+70
|\
| * Merge pull request #399 from git-marijus/masterRedMatrix2014-04-1025-83/+70
| |\
| | * use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblo...marijus2014-04-098-8/+5
| | * replace lock icon with icon-{lock, unlock}marijus2014-04-0911-37/+19
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-04-092-1/+2
| | |\
| | * | whitespace cleanupmarijus2014-04-081-6/+6
| | * | change the way jot tools are displayed/hiddenmarijus2014-04-0815-36/+44
* | | | issue #400 - lock not showing up for previews of private mentions (or 'new/se...friendica2014-04-092-9/+10
|/ / /
* | | whitespace - nothing elsefriendica2014-04-091-154/+154
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-094-15/+33
|\ \ \
| * \ \ Merge pull request #401 from sasiflo/masterRedMatrix2014-04-104-15/+33
| |\ \ \ | | |_|/ | |/| |
| | * | Correction for #401: Theme redbasic extended.sasiflo2014-04-101-1/+1
| | * | Extended theme redbasic: Allow to center the content (aside + converse)sasiflo2014-04-094-15/+33
| |/ /
* / / 'anybody in this network' permissions were not being allowed for non-connecte...friendica2014-04-092-7/+23
|/ /
* / strip affinity tool labels on ultra-small screens; otherwise they just smush ...friendica2014-04-082-1/+2
|/
* some fixes to #395friendica2014-04-073-3/+3
* possible fix for issue #398friendica2014-04-071-3/+11
* pass the original element title through the element stack so that it we don't...friendica2014-04-072-0/+8
* convert /network saved search to bootstrap buttonsfriendica2014-04-072-3/+3
* this should be better - "xchan deleted" state on remote sites only follows th...friendica2014-04-072-14/+12
* undo one of yesterday's changes - if a channel was deleted we want to mark th...friendica2014-04-071-6/+6
* prevent follows of and notifications to deceased channelsfriendica2014-04-075-5/+23
* subdue archived connections in mod/connectionsfriendica2014-04-063-2/+6
* better alignment of channels with long names on mod/connectionsfriendica2014-04-061-1/+2
* more work on #395friendica2014-04-064-5/+17
* check_webbie (webbie validator) returning bad webbiesfriendica2014-04-061-2/+4
* missing pagination on viewconnections pagefriendica2014-04-061-0/+9
* a bit more work towards issue #395 - cleaning up some cases which were going ...friendica2014-04-063-11/+5
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-064-13/+4
|\
| * jot and location style fixesmarijus2014-04-064-13/+4
* | mod/item - get rid of some failed experiments, duplicated code and unused code.friendica2014-04-061-89/+10
|/
* Merge pull request #397 from sasiflo/masterRedMatrix2014-04-065-63/+50
|\
| * Merge remote-tracking branch 'upstream/master'sasiflo2014-04-066-13/+21
| |\
| * \ Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-1/+1
| |\ \
| * | | Hope I have repaired the channel admin page.sasiflo2014-04-065-63/+50
* | | | issue #395, item 2friendica2014-04-066-9/+26
| |_|/ |/| |
* | | use parent_mid in the parent query for enotify instead of of the parent id. T...friendica2014-04-066-13/+21
| |/ |/|
* | Typo in externals SQL.Thomas Willingham2014-04-051-1/+1
|/
* this makes rpost to another channel work somewhat - but there are issues, sin...friendica2014-04-051-1/+8
* provide the ability for rpost to post as another of your channels. This does ...friendica2014-04-057-19/+68
* finish "ifpending" connectionsfriendica2014-04-042-2/+5
* introduce a connection type called 'ifpending' for number 6 of issue #395 - s...friendica2014-04-042-1/+21
* Merge pull request #396 from solstag/masterRedMatrix2014-04-052-4/+46
|\
| * Update documentation on connecting to channels and on documentation.Alexandre Hannud Abdo2014-04-042-4/+46
* | doc updates, plus back-end work for rpost to let you post to a different chan...friendica2014-04-0459-723/+1386
|/
* some work on jot, remove some deprecated js and some random style fixesmarijus2014-04-038-198/+98