aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-234-7/+33
|\
| * Merge pull request #356 from solstag/signature_edit_fixredmatrix2015-06-231-2/+2
| |\
| | * properly trims edited posts before signing so signature verification worksAlexandre Hannud Abdo2015-06-231-2/+2
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-225-29/+29
| |\|
| * | ensure we always sign a trimmed item body.redmatrix2015-06-222-4/+4
| * | discovered a couple of loose ends in the per-member enable diaspora settingredmatrix2015-06-222-1/+27
* | | some work on directoryMario Vavti2015-06-236-130/+115
| |/ |/|
* | Bring /help in line with the rest of the appMario Vavti2015-06-225-29/+29
|/
* import: Improve the descriptive text for this featureredmatrix2015-06-211-2/+2
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-213-7/+6
|\
| * Merge pull request #355 from dawnbreak/masterredmatrix2015-06-223-9/+23
| |\
| | * Compatible update for .htaccess.Klaus Weidenbach2015-06-223-9/+23
| * | Merge pull request #354 from redmatrix/revert-353-masterKlaus2015-06-223-23/+8
| |\ \
| | * | Revert "Compatible update for .htaccess."Klaus2015-06-223-23/+8
| |/ /
* / / some diaspora import issues uncovered during dry-run testsredmatrix2015-06-214-13/+14
|/ /
* | Merge pull request #353 from dawnbreak/masterredmatrix2015-06-223-8/+23
|\ \ | |/ |/|
| * Compatible update for .htaccess.Klaus Weidenbach2015-06-213-8/+23
|/
* do not show default in scheme selection dropdown. default.php and default.css...Mario Vavti2015-06-215-3/+8
* Merge pull request #352 from solstag/store_update_fixredmatrix2015-06-211-9/+10
|\
| * Make item_store_update only affect the data we requestedAlexandre Hannud Abdo2015-06-201-9/+10
* | ensure the photo driver is includedredmatrix2015-06-201-0/+1
* | import_diaspora - incorrect method for importing channel photo, and add dupli...redmatrix2015-06-202-21/+43
* | wrong logicredmatrix2015-06-191-1/+1
* | import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
* | automatically gunzip Diaspora export files if we're on a *nix systemredmatrix2015-06-191-0/+9
* | import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-1916-308/+330
|\ \
| * | more generic-content-wrapper and some css fixesMario Vavti2015-06-193-35/+44
| * | cloud.tplMario Vavti2015-06-191-0/+4
| * | bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-1912-273/+282
| |/
* / very early attempt diaspora import from diaspora export file. Currently the j...redmatrix2015-06-194-110/+221
|/
* set return url from apps pageredmatrix2015-06-182-1/+3
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-189-7163/+7428
|\
| * Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\
| | * fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
| | * make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13
| * | Small fix in siteinfojeroenpraat2015-06-161-1/+1
| |/
| * 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
* | issues with markdownify and escaped HTMLredmatrix2015-06-183-5/+13
|/
* version updateredmatrix2015-06-141-1/+1
* 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 ThomasMichael Johnston2015-06-131-1/+1
| |/
* / weekly string updateredmatrix2015-06-132-4401/+4582
|/
* don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
* 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
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 16:22:07 +0000