aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-196-3/+3
|\
| * Merge pull request #93 from tuscanhobbit/masterredmatrix2015-10-205-2/+2
| |\ | | | | | | Replaced some old redmatrix branding
| | * Replaced some old redmatrix brandingPaolo Tacconi2015-10-195-2/+2
| | |
| | * Merge pull request #1 from redmatrix/masterWave2015-10-19112-40350/+43079
| | |\ | | | | | | | | Update to latest hubzilla
| * | | fix typo in mod/connedit.phpMario Vavti2015-10-191-1/+1
| | | |
| * | | fix typo in include/notifier.phpMario Vavti2015-10-191-1/+1
| | |/ | |/|
* / | syntax errorredmatrix2015-10-191-1/+1
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-182-4/+33
|\ \
| * \ Merge pull request #92 from HaakonME/masterredmatrix2015-10-192-4/+33
| |\ \ | | | | | | | | Updated deploy script with new defaults and updated help page Hubzilla on OpenShift
| | * | Updated help page about Hubzilla on OpenShift with new info on using ↵Haakon Meland Eriksen2015-10-181-1/+1
| | | | | | | | | | | | | | | | mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift - fixed link
| | * | Updated help page about Hubzilla on OpenShift with new info on using ↵Haakon Meland Eriksen2015-10-181-3/+25
| | | | | | | | | | | | | | | | mysqlcheck rather than myisamchk and notes about new space preserving defaults in the deploy script given 1Gb gear on OpenShift
| | * | Added config settings sensible for Hubzilla on OpenShift - fixesHaakon Meland Eriksen2015-10-181-1/+1
| | | |
| | * | Added config settings sensible for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-181-1/+8
| | | |
* | | | separate permission_update notification into permission_create and ↵redmatrix2015-10-184-7/+11
|/ / / | | | | | | | | | permission_update, since some networks send out a notification for duplicate share requests even if connected.
* | | issues with "the Register" feedredmatrix2015-10-181-1/+1
| | |
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-185-3496/+3501
|\ \ \
| * | | Update nl+esjeroenpraat2015-10-184-3494/+3500
| |/ /
| * | tweak justify gallery options to not load to large previewsMario Vavti2015-10-181-2/+1
| | |
* | | re-organise the protocol disabled logicredmatrix2015-10-181-8/+18
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-172-0/+9152
|\ \ | | | | | | | | | | | | Conflicts: README.md
| * | start pointing people to hubzilla instead of redmatrixredmatrix2015-10-171-1/+5
| | |
| * | messages.po got truncated due to a failed cron jobredmatrix2015-10-171-0/+9151
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-175-16591/+7669
|\| | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-172-6865/+6775
| |\ \
| | * | Update Dutch stringsjeroenpraat2015-10-162-6865/+6775
| | | |
| * | | allow homepage content to be a full redirectredmatrix2015-10-173-8999/+5
| |/ /
* | | bring back chat expiration setting and adjust chat size for our now smaller ↵redmatrix2015-10-173-1/+6
| | | | | | | | | | | | content region
* | | filter delivery reportsredmatrix2015-10-172-9/+53
| | |
* | | remove one more Friendica table reference from the APIredmatrix2015-10-161-29/+15
| | |
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-164-37/+38
|\ \ \
| * | | we now provide images for all suffixes (0-3) -> simplify photo item body ↵Mario Vavti2015-10-162-37/+27
| | | | | | | | | | | | | | | | creation and provide width x height for any size
| * | | Merge pull request #90 from anaqreon/theme-docredmatrix2015-10-162-0/+11
| |\ \ \ | | | | | | | | | | Documentation for theme repo management
| | * | | Updated textAndrew Manning2015-10-161-0/+1
| | | | |
| | * | | Updated formatting and typosAndrew Manning2015-10-161-5/+1
| | | | |
| | * | | New documentation for theme repo managementAndrew Manning2015-10-162-0/+14
| | | | |
* | | | | change setup defaults to 127.0.0.1 instead of localhost for DB server, add ↵redmatrix2015-10-162-4/+9
|/ / / / | | | | | | | | | | | | documentation to the INSTALL.txt explaining the choice.
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-161-4/+1
|\ \ \ \
| * | | | this is all the info we needMario Vavti2015-10-161-4/+1
| |/ / /
* / / / another try at issue #89 - rotating photosredmatrix2015-10-163-1347/+1374
|/ / /
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-150-0/+0
|\| | | | | | | | | | | | | | Conflicts: include/identity.php
| * | missed the xchan_mail_queryredmatrix2015-10-151-4/+2
| | |
* | | missing xchan_mail_queryredmatrix2015-10-151-0/+1
| | |
* | | mail sync debuggingredmatrix2015-10-152-12/+60
| | |
* | | mail sync/migrate continued; also abstract delivery loop to make it ↵redmatrix2015-10-159-95/+115
| | | | | | | | | | | | re-usable, change refresh_all to use delivery loop.
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-155-8/+39
|\| | | | | | | | | | | | | | Conflicts: install/update.php
| * | dummy updateredmatrix2015-10-153-3/+7
| | |
* | | generate all (non-square) photo scales - even if the original photo is ↵redmatrix2015-10-154-61/+66
| | | | | | | | | | | | smaller than the scale target sizes.
* | | issue #89 - rotating photos does not workredmatrix2015-10-151-1/+2
| | |
* | | fix webpagesMario Vavti2015-10-151-1/+1
| | |
* | | really fix label nameMario Vavti2015-10-151-1/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 19:45:54 +0000