Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move file storage quota display to upload section. add a warning if ↵ | Mario Vavti | 2015-10-21 | 3 | -28/+29 |
| | | | | remaining space is less than 100MB and fix % calculation | ||||
* | old merge conflict | redmatrix | 2015-10-20 | 1 | -7/+1 |
| | |||||
* | move quota display to where it's visible on a tablet | redmatrix | 2015-10-20 | 1 | -2/+3 |
| | |||||
* | fix image path | jeroenpraat | 2015-10-20 | 1 | -2/+2 |
| | |||||
* | some photos cant be deleted under certain circumstances - needs more ↵ | Mario Vavti | 2015-10-20 | 1 | -4/+0 |
| | | | | investigation. revert this until a better fix is found. | ||||
* | add obj_type and object again | Mario Vavti | 2015-10-20 | 1 | -1/+3 |
| | |||||
* | fix jot photo upload | Mario Vavti | 2015-10-20 | 1 | -10/+6 |
| | |||||
* | update large photo feature setting description | Mario Vavti | 2015-10-20 | 1 | -1/+1 |
| | |||||
* | css cleanup | Mario Vavti | 2015-10-20 | 1 | -4/+0 |
| | |||||
* | create photo object if feature large photos is enabled and display those ↵ | Mario Vavti | 2015-10-20 | 10 | -31/+98 |
| | | | | slightly different | ||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 2 | -4/+4 |
|\ | |||||
| * | add project info to pubsite list | redmatrix | 2015-10-19 | 2 | -4/+4 |
| | | |||||
* | | revert - we can't guarantee what project name the fallback directory server ↵ | redmatrix | 2015-10-19 | 1 | -6/+4 |
| | | | | | | | | has and this could cause bugs later | ||||
* | | update site on initial directory setup | redmatrix | 2015-10-19 | 1 | -4/+7 |
| | | |||||
* | | extened the earlier fix | redmatrix | 2015-10-19 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 0 | -0/+0 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | typo | redmatrix | 2015-10-19 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 11 | -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_merge | redmatrix | 2015-10-19 | 4 | -6816/+7110 |
| |\ | |||||
| | * | Update es+nl | jeroenpraat | 2015-10-18 | 4 | -6816/+7110 |
| | | | |||||
| * | | add the project name to site info packet | redmatrix | 2015-10-19 | 7 | -8/+27 |
| |/ | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-19 | 6 | -3/+3 |
|\ \ | |||||
| * \ | Merge pull request #93 from tuscanhobbit/master | redmatrix | 2015-10-20 | 5 | -2/+2 |
| |\ \ | | | | | | | | | Replaced some old redmatrix branding | ||||
| | * | | Replaced some old redmatrix branding | Paolo Tacconi | 2015-10-19 | 5 | -2/+2 |
| | | | | |||||
| | * | | Merge pull request #1 from redmatrix/master | Wave | 2015-10-19 | 112 | -40350/+43079 |
| | |\ \ | | | | | | | | | | | Update to latest hubzilla | ||||
| * | | | | fix typo in mod/connedit.php | Mario Vavti | 2015-10-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix typo in include/notifier.php | Mario Vavti | 2015-10-19 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* / | | | syntax error | redmatrix | 2015-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-18 | 2 | -4/+33 |
|\ \ \ | |||||
| * \ \ | Merge pull request #92 from HaakonME/master | redmatrix | 2015-10-19 | 2 | -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 Eriksen | 2015-10-18 | 1 | -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 Eriksen | 2015-10-18 | 1 | -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 - fixes | Haakon Meland Eriksen | 2015-10-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added config settings sensible for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-18 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | separate permission_update notification into permission_create and ↵ | redmatrix | 2015-10-18 | 4 | -7/+11 |
|/ / / / | | | | | | | | | | | | | permission_update, since some networks send out a notification for duplicate share requests even if connected. | ||||
* | | | | issues with "the Register" feed | redmatrix | 2015-10-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-18 | 5 | -3496/+3501 |
|\ \ \ \ | |||||
| * | | | | Update nl+es | jeroenpraat | 2015-10-18 | 4 | -3494/+3500 |
| |/ / / | |||||
| * | | | tweak justify gallery options to not load to large previews | Mario Vavti | 2015-10-18 | 1 | -2/+1 |
| | | | | |||||
* | | | | re-organise the protocol disabled logic | redmatrix | 2015-10-18 | 1 | -8/+18 |
|/ / / | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-17 | 2 | -0/+9152 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: README.md | ||||
| * | | start pointing people to hubzilla instead of redmatrix | redmatrix | 2015-10-17 | 1 | -1/+5 |
| | | | |||||
| * | | messages.po got truncated due to a failed cron job | redmatrix | 2015-10-17 | 1 | -0/+9151 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-17 | 5 | -16591/+7669 |
|\| | | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-17 | 2 | -6865/+6775 |
| |\ \ | |||||
| | * | | Update Dutch strings | jeroenpraat | 2015-10-16 | 2 | -6865/+6775 |
| | | | | |||||
| * | | | allow homepage content to be a full redirect | redmatrix | 2015-10-17 | 3 | -8999/+5 |
| |/ / | |||||
* | | | bring back chat expiration setting and adjust chat size for our now smaller ↵ | redmatrix | 2015-10-17 | 3 | -1/+6 |
| | | | | | | | | | | | | content region | ||||
* | | | filter delivery reports | redmatrix | 2015-10-17 | 2 | -9/+53 |
| | | | |||||
* | | | remove one more Friendica table reference from the API | redmatrix | 2015-10-16 | 1 | -29/+15 |
| | | |