| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-16 | 4 | -37/+38 |
| |\ \ | |||||
| | * | | we now provide images for all suffixes (0-3) -> simplify photo item body ↵ | Mario Vavti | 2015-10-16 | 2 | -37/+27 |
| | | | | | | | | | | | | | creation and provide width x height for any size | ||||
| | * | | Merge pull request #90 from anaqreon/theme-doc | redmatrix | 2015-10-16 | 2 | -0/+11 |
| | |\ \ | | | | | | | | | Documentation for theme repo management | ||||
| | | * | | Updated text | Andrew Manning | 2015-10-16 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Updated formatting and typos | Andrew Manning | 2015-10-16 | 1 | -5/+1 |
| | | | | | |||||
| | | * | | New documentation for theme repo management | Andrew Manning | 2015-10-16 | 2 | -0/+14 |
| | | | | | |||||
| * | | | | change setup defaults to 127.0.0.1 instead of localhost for DB server, add ↵ | redmatrix | 2015-10-16 | 2 | -4/+9 |
| |/ / / | | | | | | | | | | documentation to the INSTALL.txt explaining the choice. | ||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-16 | 1 | -4/+1 |
| |\ \ \ | |||||
| | * | | | this is all the info we need | Mario Vavti | 2015-10-16 | 1 | -4/+1 |
| | |/ / | |||||
| * / / | another try at issue #89 - rotating photos | redmatrix | 2015-10-16 | 3 | -1347/+1374 |
| |/ / | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-15 | 0 | -0/+0 |
| |\| | | | | | | | | | Conflicts: include/identity.php | ||||
| | * | missed the xchan_mail_query | redmatrix | 2015-10-15 | 1 | -4/+2 |
| | | | |||||
| * | | missing xchan_mail_query | redmatrix | 2015-10-15 | 1 | -0/+1 |
| | | | |||||
| * | | mail sync debugging | redmatrix | 2015-10-15 | 2 | -12/+60 |
| | | | |||||
| * | | mail sync/migrate continued; also abstract delivery loop to make it ↵ | redmatrix | 2015-10-15 | 9 | -95/+115 |
| | | | | | | | | | re-usable, change refresh_all to use delivery loop. | ||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-15 | 5 | -8/+39 |
| |\| | | | | | | | | | Conflicts: install/update.php | ||||
| | * | dummy update | redmatrix | 2015-10-15 | 3 | -3/+7 |
| | | | |||||
| * | | generate all (non-square) photo scales - even if the original photo is ↵ | redmatrix | 2015-10-15 | 4 | -61/+66 |
| | | | | | | | | | smaller than the scale target sizes. | ||||
| * | | issue #89 - rotating photos does not work | redmatrix | 2015-10-15 | 1 | -1/+2 |
| | | | |||||
| * | | fix webpages | Mario Vavti | 2015-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | really fix label name | Mario Vavti | 2015-10-15 | 1 | -1/+6 |
| | | | |||||
| * | | wrong logic | Mario Vavti | 2015-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | fix label name | Mario Vavti | 2015-10-15 | 1 | -5/+2 |
| | | | |||||
| * | | reflect default image size changes in mod/photos | Mario Vavti | 2015-10-15 | 1 | -3/+17 |
| | | | |||||
| * | | do not try to remove photos twice | Mario Vavti | 2015-10-15 | 1 | -0/+6 |
| | | | |||||
| * | | (re)add default image-size 320px - it is good for gallery preview. this size ↵ | Mario Vavti | 2015-10-15 | 2 | -3/+12 |
| | | | | | | | | | has the suffix -3 now | ||||
| * | | update conv_list.tpl | Mario Vavti | 2015-10-15 | 1 | -19/+33 |
| | | | |||||
| * | | double up default photo sizes - even the mos simple camera can now do images ↵ | Mario Vavti | 2015-10-15 | 3 | -8/+9 |
| | | | | | | | | | > 1024px | ||||
| * | | if photo deleted from /cloud or /dav also delete from /photos | Mario Vavti | 2015-10-15 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-15 | 13 | -31/+118 |
| |\ \ | |||||
| | * \ | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-14 | 3 | -4/+4 |
| | |\ \ | |||||
| | | * \ | Merge pull request #88 from anaqreon/grid-app | redmatrix | 2015-10-15 | 3 | -4/+4 |
| | | |\ \ | | | | | | | | | | | Replaced RedMatrix icon and label in app list | ||||
| | | | * | | Replaced RedMatrix icon and label in app list | Andrew Manning | 2015-10-14 | 3 | -4/+4 |
| | | | | | | |||||
| | * | | | | change name of matrix app | redmatrix | 2015-10-14 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | more mail sync work | redmatrix | 2015-10-14 | 2 | -8/+7 |
| | | | | | |||||
| | * | | | more work on import & sync of private mail and conversations | redmatrix | 2015-10-14 | 3 | -1/+78 |
| | | | | | |||||
| | * | | | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ↵ | redmatrix | 2015-10-14 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | cloud | ||||
| | * | | | issue #86 - like/dislike in photos not working | redmatrix | 2015-10-14 | 4 | -14/+14 |
| | | | | | |||||
| * | | | | updating the local item only does not make much sense in this case | Mario Vavti | 2015-10-14 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | wrong variable | Mario Vavti | 2015-10-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-14 | 5 | -4196/+4174 |
| |\| | | | |||||
| | * | | | issue #82 - args not defined (should be arr) | redmatrix | 2015-10-14 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-14 | 4 | -630/+656 |
| | |\ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |