aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-151-4/+27
|\ | | | | | | | | Conflicts: install/update.php
* | generate all (non-square) photo scales - even if the original photo is ↵redmatrix2015-10-152-24/+24
| | | | | | | | smaller than the scale target sizes.
* | fix webpagesMario Vavti2015-10-151-1/+1
| |
* | really fix label nameMario Vavti2015-10-151-1/+6
| |
* | wrong logicMario Vavti2015-10-151-1/+1
| |
* | fix label nameMario Vavti2015-10-151-5/+2
| |
* | (re)add default image-size 320px - it is good for gallery preview. this size ↵Mario Vavti2015-10-151-0/+9
| | | | | | | | has the suffix -3 now
* | double up default photo sizes - even the mos simple camera can now do images ↵Mario Vavti2015-10-151-4/+4
| | | | | | | | > 1024px
* | if photo deleted from /cloud or /dav also delete from /photosMario Vavti2015-10-151-0/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-156-12/+92
|\ \
| * | change name of matrix appredmatrix2015-10-141-1/+1
| | |
| * | more mail sync workredmatrix2015-10-142-8/+7
| | |
| * | more work on import & sync of private mail and conversationsredmatrix2015-10-142-1/+72
| | |
| * | issue #87 - photos not getting deleted from mod_photo when deleted in DAV or ↵redmatrix2015-10-141-1/+11
| | | | | | | | | | | | cloud
| * | issue #86 - like/dislike in photos not workingredmatrix2015-10-141-1/+1
| | |
* | | wrong variableMario Vavti2015-10-141-1/+1
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-143-2/+51
|\| |
| * | issue #82 - args not defined (should be arr)redmatrix2015-10-141-1/+1
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-141-2/+2
| |\ \
| * | | port of mail encodingredmatrix2015-10-141-8/+8
| | | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-142-1/+50
| |\ \ \ | | | |/ | | |/|
| | * | support for mail syncredmatrix2015-10-142-1/+50
| | | |
* | | | remove $item from $prep_arr - we probably do not need itMario Vavti2015-10-141-1/+1
| | | |
* | | | really check for large photos featureMario Vavti2015-10-142-2/+2
| | | |
* | | | allow photo-items to appear full width if large photos feature is enabled. ↵Mario Vavti2015-10-145-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/masterredmatrix2015-10-141-2/+2
|\ \ \ | |/ / |/| | fix /channel not updating after posting comment
| * | fix photo visibility switch on photo uploadMario Vavti2015-10-131-2/+2
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-131-3/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: include/api.php
| * | api extenesions for file migrationredmatrix2015-10-131-4/+5
| | |
* | | file migration - continuedredmatrix2015-10-131-4/+29
| |/ |/|
* | port of file detail api callredmatrix2015-10-121-3/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-121-0/+24
|\|
| * file detail api call (will not work for huge files)redmatrix2015-10-121-0/+24
| |
* | missing underscoreredmatrix2015-10-121-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-122-2/+10
|\| | | | | | | | | Conflicts: include/attach.php
| * attach_list_files had some problems - wasn't used until now apparentlyredmatrix2015-10-122-2/+10
| |
* | small change to allow a person with sufficient privileges the ability to ↵redmatrix2015-10-121-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 migrationsredmatrix2015-10-061-0/+44
| |
* | remove check mail - it just reloads the page. we get a notification in the ↵Mario Vavti2015-10-041-6/+0
| | | | | | | | panel if we get new mail
* | Red:Notify > Hubzilla:Notifyjeroenpraat2015-10-031-9/+9
| |
* | need full path to deliver_hooks.phpredmatrix2015-10-021-1/+1
| |
* | one more changeredmatrix2015-10-012-0/+3
| |
* | notification changes to support testdriveredmatrix2015-10-012-1/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-012-5/+5
|\|
| * allow additional uses for xtagsredmatrix2015-10-012-5/+5
| |
* | issue #63 - missing table fields in db queryredmatrix2015-09-301-2/+2
| |
* | add delivery reports to mail (not backported to redmatrix)redmatrix2015-09-301-7/+15
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-301-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 selfredmatrix2015-09-301-2/+13
| |
| * undo self-deliver checkredmatrix2015-09-301-5/+6
| |