redmatrix
|
e23f86faa9
|
more work on doco search
|
2015-08-30 22:39:33 -07:00 |
|
redmatrix
|
7ba1217a13
|
improvements to documentation search
|
2015-08-30 20:47:15 -07:00 |
|
redmatrix
|
a42b236587
|
more AccessList stuff - this time it's mod-item, which is a biggie
|
2015-08-28 14:21:49 -07:00 |
|
redmatrix
|
d05fd9632e
|
now we get to the heavy lifting with AccessList stuff
|
2015-08-27 23:04:17 -07:00 |
|
redmatrix
|
ca0bc2bb7b
|
more work on AccessList integration
|
2015-08-27 22:20:30 -07:00 |
|
redmatrix
|
3fbb955cf2
|
start conversion to AccessList object
|
2015-08-27 21:22:59 -07:00 |
|
redmatrix
|
04b4897dd8
|
First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
|
2015-08-27 18:55:30 -07:00 |
|
redmatrix
|
d2fec56456
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/import.php
|
2015-08-26 16:00:13 -07:00 |
|
redmatrix
|
bd2d99aced
|
import fixes
|
2015-08-26 15:56:32 -07:00 |
|
redmatrix
|
71308fe8c1
|
syntax error in last checkin
|
2015-08-26 13:50:51 -07:00 |
|
redmatrix
|
da649e397e
|
import fixes
|
2015-08-26 13:49:07 -07:00 |
|
redmatrix
|
1dbcfaa2c6
|
add repository type as one that is able to self-identify as a public forum
|
2015-08-25 21:54:16 -07:00 |
|
redmatrix
|
2d471e39dc
|
this is weird
|
2015-08-25 19:23:21 -07:00 |
|
redmatrix
|
e5dec8671e
|
make diaspora person guids for hubzilla folks globally unique. That's what a globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision.
|
2015-08-25 17:21:42 -07:00 |
|
redmatrix
|
b085a3243c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
mod/connections.php
mod/connedit.php
|
2015-08-24 05:10:31 -07:00 |
|
redmatrix
|
d256e8e9f2
|
edited event showing bad signature and null_date for edit timestamp
|
2015-08-24 01:46:54 -07:00 |
|
redmatrix
|
250d286f1d
|
remove orphan mod_connections editing code (now done in mod/connedit)
|
2015-08-24 01:28:13 -07:00 |
|
redmatrix
|
8cd583fd8c
|
sync abook flags in memory after altering them
|
2015-08-23 17:36:00 -07:00 |
|
redmatrix
|
2a59392ba8
|
change name of module
|
2015-08-22 19:31:39 -07:00 |
|
redmatrix
|
c9b8f404e0
|
restrict event notification to events and birthdays (exclude tasks)
|
2015-08-22 14:35:17 -07:00 |
|
redmatrix
|
49c4aa1a54
|
cleanup of task widget - make jquery workflow a bit smoother
|
2015-08-20 20:40:42 -07:00 |
|
redmatrix
|
afbbc9cd72
|
more work on tasks
|
2015-08-20 18:43:01 -07:00 |
|
redmatrix
|
05bec13bdc
|
We don't need photos to also include attachments. It's interesting, but not all that useful.
|
2015-08-20 16:55:03 -07:00 |
|
redmatrix
|
6590ca02de
|
some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable.
|
2015-08-20 16:49:13 -07:00 |
|
redmatrix
|
a322254f2a
|
do ical export before checking logged in channel
|
2015-08-20 04:51:03 -07:00 |
|
redmatrix
|
863a979754
|
check perms on ical attachments
|
2015-08-19 17:16:19 -07:00 |
|
redmatrix
|
a4caaefd32
|
event integration improvements
|
2015-08-19 16:50:32 -07:00 |
|
redmatrix
|
3b1554db2e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-18 17:15:53 -07:00 |
|
redmatrix
|
75fbf21e6b
|
add month to export filename when using month
|
2015-08-17 22:27:41 -07:00 |
|
redmatrix
|
27b61b1456
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-17 22:25:47 -07:00 |
|
redmatrix
|
9f4f967ead
|
off by one
|
2015-08-17 22:25:17 -07:00 |
|
redmatrix
|
9763c46b7e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-08-17 22:23:23 -07:00 |
|
redmatrix
|
f682325924
|
provide ability to export by month as well as by year
|
2015-08-17 22:20:10 -07:00 |
|
redmatrix
|
abe362bdd4
|
issues encountered whilst testing import_items module using yearly dump files
|
2015-08-17 21:56:55 -07:00 |
|
redmatrix
|
1a4a921528
|
provide module for importing yearly content dumps
|
2015-08-17 21:40:40 -07:00 |
|
redmatrix
|
be3a272a80
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-16 19:54:38 -07:00 |
|
redmatrix
|
631eb4b2c2
|
issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.
|
2015-08-16 19:52:25 -07:00 |
|
redmatrix
|
18bc12c21c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-08-14 22:24:15 -07:00 |
|
redmatrix
|
0d84c77c6c
|
set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost.
|
2015-08-14 22:19:15 -07:00 |
|
redmatrix
|
f88dc84091
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/es/htconfig.tpl
view/es/update_fail_eml.tpl
|
2015-08-12 20:36:32 -07:00 |
|
redmatrix
|
b634c08d0e
|
resolve conflict
|
2015-08-11 22:41:27 -07:00 |
|
redmatrix
|
2d9d4dfeb3
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
doc/history.md
mod/import.php
|
2015-08-11 22:35:36 -07:00 |
|
redmatrix
|
0a34b96e11
|
bring back colour to abook_self in acl
|
2015-08-11 01:16:04 -07:00 |
|
redmatrix
|
81c740178d
|
convert abook_flags from hubzilla during cloning
|
2015-08-10 16:16:26 -07:00 |
|
redmatrix
|
91bbfcf554
|
photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
|
2015-08-06 17:09:09 -07:00 |
|
redmatrix
|
1b0cb9388c
|
prohibit some photo album edit operations until we figure out how to sync them with dav
|
2015-08-05 22:35:42 -07:00 |
|
redmatrix
|
880dec5a4e
|
don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)
|
2015-08-05 22:07:51 -07:00 |
|
redmatrix
|
b737e224b1
|
more work separating Diaspora from core
|
2015-08-03 16:52:51 -07:00 |
|
redmatrix
|
9f5dfe797b
|
begin moving diaspora to plugin
|
2015-08-02 17:38:34 -07:00 |
|
redmatrix
|
c1a953f960
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-07-31 15:45:13 -07:00 |
|
redmatrix
|
5e985ef34f
|
consistency of event form
|
2015-07-31 15:42:52 -07:00 |
|
redmatrix
|
d5a40cac25
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
include/items.php
|
2015-07-30 17:11:16 -07:00 |
|
redmatrix
|
3269d4632f
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-07-27 18:01:20 -07:00 |
|
redmatrix
|
85f546e691
|
crude but more or less functional event import from thunderbird ics files
|
2015-07-26 22:44:49 -07:00 |
|
redmatrix
|
70a5a7b717
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-07-26 16:51:01 -07:00 |
|
redmatrix
|
3880b485cb
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
view/pt-br/messages.po
view/pt-br/strings.php
|
2015-07-26 16:50:33 -07:00 |
|
Mario Vavti
|
54336ba43b
|
comment out some popover infos - we provide enough visual feedback now
|
2015-07-26 21:24:33 +02:00 |
|
Mario Vavti
|
f6142d18c4
|
Provide connection status if status is "a-normal"
|
2015-07-26 20:54:09 +02:00 |
|
Mario Vavti
|
6e557aa153
|
fix abook_pending reset to 1 loop if $new_friend is false and remove unused var
|
2015-07-25 17:41:19 +02:00 |
|
redmatrix
|
cc5b0cde1d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/diaspora.php
|
2015-07-23 21:07:35 -07:00 |
|
redmatrix
|
908da4589d
|
event privacy issue
|
2015-07-23 21:02:41 -07:00 |
|
redmatrix
|
c90f14c066
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
|
2015-07-21 17:13:48 -07:00 |
|
redmatrix
|
db9a0282c4
|
provide content-disposition for exported ics file
|
2015-07-20 21:28:33 -07:00 |
|
redmatrix
|
ec00c5b18a
|
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
|
2015-07-19 17:53:52 -07:00 |
|
redmatrix
|
22c1737fc9
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-07-18 16:11:54 -07:00 |
|
Mario Vavti
|
09f6337930
|
make likes/dislikes work again
|
2015-07-17 22:45:35 +02:00 |
|
redmatrix
|
3c60a0c22c
|
provide any single year of exported items
|
2015-07-16 20:20:42 -07:00 |
|
redmatrix
|
ec249d465b
|
provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)
|
2015-07-16 20:19:20 -07:00 |
|
redmatrix
|
b9fd8b4614
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
|
2015-07-15 18:41:50 -07:00 |
|
redmatrix
|
6046fe9c9e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-15 17:50:24 -07:00 |
|
Mario Vavti
|
ca1f6f8c5b
|
provide info text for automatic permissions
|
2015-07-15 14:14:10 +02:00 |
|
Mario Vavti
|
5fcf1256bd
|
whitespace
|
2015-07-15 14:07:35 +02:00 |
|
Mario Vavti
|
0c77a127f2
|
show inherited state in Connection Default Permissions
|
2015-07-15 14:03:34 +02:00 |
|
redmatrix
|
0d1a541e88
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/import.php
|
2015-07-14 22:40:22 -07:00 |
|
redmatrix
|
9b15dbde1c
|
group fixes to import
|
2015-07-14 22:38:04 -07:00 |
|
redmatrix
|
5487b22dd7
|
fix import of group members
|
2015-07-14 22:19:21 -07:00 |
|
redmatrix
|
89fbfd2bf8
|
more stuff to resume failed imports
|
2015-07-14 22:04:07 -07:00 |
|
redmatrix
|
a87e318403
|
log the import progress
|
2015-07-14 21:30:13 -07:00 |
|
redmatrix
|
caaf7192ff
|
provide resumable imports if things go wrong
|
2015-07-14 21:02:54 -07:00 |
|
redmatrix
|
e8f19c1e15
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
|
2015-07-14 17:10:13 -07:00 |
|
redmatrix
|
3687fef53c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-14 16:55:58 -07:00 |
|
redmatrix
|
a5989b0f31
|
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
|
2015-07-14 16:54:16 -07:00 |
|
Mario Vavti
|
104cbcab72
|
make strings translateable
|
2015-07-14 21:32:18 +02:00 |
|
Mario Vavti
|
dd57864867
|
revert provide inherited perms for connection default permissions
|
2015-07-14 13:46:22 +02:00 |
|
Mario Vavti
|
d8edb66287
|
remove dbg
|
2015-07-14 13:21:39 +02:00 |
|
Mario Vavti
|
711dd1468d
|
provide inherited perms for connection default permissions
|
2015-07-14 13:16:08 +02:00 |
|
Mario Vavti
|
7f71297383
|
cleanup connedit
|
2015-07-14 12:46:40 +02:00 |
|
redmatrix
|
da5cec24e0
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-07-13 17:48:54 -07:00 |
|
redmatrix
|
6916c1076c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-13 17:43:10 -07:00 |
|
redmatrix
|
3ec2dc81f2
|
allow sys editing of menu
|
2015-07-11 16:30:06 -07:00 |
|
Mario Vavti
|
04c794da10
|
whitespace and comment out info again
|
2015-07-12 01:12:20 +02:00 |
|
Mario Vavti
|
f81874ca49
|
fix sys channel menu in a morre standard way
|
2015-07-12 01:04:57 +02:00 |
|
Mario Vavti
|
6ca4240d96
|
menu_id is still needed
|
2015-07-12 00:49:03 +02:00 |
|
Mario Vavti
|
d8f03450e7
|
make menu creation for sys channel work
|
2015-07-12 00:40:12 +02:00 |
|
Mario Vavti
|
54bb2651f5
|
merge
|
2015-07-11 11:58:53 +02:00 |
|
redmatrix
|
a497d8ee66
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
|
2015-07-10 14:27:41 -07:00 |
|
Mario Vavti
|
b6f28900e6
|
show status editor in /display on share action.
|
2015-07-10 21:48:24 +02:00 |
|
Mario Vavti
|
b1f926ba89
|
merge redmatrix fixes
|
2015-07-10 20:46:46 +02:00 |
|
Mario Vavti
|
fee607db56
|
more webpages - generic-content-wrapper fixes
|
2015-07-10 13:16:45 +02:00 |
|
Mario Vavti
|
1554b5a2ee
|
add generic content wrapper to post/webpage editor and make editpost render correctly
|
2015-07-10 12:46:20 +02:00 |
|