aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-1/+1
|\
| * Typo in externals SQL.Thomas Willingham2014-04-051-1/+1
| |
* | Hope I have repaired the channel admin page.sasiflo2014-04-065-63/+50
|/ | | | | | | | | | Channel blocking and deleting was copied from user actions. This was not done to an end. Hope what I do is enough to enable channel blocking and deleting the correct way. On deletion all entities that belong to the channel are deleted. But the channel itself is just marked as deleted. Do not really understand why it is done this way.
* this makes rpost to another channel work somewhat - but there are issues, ↵friendica2014-04-051-1/+8
| | | | since the ACL will belong to the wrong channel. Leaving disabled for now. I don't know that we can solve all the issues without a different design so this may end up in a plugin for those who are willing to put up with the shortcomings.
* provide the ability for rpost to post as another of your channels. This does ↵friendica2014-04-057-19/+68
| | | | not yet work, so the functionality has not been enabled.
* finish "ifpending" connectionsfriendica2014-04-042-2/+5
|
* introduce a connection type called 'ifpending' for number 6 of issue #395 - ↵friendica2014-04-042-1/+21
| | | | so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu
* Merge pull request #396 from solstag/masterRedMatrix2014-04-052-4/+46
|\ | | | | Update documentation on connecting to channels and on documentation.
| * 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 ↵friendica2014-04-0459-723/+1386
|/ | | | channel than your current logged-in channel. Need the same for rbmark back-end. Then we "just" need a selector widget on the editor forms.
* some work on jot, remove some deprecated js and some random style fixesmarijus2014-04-038-198/+98
|
* Merge pull request #393 from jeroenpraat/patch-1Thomas Willingham2014-04-031-5/+29
|\ | | | | Update and fix dark scheme
| * No empty stringsjeroenpraat2014-04-031-2/+0
| |
| * Update and fix dark schemejeroenpraat2014-04-031-5/+31
|/ | | Updated the dark scheme as far as possible. Some items do not have a string, so they can't be themed. A dark derived theme would probably better.
* clarify location - issue #392friendica2014-04-021-1/+1
|
* start of legacy probe utilityfriendica2014-04-021-0/+99
|
* removed default maximagesize - it can be set in the admin pages.friendica2014-04-022-5/+1
|
* more efficient public feed fetchingfriendica2014-04-024-9/+30
|
* snakebite: bring back some of the legacy XML discovery interfaces, update as ↵friendica2014-04-026-56/+32
| | | | required.
* Merge pull request #391 from solstag/masterThomas Willingham2014-04-022-1087/+1205
|\ | | | | update pt-br translation
| * update pt-br translationAlexandre Hannud Abdo2014-04-012-1087/+1205
|/
* dispense with formalitiesfriendica2014-04-011-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-011-3/+7
|\
| * Merge pull request #390 from beardy-unixer/masterRedMatrix2014-04-021-3/+7
| |\ | | | | | | Let admins set a default expire days value.
| | * Let admins set a default expire days value.Thomas Willingham2014-04-011-3/+7
| |/
* / save notes every ten seconds while focused, then save them once more on focusoutfriendica2014-04-013-5/+19
|/
* wrong var name in add_source_routefriendica2014-03-311-2/+2
|
* crank up loggingfriendica2014-03-311-0/+2
|
* community tags don't show up in the tagged posts because we removed the ↵friendica2014-03-312-0/+31
| | | | displayed list of hashtags at the bottom (which are usually redundant since hashtags are usually present in the message text). This brings them back, but only for tags which aren't currently present in the message body (e.g. community tags)
* Merge branch 'route'friendica2014-03-315-14/+57
|\
| * docofriendica2014-03-311-0/+5
| |
| * finish up the source route storage so we can prevent messages from flowing ↵friendica2014-03-314-30/+31
| | | | | | | | upstream in complicated delivery chains
| * source routing stufffriendica2014-03-292-0/+37
| |
* | this is a mess and makes a complicated security model that one can probably ↵friendica2014-03-312-5/+7
| | | | | | | | drive a truck through. It will have to be fixed. It does make youtubes work again.
* | photo timestamp was missing from main profile photo url which prevents photo ↵friendica2014-03-312-1/+9
| | | | | | | | changes from being immediately seen there.
* | issue #378, failure to correctly link tags where one tag contains a ↵friendica2014-03-302-1/+18
| | | | | | | | substring of the other (depends on the order they are discovered).
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-03-305-7/+7
|\ \
| * \ Merge pull request #387 from beardy-unixer/masterRedMatrix2014-03-315-7/+7
| |\ \ | | | | | | | | Default discover to on
| | * | Missed oneThomas Willingham2014-03-301-1/+1
| | | |
| | * | Default discover to on.Thomas Willingham2014-03-305-7/+7
| | | |
* | | | notes widget: jquery.live is deprecated, replacing with jquery.on and ↵friendica2014-03-301-1/+1
|/ / / | | | | | | | | | binding to focusout, as the input and paste callbacks are a bit wasteful - they are presumably called on every character typed, yet some of these events have gone missing (probably due to having a lot of network calls in quick succession) so hopefully a single save of the workspace on focusout should be more reliable.
* / / revise the sandboxfriendica2014-03-303-3/+3
|/ /
* | typofriendica2014-03-291-1/+1
| |
* | issue #384friendica2014-03-291-28/+35
| |
* | make the discover tab enabled by default the first you use the admin panel, ↵friendica2014-03-291-1/+1
|/ | | | though it will be disabled until you use the admin panel.
* Merge pull request #385 from solstag/masterRedMatrix2014-03-305-12/+18
|\ | | | | Let the site admin choose whether to display the Discover tab.
| * Let the site admin choose whether to display the Discover tab.Alexandre Hannud Abdo2014-03-305-12/+18
|/
* check that aside actually exists before querying the html lengthfriendica2014-03-293-3/+3
|
* Merge https://github.com/friendica/red into zpullfriendica2014-03-281-1/+3
|\
| * Merge pull request #382 from git-marijus/masterRedMatrix2014-03-291-1/+3
| |\ | | | | | | provide some info to not local users