 Andrew Manning
|
75d16e4852
|
New documentation for theme repo management
|
2015-10-16 06:18:47 -04:00 |
|
 redmatrix
|
a756c0b182
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-10-15 21:40:59 -07:00 |
|
|
redmatrix
|
550cab41fb
|
missing xchan_mail_query
|
2015-10-15 21:39:33 -07:00 |
|
|
redmatrix
|
45bd81fe8c
|
missed the xchan_mail_query
|
2015-10-15 21:38:16 -07:00 |
|
|
redmatrix
|
3f7ee613fc
|
mail sync debugging
|
2015-10-15 20:40:24 -07:00 |
|
|
redmatrix
|
93f061f78a
|
mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop.
|
2015-10-15 18:52:04 -07:00 |
|
|
redmatrix
|
7517c76ae4
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
|
2015-10-15 16:02:37 -07:00 |
|
|
redmatrix
|
e26f771cbe
|
dummy update
|
2015-10-15 16:00:31 -07:00 |
|
|
redmatrix
|
bf5a1f662a
|
generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes.
|
2015-10-15 14:18:40 -07:00 |
|
|
redmatrix
|
d9753989bf
|
issue #89 - rotating photos does not work
|
2015-10-15 13:23:40 -07:00 |
|
 Mario Vavti
|
391b98f72c
|
fix webpages
|
2015-10-15 20:57:05 +02:00 |
|
|
Mario Vavti
|
d40a087ec2
|
really fix label name
|
2015-10-15 16:07:13 +02:00 |
|
|
Mario Vavti
|
138c14d43f
|
wrong logic
|
2015-10-15 15:48:13 +02:00 |
|
|
Mario Vavti
|
dc6a594277
|
fix label name
|
2015-10-15 15:41:08 +02:00 |
|
|
Mario Vavti
|
9f5c61b1fd
|
reflect default image size changes in mod/photos
|
2015-10-15 14:52:31 +02:00 |
|
|
Mario Vavti
|
3bca640521
|
do not try to remove photos twice
|
2015-10-15 13:57:15 +02:00 |
|
|
Mario Vavti
|
73082a338b
|
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
|
2015-10-15 12:56:22 +02:00 |
|
|
Mario Vavti
|
1593ebec1f
|
update conv_list.tpl
|
2015-10-15 11:49:33 +02:00 |
|
|
Mario Vavti
|
2413968021
|
double up default photo sizes - even the mos simple camera can now do images > 1024px
|
2015-10-15 11:20:56 +02:00 |
|
|
Mario Vavti
|
44b542814a
|
if photo deleted from /cloud or /dav also delete from /photos
|
2015-10-15 10:29:39 +02:00 |
|
|
Mario Vavti
|
2848f5dab4
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-15 09:36:51 +02:00 |
|
|
redmatrix
|
f0f5a8f2b5
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-14 18:03:20 -07:00 |
|
|
redmatrix
|
0563ce93a1
|
change name of matrix app
|
2015-10-14 18:03:05 -07:00 |
|
|
redmatrix
|
6a927be76c
|
Merge pull request #88 from anaqreon/grid-app
Replaced RedMatrix icon and label in app list
|
2015-10-15 12:02:50 +11:00 |
|
|
redmatrix
|
c8e3ea955d
|
more mail sync work
|
2015-10-14 17:49:35 -07:00 |
|
|
redmatrix
|
b33a9a71f6
|
more work on import & sync of private mail and conversations
|
2015-10-14 17:40:50 -07:00 |
|
|
Andrew Manning
|
dc80431438
|
Replaced RedMatrix icon and label in app list
|
2015-10-14 19:43:40 -04:00 |
|
|
redmatrix
|
8af3dc140e
|
issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud
|
2015-10-14 15:08:07 -07:00 |
|
|
Mario Vavti
|
3c7d2d4cea
|
updating the local item only does not make much sense in this case
|
2015-10-14 23:23:06 +02:00 |
|
|
redmatrix
|
de697a4267
|
issue #86 - like/dislike in photos not working
|
2015-10-14 14:16:16 -07:00 |
|
|
Mario Vavti
|
ca35db76b8
|
wrong variable
|
2015-10-14 23:07:49 +02:00 |
|
|
Mario Vavti
|
b6eded1119
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-10-14 22:57:03 +02:00 |
|
|
Mario Vavti
|
c8d8ae89d7
|
remove $item from $prep_arr - we probably do not need it
|
2015-10-14 22:46:40 +02:00 |
|
|
redmatrix
|
b2d949ce9a
|
issue #82 - args not defined (should be arr)
|
2015-10-14 13:25:58 -07:00 |
|
|
Mario Vavti
|
f12ebffa39
|
really check for large photos feature
|
2015-10-14 22:24:13 +02:00 |
|
|
redmatrix
|
9b4d32b68c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-14 13:19:52 -07:00 |
|
|
redmatrix
|
f4e708a02f
|
port of mail encoding
|
2015-10-14 13:19:28 -07:00 |
|
|
Mario Vavti
|
b4e83b6537
|
allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
|
2015-10-14 22:14:19 +02:00 |
|
|
redmatrix
|
c7637a0c53
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-14 13:13:12 -07:00 |
|
|
redmatrix
|
9b1195c896
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-14 13:12:00 -07:00 |
|
|
redmatrix
|
732c6134dd
|
support for mail sync
|
2015-10-14 13:11:24 -07:00 |
|
 jeroenpraat
|
e98c871781
|
Regenerated messages.po.
|
2015-10-14 14:31:51 +02:00 |
|
|
redmatrix
|
d616099de6
|
Merge pull request #80 from git-marijus/master
fix /channel not updating after posting comment
|
2015-10-14 18:19:32 +11:00 |
|
 Wave
|
e3070eb170
|
Merge pull request #81 from tuscanhobbit/master
Italian strings updated
|
2015-10-14 09:12:58 +02:00 |
|
 Paolo Tacconi
|
319b02a757
|
Italian strings updated
|
2015-10-14 09:11:05 +02:00 |
|
|
redmatrix
|
64cdbb8e3b
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-10-13 16:19:33 -07:00 |
|
|
redmatrix
|
edeba4ca34
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/api.php
|
2015-10-13 16:19:25 -07:00 |
|
|
redmatrix
|
7e03f612b3
|
file migration - continued
|
2015-10-13 16:16:51 -07:00 |
|
|
redmatrix
|
578f1b8ece
|
api extenesions for file migration
|
2015-10-13 16:15:34 -07:00 |
|
|
Mario Vavti
|
e2a15d0ec9
|
fix photo visibility switch on photo upload
|
2015-10-13 14:05:27 +02:00 |
|