aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* warn if quota exceeds 90% of storage limitMario Vavti2015-10-212-2/+2
|
* move file storage quota display to upload section. add a warning if ↵Mario Vavti2015-10-213-28/+29
| | | | remaining space is less than 100MB and fix % calculation
* old merge conflictredmatrix2015-10-201-7/+1
|
* move quota display to where it's visible on a tabletredmatrix2015-10-201-2/+3
|
* fix image pathjeroenpraat2015-10-201-2/+2
|
* some photos cant be deleted under certain circumstances - needs more ↵Mario Vavti2015-10-201-4/+0
| | | | investigation. revert this until a better fix is found.
* add obj_type and object againMario Vavti2015-10-201-1/+3
|
* fix jot photo uploadMario Vavti2015-10-201-10/+6
|
* update large photo feature setting descriptionMario Vavti2015-10-201-1/+1
|
* css cleanupMario Vavti2015-10-201-4/+0
|
* create photo object if feature large photos is enabled and display those ↵Mario Vavti2015-10-2010-31/+98
| | | | slightly different
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-192-4/+4
|\
| * add project info to pubsite listredmatrix2015-10-192-4/+4
| |
* | revert - we can't guarantee what project name the fallback directory server ↵redmatrix2015-10-191-6/+4
| | | | | | | | has and this could cause bugs later
* | update site on initial directory setupredmatrix2015-10-191-4/+7
| |
* | extened the earlier fixredmatrix2015-10-191-2/+2
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-190-0/+0
|\| | | | | | | | | Conflicts: include/zot.php
| * typoredmatrix2015-10-191-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-1911-6825/+7139
|\| | | | | | | | | | | | | | | | | Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-194-6816/+7110
| |\
| | * Update es+nljeroenpraat2015-10-184-6816/+7110
| | |
| * | add the project name to site info packetredmatrix2015-10-197-8/+27
| |/
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 20:24:13 +0000