aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* issue #320 - regression, after removing channel attached to an authenticated ...redmatrix2016-03-123-30/+34
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-126-66/+31
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-121-2/+2
| |\
| | * Merge pull request #321 from einervonvielen/fix_german_help_link_to_githubJeroen van Riet Paap2016-03-121-2/+2
| | |\
| | | * Fix: German help > link to of project in github. The link Pointed toEinerVonVielen2016-03-121-2/+2
| * | | some janitor work on profilesMario Vavti2016-03-124-63/+29
| |/ /
| * | remove superfluous returnMario Vavti2016-03-111-1/+0
* | | provide service federation overview - how to go about it and the appropriate ...redmatrix2016-03-123-346/+413
* | | some minor cleanupsredmatrix2016-03-104-4/+5
|/ /
* | UNO: Hide bookmark tools in items (#^ and in menu)jeroenpraat2016-03-102-1/+6
* | we've come a long way since this faq entry on the limits of cloning was writtenredmatrix2016-03-091-1/+1
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-091-2/+2
|\ \
| * | Update docjeroenpraat2016-03-091-2/+2
* | | handle UNO move channel operationredmatrix2016-03-093-15/+74
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-093-5/+50
|\ \
| * \ Merge pull request #318 from git-marijus/masterredmatrix2016-03-101-1/+1
| |\ \
| | * | should have probably done that on tag releaseMario Vavti2016-03-091-1/+1
| * | | Merge pull request #317 from git-marijus/masterredmatrix2016-03-092-4/+49
| |\| |
| | * | Issue #316 make /display updates work. Basically copy and paste what we do on...Mario Vavti2016-03-092-4/+49
| |/ /
* | | issue #319 - make sure we have a local_channel() and an App::channel before t...redmatrix2016-03-091-1/+1
* | | work on implementing account/channel move (as opposed to clone)redmatrix2016-03-096-25/+30
|/ /
* | isue #315redmatrix2016-03-081-0/+3
* | move "generator" to HttpMetaredmatrix2016-03-082-2/+2
* | turn 'OpenGraph' into a more general purpose HTTP meta facility for setting a...redmatrix2016-03-083-55/+71
* | revupredmatrix2016-03-081-1/+1
* | Merge pull request #314 from wave72/masterWave2016-03-082-1810/+1819
|\ \
| * | Updated Italian stringsPaolo Tacconi2016-03-082-1810/+1819
* | | removed id by mistake - add it againMario Vavti2016-03-081-1/+1
* | | add generic-content-wrapper and setction-content-wrapper to profile_edit.tplMario Vavti2016-03-082-2/+4
* | | add syslog loglevels to dba functionsredmatrix2016-03-072-8/+8
* | | a bit of page cleanup for edit profilesredmatrix2016-03-075-97/+105
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-072-2/+2
|\ \ \
| * | | Small, but important fix for Dutchjeroenpraat2016-03-082-2/+2
* | | | issue #313redmatrix2016-03-071-1/+13
|/ / /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-0710-1060/+1145
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-0718-8056/+8385
| |\ \ \
| | * | | Spanish and Dutch strings + fix es>es-es linkjeroenpraat2016-03-075-1057/+1110
| | * | | Merge pull request #312 from jeroenpraat/masterredmatrix2016-03-084-1/+33
| | |\ \ \
| | | * | | Update DerivedTheme1.mdJeroen van Riet Paap2016-03-071-1/+25
| | | * | | Show only schema selector when Redbasic (so not a derived theme)Jeroen van Riet Paap2016-03-071-0/+2
| | | * | | Set the schema to the default schema in derived themes.Jeroen van Riet Paap2016-03-071-0/+5
| | | * | | Update config.phpJeroen van Riet Paap2016-03-071-0/+1
| * | | | | prevent page jumping if the narrow navbar setting is usedMario Vavti2016-03-071-2/+2
| | |/ / / | |/| | |
* | | | | allow modules/addons to override the og:title fieldredmatrix2016-03-072-3/+10
* | | | | Facebook scraper "OpenGraph" support; modules will need to set the required f...redmatrix2016-03-0710-8/+58
| |/ / / |/| | |
* | | | Merge pull request #308 from HaakonME/masterJeroen van Riet Paap2016-03-073-6981/+7204
|\ \ \ \
| * | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-071-1/+1
| |\| | |
| * | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-063-1/+3
| |\ \ \ \
| * | | | | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2016-03-052-6981/+7203
| * | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-053-494/+521
| |\ \ \ \ \