Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| |\ \ \ \ | ||||||
| * | | | | | port of mail encoding | redmatrix | 2015-10-14 | 1 | -8/+8 | |
| | | | | | | ||||||
| * | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 4 | -4195/+4173 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 1 | -4193/+4122 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Regenerated messages.po. | jeroenpraat | 2015-10-14 | 1 | -4193/+4122 | |
| | | | | | | | ||||||
| | * | | | | | support for mail sync | redmatrix | 2015-10-14 | 3 | -2/+51 | |
| | |/ / / / | ||||||
* | | | | | | 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 | 12 | -153/+179 | |
| |_|/ / / |/| | | | | | | | | | | | | | | 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 | 2 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix /channel not updating after posting comment | |||||
| * | | | | | fix photo visibility switch on photo upload | Mario Vavti | 2015-10-13 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | fix /channel not updating after posting comment | Mario Vavti | 2015-10-13 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #81 from tuscanhobbit/master | Wave | 2015-10-14 | 2 | -627/+653 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | Italian strings updated | |||||
| * | | | | Italian strings updated | Paolo Tacconi | 2015-10-14 | 2 | -627/+653 | |
| | | | | | ||||||
* | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-13 | 1 | -0/+1 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | do not collapse content which is just slightly higher than we allow | Mario Vavti | 2015-10-13 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-13 | 2 | -4/+5 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: include/api.php | |||||
| * | | | | api extenesions for file migration | redmatrix | 2015-10-13 | 2 | -5/+6 | |
| | | | | | ||||||
* | | | | | 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. | |||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-12 | 14 | -923/+1021 | |
|\ \ \ \ | ||||||
| * | | | | update es + nl strings | jeroenpraat | 2015-10-13 | 4 | -846/+854 | |
| | | | | | ||||||
| * | | | | Merge pull request #79 from HaakonME/master | redmatrix | 2015-10-12 | 3 | -2/+92 | |
| |\ \ \ \ | | | | | | | | | | | | | Updated Help pages to include Hubzilla on OpenShift | |||||
| | * | | | | Updated Hubzilla on OpenShift HOWTO with use of logging | Haakon Meland Eriksen | 2015-10-11 | 2 | -0/+16 | |
| | | | | | | ||||||
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Updated help page for Hubzilla on OpenShift | Haakon Meland Eriksen | 2015-10-10 | 1 | -1/+1 | |
| | | | | | |