 git-marijus
|
4ea4a036ef
|
Merge pull request #834 from mjfriaza/dev
Updated the Spanish translation
|
2017-08-02 12:17:07 +02:00 |
|
 Manuel Jiménez Friaza
|
2dbf8a5e00
|
Updated the Spanish translation
|
2017-08-02 08:57:30 +02:00 |
|
|
git-marijus
|
6614d465d6
|
css fix
|
2017-08-02 00:28:05 +02:00 |
|
|
git-marijus
|
2ba2187c2e
|
do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_type
|
2017-08-01 23:45:41 +02:00 |
|
|
git-marijus
|
599b395e24
|
finally fix recursive attachments permissions
|
2017-08-01 23:20:39 +02:00 |
|
|
git-marijus
|
aa766b53d6
|
use small line-height only for larger screens
|
2017-08-01 18:03:53 +02:00 |
|
|
Mario Vavti
|
cf437c6a33
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-01 14:26:17 +02:00 |
|
|
Mario Vavti
|
8b6a24c67d
|
remove blugrid schema until somebody cares to fix it
|
2017-08-01 14:25:59 +02:00 |
|
|
Mario Vavti
|
46d8cf3f94
|
strings
|
2017-08-01 12:32:50 +02:00 |
|
|
Mario Vavti
|
a510c91d48
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-01 11:41:25 +02:00 |
|
|
Mario Vavti
|
2f8c5cf7d0
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-08-01 03:59:32 +02:00 |
|
|
git-marijus
|
1f2482f6ab
|
correct the logic for configs in app requirement
|
2017-08-01 03:38:41 +02:00 |
|
 zotlabs
|
9476c631b0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-07-31 17:23:33 -07:00 |
|
|
Mario Vavti
|
10e459140b
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-01 02:12:52 +02:00 |
|
|
Mario Vavti
|
b66cd8363e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-01 00:57:15 +02:00 |
|
|
Mario Vavti
|
376b05bcc9
|
less badge more icon
|
2017-08-01 00:56:59 +02:00 |
|
|
Mario Vavti
|
2fcbbfe3d4
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-07-31 17:34:26 +02:00 |
|
|
git-marijus
|
9ec995dbf0
|
improve file_activity() a little
|
2017-07-31 16:59:43 +02:00 |
|
|
git-marijus
|
79a806f328
|
db update to add index for item.obj_type
|
2017-07-31 16:49:56 +02:00 |
|
|
zotlabs
|
445fa6825a
|
typo
|
2017-07-30 21:56:39 -07:00 |
|
|
zotlabs
|
e3c8e4f483
|
modify connection edit display for channels with no address/webbie
|
2017-07-30 21:55:28 -07:00 |
|
|
zotlabs
|
8f3a99ad1f
|
ensure we can work around the $is_http var in include/follow - this is left over from when the only non-webfinger connections we could make were RSS/Atom feeds.
|
2017-07-30 19:04:17 -07:00 |
|
|
git-marijus
|
126e06b32a
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-07-31 02:47:24 +02:00 |
|
|
git-marijus
|
988371be0b
|
disable file notifications on initial upload for now - it can behave funky when uploading multiple small files at once
|
2017-07-31 02:35:46 +02:00 |
|
|
git-marijus
|
b4efe8ad8d
|
implement system configs as app requirement and add the pubstream app
|
2017-07-31 02:24:49 +02:00 |
|
|
zotlabs
|
964a02d684
|
provide a better "is_commentable" default for OStatus conversations that were fetched on the fly
|
2017-07-30 16:15:34 -07:00 |
|
|
zotlabs
|
40effa4417
|
add options flag to bb_to_markdown so we can distinguish between diaspora use and other use and
therefore filter and adjust content selectively
|
2017-07-30 13:52:16 -07:00 |
|
|
git-marijus
|
35c05a3180
|
fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder
|
2017-07-30 19:46:52 +02:00 |
|
|
git-marijus
|
4a071b9a1c
|
ltrim $display_path in attach_store() to be consistent with attach_mkdir() and go to created folder after successfully creating one
|
2017-07-30 19:21:02 +02:00 |
|
|
git-marijus
|
ead80481b9
|
another syntax error
|
2017-07-30 18:01:01 +02:00 |
|
|
git-marijus
|
297057d2bd
|
do not include ACTIVITY_OBJ_FILE obj_type in the ping/something query
|
2017-07-30 17:49:35 +02:00 |
|
|
git-marijus
|
06bd540cfa
|
no need for jquery here
|
2017-07-30 10:45:59 +02:00 |
|
|
git-marijus
|
3451fe2d40
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-07-30 07:41:46 +02:00 |
|
|
zotlabs
|
2ee0f769d9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-07-29 15:42:33 -07:00 |
|
|
git-marijus
|
8161ec88e5
|
implement file notification on initial upload and rename get_parent_cloudpath() to get_cloud_url() which now includes the filename
|
2017-07-29 23:32:48 +02:00 |
|
|
git-marijus
|
7b992decd4
|
close the apps-menu if the notifications-menu is open and vice versa
|
2017-07-29 16:06:42 +02:00 |
|
|
zotlabs
|
9b9fe39839
|
missing quotes on string in network update_unseen
|
2017-07-29 04:47:55 -07:00 |
|
|
git-marijus
|
1f57a59618
|
make pubs notification available on small screens
|
2017-07-29 12:36:54 +02:00 |
|
|
git-marijus
|
5a1b850dd6
|
provide public stream notification also for not authenticated viewers
|
2017-07-29 12:24:03 +02:00 |
|
|
git-marijus
|
c4e0e20eb3
|
switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network since item_notshown is also used for likes
|
2017-07-29 11:37:35 +02:00 |
|
|
zotlabs
|
eedee6d0a1
|
fix notifications - item_notshown is set for likes, etc.
|
2017-07-29 01:58:34 -07:00 |
|
|
zotlabs
|
e316494e06
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-07-28 15:25:29 -07:00 |
|
|
git-marijus
|
4585e35b3e
|
filter by item_notshown instead of obj_type
|
2017-07-28 23:07:16 +02:00 |
|
|
git-marijus
|
9717d4502f
|
do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do not mark those read in /network
|
2017-07-28 23:01:39 +02:00 |
|
|
git-marijus
|
f9b342c87d
|
initial notifications support for new shared files and new (since initial site load) pubstream activity
|
2017-07-28 22:42:02 +02:00 |
|
|
git-marijus
|
5f7b2e7c17
|
version 2.7
|
2017-07-28 10:19:09 +02:00 |
|
|
git-marijus
|
179478a940
|
default to static updates if not local channel
|
2017-07-27 21:51:59 +02:00 |
|
|
git-marijus
|
41a6300d3c
|
remove borders from navbar toggler
|
2017-07-27 20:47:07 +02:00 |
|
|
git-marijus
|
9be4c4d6d1
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-07-27 11:17:08 +02:00 |
|
|
zotlabs
|
d3a5911932
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-07-26 22:09:01 -07:00 |
|