aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-156-162/+191
|\ | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-152-6998/+7222
| |\
| | * Update Dutch language stringsjeroenpraat2015-06-152-6998/+7222
| | |
| * | update spin.jsMario Vavti2015-06-152-157/+184
| |/
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-153-4/+6
| |
| * version updateredmatrix2015-06-141-1/+1
| |
* | DB changes for some channel flagsredmatrix2015-06-1519-131/+87
| |
* | un-maintainable - let it go.redmatrix2015-06-1417-1760/+0
| |
* | sql errors after last major edit adventureredmatrix2015-06-142-2/+2
| |
* | convert the abook fieldsredmatrix2015-06-1434-279/+241
| |
* | more file/photo merge workredmatrix2015-06-142-17/+51
| |
* | first cut at merging files and photos, not yet well integrated but they are ↵redmatrix2015-06-143-24/+35
| | | | | | | | integrated
* | make new os_storage flag workredmatrix2015-06-142-1/+5
| |
* | isolate the os_storage flagredmatrix2015-06-133-23/+29
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-133-4/+12
|\| | | | | | | | | Conflicts: util/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-131-1/+1
| |\
| | * Merge pull request #348 from unary/nginxconfigredmatrix2015-06-131-1/+1
| | |\ | | | | | | | | nginx config change from Thomas
| | | * nginx config change from ThomasMichael Johnston2015-06-131-1/+1
| | |/
| * / weekly string updateredmatrix2015-06-132-4401/+4582
| |/
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-111-0/+4
|\|
| * don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
| |
* | make cloud work againredmatrix2015-06-115-6/+6
| |
* | start on the DAV/photos mergerredmatrix2015-06-112-12/+32
| |
* | more work on itemsredmatrix2015-06-1113-38/+164
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-117-7225/+7179
| |\
| | * Merge pull request #347 from tuscanhobbit/devPaolo T2015-06-112-7219/+7160
| | |\ | | | | | | | | updated italian strings
| | | * updated italian stringsPaolo Tacconi2015-06-112-7219/+7160
| | | |
| | * | set width for region_3 only if center page content is setMario Vavti2015-06-113-4/+15
| | | |
| | * | fix rendering of affinity sliderMario Vavti2015-06-112-2/+4
| | | |
| * | | hubzilla compatibility functionredmatrix2015-06-112-1/+15
| |/ /
* | | the hubzilla version of this functionredmatrix2015-06-111-0/+12
| | |
* | | diaspora disallowed by defaultredmatrix2015-06-103-8/+0
| | |
* | | start to partition the davredmatrix2015-06-102-30/+5
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-102-1/+7
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-101-21/+23
| |\ \
| * | | put block_public back where it is needed, which is in mod_public and not ↵redmatrix2015-06-102-1/+7
| | | | | | | | | | | | | | | | mod_home
* | | | more work on item table optimisationredmatrix2015-06-1019-82/+123
| | | |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-107-67/+45
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #346 from solstag/fixattachpermsredmatrix2015-06-111-21/+23
| |\ \ \ | | |/ / | |/| | correctly fix attachment permissions from private mentions
| | * | correctly fix attachment permissions from private mentionsAlexandre Hannud Abdo2015-06-101-21/+23
| |/ / | | | | | | | | | by postponing code that removes the attachment tag from the body
| * | show login without checking for block_public, local or remote channelMario Vavti2015-06-101-6/+3
| | |
| * | assign right aside the same width as we have in left aside but hide it on ↵Mario Vavti2015-06-104-11/+18
| | | | | | | | | | | | small and xs screens. make aside width a variablee for easier handling.
| * | really show login form if it is enabledMario Vavti2015-06-101-2/+2
| | |
| * | retire old Friendica RINO encryption functionsredmatrix2015-06-091-28/+0
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-096-2/+38
|\| |
| * | put mirror_frontpage setting into admin/siteredmatrix2015-06-092-0/+4
| | |
| * | toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-094-2/+34
| | | | | | | | | | | | per site setting. Default is enabled if the site setting is enabled.
| * | s/broder/border/redmatrix2015-06-091-1/+1
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0917-254/+303
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * | add nomadic identities as webfinger aliasesredmatrix2015-06-092-2/+11
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 02:58:13 +0000