Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-15 | 1 | -4/+27 |
|\ | | | | | | | | | Conflicts: install/update.php | ||||
* | | generate all (non-square) photo scales - even if the original photo is ↵ | redmatrix | 2015-10-15 | 2 | -24/+24 |
| | | | | | | | | smaller than the scale target sizes. | ||||
* | | 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 |
| | | |||||
* | | (re)add default image-size 320px - it is good for gallery preview. this size ↵ | Mario Vavti | 2015-10-15 | 1 | -0/+9 |
| | | | | | | | | has the suffix -3 now | ||||
* | | double up default photo sizes - even the mos simple camera can now do images ↵ | Mario Vavti | 2015-10-15 | 1 | -4/+4 |
| | | | | | | | | > 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 | 6 | -12/+92 |
|\ \ | |||||
| * | | 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 | 2 | -1/+72 |
| | | | |||||
| * | | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ↵ | redmatrix | 2015-10-14 | 1 | -1/+11 |
| | | | | | | | | | | | | cloud | ||||
| * | | issue #86 - like/dislike in photos not working | redmatrix | 2015-10-14 | 1 | -1/+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 | 3 | -2/+51 |
|\| | | |||||
| * | | 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 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | port of mail encoding | redmatrix | 2015-10-14 | 1 | -8/+8 |
| | | | | |||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 2 | -1/+50 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | support for mail sync | redmatrix | 2015-10-14 | 2 | -1/+50 |
| | | | | |||||
* | | | | remove $item from $prep_arr - we probably do not need it | Mario Vavti | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | really check for large photos feature | Mario Vavti | 2015-10-14 | 2 | -2/+2 |
| | | | | |||||
* | | | | allow photo-items to appear full width if large photos feature is enabled. ↵ | Mario Vavti | 2015-10-14 | 5 | -67/+73 |
| |_|/ |/| | | | | | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. | ||||
* | | | Merge pull request #80 from git-marijus/master | redmatrix | 2015-10-14 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | fix /channel not updating after posting comment | ||||
| * | | fix photo visibility switch on photo upload | Mario Vavti | 2015-10-13 | 1 | -2/+2 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-13 | 1 | -3/+4 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: include/api.php | ||||
| * | | api extenesions for file migration | redmatrix | 2015-10-13 | 1 | -4/+5 |
| | | | |||||
* | | | file migration - continued | redmatrix | 2015-10-13 | 1 | -4/+29 |
| |/ |/| | |||||
* | | port of file detail api call | redmatrix | 2015-10-12 | 1 | -3/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -0/+24 |
|\| | |||||
| * | file detail api call (will not work for huge files) | redmatrix | 2015-10-12 | 1 | -0/+24 |
| | | |||||
* | | missing underscore | redmatrix | 2015-10-12 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 2 | -2/+10 |
|\| | | | | | | | | | Conflicts: include/attach.php | ||||
| * | attach_list_files had some problems - wasn't used until now apparently | redmatrix | 2015-10-12 | 2 | -2/+10 |
| | | |||||
* | | small change to allow a person with sufficient privileges the ability to ↵ | redmatrix | 2015-10-12 | 1 | -3/+12 |
| | | | | | | | | import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. | ||||
* | | functions to update urls in items when doing migrations | redmatrix | 2015-10-06 | 1 | -0/+44 |
| | | |||||
* | | remove check mail - it just reloads the page. we get a notification in the ↵ | Mario Vavti | 2015-10-04 | 1 | -6/+0 |
| | | | | | | | | panel if we get new mail | ||||
* | | Red:Notify > Hubzilla:Notify | jeroenpraat | 2015-10-03 | 1 | -9/+9 |
| | | |||||
* | | need full path to deliver_hooks.php | redmatrix | 2015-10-02 | 1 | -1/+1 |
| | | |||||
* | | one more change | redmatrix | 2015-10-01 | 2 | -0/+3 |
| | | |||||
* | | notification changes to support testdrive | redmatrix | 2015-10-01 | 2 | -1/+5 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-01 | 2 | -5/+5 |
|\| | |||||
| * | allow additional uses for xtags | redmatrix | 2015-10-01 | 2 | -5/+5 |
| | | |||||
* | | issue #63 - missing table fields in db query | redmatrix | 2015-09-30 | 1 | -2/+2 |
| | | |||||
* | | add delivery reports to mail (not backported to redmatrix) | redmatrix | 2015-09-30 | 1 | -7/+15 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-30 | 1 | -3/+14 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php view/de/messages.po view/de/strings.php | ||||
| * | document the issue with cloned delivery to self vs normal delivery to self | redmatrix | 2015-09-30 | 1 | -2/+13 |
| | | |||||
| * | undo self-deliver check | redmatrix | 2015-09-30 | 1 | -5/+6 |
| | |