aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Add a link to /locs to channel managerMario Vavti2016-03-222-1/+5
|
* whip mod manage into shapeMario Vavti2016-03-223-92/+92
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-201-4/+9
|\
| * an attempt to visualize the supremacy of dont show over show in the acl selectorMario Vavti2016-03-201-4/+9
| |
* | rework salmon - important, update addons also if you have enabled gnusoc addonredmatrix2016-03-201-9/+0
|/
* Update NL + es_ES strings.jeroenpraat2016-03-204-1151/+1163
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-201-14/+7
|\
| * make the admin side menu extensible and provide a hook for a channel "move" ↵redmatrix2016-03-191-14/+7
| | | | | | | | operation that federation plugins might use to re-establish connections after a channel move.
* | make >>indicate group members<< in acl selector work again on group > show ↵Mario Vavti2016-03-203-9/+15
|/ | | | or group > dont show is selected
* missing return false for map linkMario Vavti2016-03-191-1/+1
|
* add use as cover photo link to photos viewMario Vavti2016-03-181-14/+33
|
* some work on profile listingMario Vavti2016-03-175-58/+53
|
* bring more structure to profiles editMario Vavti2016-03-176-173/+230
|
* move buttons to dropdown menu and some cleanupMario Vavti2016-03-163-231/+240
|
* still more janitor work on profilesMario Vavti2016-03-161-149/+25
|
* even more janitor work on profilesMario Vavti2016-03-151-12/+5
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-154-766/+764
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-03-145-1095/+908
| |\
| * | update nl + es-es stringsjeroenpraat2016-03-144-766/+764
| | |
* | | some heavy lifting porting the old salmon coderedmatrix2016-03-151-0/+9
| |/ |/|
* | Merge pull request #323 from phellmes/de20160313redmatrix2016-03-142-859/+883
|\ \ | | | | | | Update DE translation strings
| * | Update DE translation stringsphellmes2016-03-132-859/+883
| | |
* | | fix spacingMario Vavti2016-03-131-1/+6
| | |
* | | more janitor work on profilesMario Vavti2016-03-132-191/+14
|/ /
* / some janitor work on profilesMario Vavti2016-03-122-45/+6
|/
* issue #319 - make sure we have a local_channel() and an App::channel before ↵redmatrix2016-03-091-1/+1
| | | | trying to change the default schema for a channel
* move "generator" to HttpMetaredmatrix2016-03-081-1/+0
|
* Merge pull request #314 from wave72/masterWave2016-03-082-1810/+1819
|\ | | | | Updated Italian strings
| * 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
| |
* | a bit of page cleanup for edit profilesredmatrix2016-03-072-69/+77
| |
* | Small, but important fix for Dutchjeroenpraat2016-03-082-2/+2
| |
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-079-1059/+1120
|\ \
| * \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-0713-8039/+8334
| |\ \
| | * | Spanish and Dutch strings + fix es>es-es linkjeroenpraat2016-03-075-1057/+1110
| | | |
| | * | Merge pull request #312 from jeroenpraat/masterredmatrix2016-03-083-0/+8
| | |\ \ | | | | | | | | | | Redbasic: Fix the issue with derived themes and schemas
| | | * | 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
| | | | | | | | | | | | | | | See the documentation for creating derived themes how to override this.
| | | * | 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
| | |/ / | |/| |
* | | | Facebook scraper "OpenGraph" support; modules will need to set the required ↵redmatrix2016-03-077-7/+7
| |/ / |/| | | | | | | | fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild.
* | | Merge pull request #308 from HaakonME/masterJeroen van Riet Paap2016-03-072-6981/+7203
|\ \ \ | | | | | | | | | | | | | | | | Updated Norwegian strings for Hubzilla. @HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96
| * | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-062-1/+2
| |\| |
| * | | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2016-03-052-6981/+7203
| | | |
* | | | Merge pull request #310 from einervonvielen/updated_homeinstall_instructionsJeroen van Riet Paap2016-03-071-1/+0
|\ \ \ \ | | | | | | | | | | Updated readme.md for homeinstall script
| * \ \ \ Merge branch 'master' of https://github.com/redmatrix/hubzillaroot2016-03-061-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of ↵root2016-03-061-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/einervonvielen/hubzilla
| | * | | | .Einer von Vielen2016-01-131-1/+0
| | | | | |
* | | | | | Added Link to TOS to EMail templates targeting membersTobias Luther2016-03-063-0/+13
| |_|/ / / |/| | | |