redmatrix
2312f03eac
Always open rpost editor on document ready
2015-09-06 20:50:31 -07:00
redmatrix
1d09e4b620
use conversation defaults for /public page instead of collapsed list mode, but allow over-ride
2015-09-06 16:42:50 -07:00
redmatrix
3f6d6745de
syntax
2015-09-05 15:33:09 -07:00
redmatrix
b1888afa10
fix typos before pushing
2015-09-03 18:47:03 -07:00
redmatrix
d79e81a069
import and sync chatrooms
2015-09-03 18:44:40 -07:00
redmatrix
c83da012ff
profile import error #34
2015-09-03 16:19:59 -07:00
redmatrix
c22da3da1c
start to modularise the clone import and sync functions
2015-09-02 20:12:40 -07:00
redmatrix
470915a55b
sync "things" (obj elements)
2015-09-02 20:07:15 -07:00
redmatrix
d105f324af
import apps
2015-09-01 22:27:09 -07:00
redmatrix
6cc60ba477
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
2015-09-01 22:03:10 -07:00
redmatrix
1ce8ce896b
provide consistent ui for things
2015-09-01 19:27:41 -07:00
redmatrix
85daf26eb1
more work on objs/things
2015-09-01 19:01:19 -07:00
redmatrix
286be43963
issue #31
2015-09-01 17:16:10 -07:00
redmatrix
3852b5ce7f
separate objs/things from taxonomy
2015-09-01 17:06:58 -07:00
redmatrix
417da13353
this is a bit harder than anticipated.
2015-08-31 21:12:37 -07:00
redmatrix
d7089ab471
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
2015-08-31 21:00:28 -07:00
redmatrix
039f56f390
mostly doc tweaks, some import/export work
2015-08-31 20:58:05 -07:00
redmatrix
d7cf7316be
change the likes db structure to make it more easily importable/exportable
2015-08-31 20:55:25 -07:00
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
Mario Vavti
c7b55f7753
revert
...
do not show status editor in /display - we most probably want to read the thread or comment.
2015-07-09 22:31:21 +02:00
Mario Vavti
0bec45e570
do not show status editor in /display - we most probably want to read the thread or comment.
2015-07-09 21:03:10 +02:00
Mario Vavti
efa55437d4
increase width of the aside area and make default profile image size 300x300
2015-07-09 13:59:16 +02:00
redmatrix
43354ab385
inconsistent naming of block item types
2015-07-08 18:05:38 -07:00
redmatrix
6b41074396
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee
fix sorting of channel suggestions
2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af
rename function get_directory_settings => get_directory_setting and move sort options to directory title bar
2015-07-07 22:29:27 +02:00
redmatrix
75469a61bf
Merge pull request #4 from git-marijus/master
...
abook_pending should probably be 1 in this place
2015-07-08 06:19:48 +10:00
Mario Vavti
9c577e0422
make public forums only setting sticky and simplify function to get directory settings
2015-07-07 21:41:37 +02:00
redmatrix
7cfaae8d4f
ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files.
2015-07-06 20:21:41 -07:00
Mario Vavti
53f4b260cf
abook_pending should probably be 1 in this place
2015-07-06 22:48:12 +02:00
redmatrix
4abb114474
very crude but working doc search
2015-07-05 21:09:04 -07:00
redmatrix
f20933e1e0
more work on db storage of doco
2015-07-05 19:52:41 -07:00
redmatrix
df8f6e45e2
mod/help: read doc files from the database if present and newer than the copy in the filesystem.
2015-07-04 14:46:40 -07:00
redmatrix
90a31f4ad5
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
065a50c920
a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix
2015-07-02 21:55:36 -07:00
redmatrix
9369e521bb
a bit of cleanup and explanatory text on mod/pconfig
2015-07-02 20:57:06 -07:00
redmatrix
f6fae2ebd9
web version of util/pconfig
2015-07-02 19:54:22 -07:00
redmatrix
75560b0496
turn attached audio/video into audio/video elements as well as providing an attachment link
2015-07-01 16:23:25 -07:00
redmatrix
d5c085a3c6
cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable
2015-06-30 20:21:09 -07:00
redmatrix
1e3dffc29d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-30 20:19:50 -07:00
redmatrix
86b12ea750
lots of work on clone/import from redmatrix to hubzilla (won't go back the other way)
2015-06-30 20:18:48 -07:00
redmatrix
22cb09f537
warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue.
2015-06-29 22:37:18 -07:00
redmatrix
97e8275dc2
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-06-29 18:01:51 -07:00
Mario Vavti
7ef4397634
fix directory location
2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
090dae46e5
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-28 21:19:28 -07:00
redmatrix
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
Alexandre Hannud Abdo
7fafcbb6ef
simply 'post' is a better default term than 'status'
2015-06-27 18:10:18 -03:00
redmatrix
a3d7e8456a
undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more.
2015-06-25 20:07:10 -07:00
redmatrix
70975dda4a
remove all QR-code stuff from core - now in qrator addon
2015-06-25 19:05:49 -07:00
redmatrix
5f3edabd45
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/de/features.bb
view/de/messages.po
view/de/strings.php
2015-06-24 16:34:52 -07:00
Mario Vavti
f707f4d49a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-24 12:33:53 +02:00
Mario Vavti
201ba411ba
Reflect in directory title if we watch the local or the global directory
2015-06-24 12:33:37 +02:00
redmatrix
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
redmatrix
cb76fb8b9b
item flag fixes discovered after a few merges
2015-06-23 19:45:39 -07:00
redmatrix
833098e346
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
mod/item.php
2015-06-23 17:30:35 -07:00
redmatrix
7975bc828f
typo
2015-06-23 16:22:21 -07:00
Mario Vavti
30ba2803e7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-23 13:06:40 +02:00
Mario Vavti
b6c4601d8f
some work on directory
2015-06-23 13:06:22 +02:00
redmatrix
45d66657d7
Merge pull request #356 from solstag/signature_edit_fix
...
properly trims edited posts before signing so signature verification …
2015-06-23 14:47:59 +10:00
Alexandre Hannud Abdo
a189fc0872
properly trims edited posts before signing so signature verification works
2015-06-23 01:08:02 -03:00
redmatrix
d46f5467b3
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-22 16:09:36 -07:00
redmatrix
9879cf3c6c
ensure we always sign a trimmed item body.
2015-06-22 16:09:02 -07:00
Mario Vavti
a4775aab9b
Bring /help in line with the rest of the app
2015-06-22 14:02:14 +02:00
redmatrix
ae6612025d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
util/messages.po
2015-06-21 20:51:07 -07:00
redmatrix
0ad71b3efa
import: Improve the descriptive text for this feature
2015-06-21 19:11:07 -07:00
redmatrix
68534fd5dc
some diaspora import issues uncovered during dry-run tests
2015-06-21 17:30:23 -07:00
redmatrix
a6b9d1595e
automatically gunzip Diaspora export files if we're on a *nix system
2015-06-19 17:18:01 -07:00
redmatrix
6bd90816dd
very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
2015-06-19 16:39:03 -07:00
redmatrix
6aa159e2ac
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-18 19:15:01 -07:00
redmatrix
25e134dd9c
set return url from apps page
2015-06-18 17:53:26 -07:00
redmatrix
2963be60e5
more photos work
2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5
lots of work on merging photo and file albums/folders
2015-06-17 17:44:31 -07:00
redmatrix
65661b7ec3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/photos.php
mod/siteinfo.php
2015-06-16 18:43:03 -07:00
redmatrix
ec54111e6b
Merge pull request #349 from git-marijus/master
...
make photo upload work for remote channels with perms
2015-06-17 11:14:18 +10:00
redmatrix
d84b3cfc3c
remove file/attachments when their associated photos are removed
2015-06-16 17:50:15 -07:00
jeroenpraat
24befa2197
Small fix in siteinfo
2015-06-16 13:24:10 +02:00
Mario Vavti
93f48cd8bb
make photo upload work for remote channels with perms
2015-06-16 12:18:50 +02:00
redmatrix
bc72d3fd26
move profile photos to new methods
2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b
fix attachment permissions when they also contain an image.
2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad
photo upload: pass in the contact_allow and resource_id via include/attach.php
2015-06-15 19:52:17 -07:00
redmatrix
8c7472c6c3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-06-15 17:30:08 -07:00
redmatrix
859a2ac8ef
DB changes for some channel flags
2015-06-15 17:28:52 -07:00
Mario Vavti
905cd1da5b
do not allow/show acl button on photo edit if not owner
2015-06-15 13:04:16 +02:00
redmatrix
d2178e43f6
sql errors after last major edit adventure
2015-06-14 21:19:13 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
9642728e7d
first cut at merging files and photos, not yet well integrated but they are integrated
2015-06-14 16:50:24 -07:00
redmatrix
23f7f60bf7
make new os_storage flag work
2015-06-14 15:59:11 -07:00
redmatrix
5733491ac8
more work on items
...
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
2015-06-11 17:56:56 -07:00
redmatrix
b2c5020af7
diaspora disallowed by default
2015-06-10 18:51:39 -07:00
redmatrix
bc1b7afc85
start to partition the dav
2015-06-10 18:11:15 -07:00
redmatrix
a14d2de1f0
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 17:58:02 -07:00
redmatrix
04551ac32b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-10 17:45:04 -07:00
redmatrix
9a5d9fb8c5
put block_public back where it is needed, which is in mod_public and not mod_home
2015-06-10 17:44:04 -07:00
redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
2128d5a256
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 15:47:23 -07:00
Alexandre Hannud Abdo
a31fdd3fbb
correctly fix attachment permissions from private mentions
...
by postponing code that removes the attachment tag from the body
2015-06-10 15:37:10 -03:00
Mario Vavti
edd2d1e8d4
show login without checking for block_public, local or remote channel
2015-06-10 13:24:16 +02:00
Mario Vavti
20a317b5b7
really show login form if it is enabled
2015-06-10 11:58:45 +02:00
redmatrix
eb6a1f8387
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-09 19:39:21 -07:00
redmatrix
9592f7f3e6
put mirror_frontpage setting into admin/site
2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
2015-06-09 18:50:11 -07:00
redmatrix
faa7f97c25
s/broder/border/
2015-06-09 16:52:53 -07:00
redmatrix
03357481f7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
805e2a28ee
add nomadic identities as webfinger aliases
2015-06-09 16:29:51 -07:00
redmatrix
54b61f817d
provide a mechanism for loading the frontpage without redirecting.
2015-06-08 21:19:05 -07:00
redmatrix
507e10fa45
remove debugging
2015-06-08 16:57:30 -07:00
redmatrix
39f0e6fe62
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
2015-06-08 16:55:17 -07:00
redmatrix
5b482c1daf
magic auth issues on dreamhost
2015-06-07 23:04:46 -07:00
redmatrix
9823541c4b
make sure these are included
2015-06-07 21:36:50 -07:00
redmatrix
3c5a5a9ebf
more frontpage tweaks
2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f
reverse logic of homepage login setting
2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a
frontpage tweaks
2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c
frontpage changes
2015-06-07 16:19:59 -07:00
redmatrix
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a
Added translatable strings to the Display Settings page and refreshed util/messages.po.
2015-06-06 19:49:30 +02:00
Mario Vavti
d84f77bbc6
use the right webpage layout for an installed webpage if it exists
2015-06-04 23:04:58 +02:00
redmatrix
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
Mario Vavti
6277fb76dd
update help link
2015-06-02 11:09:57 +02:00
redmatrix
e3606ec56f
move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used.
2015-06-01 16:26:12 -07:00
redmatrix
84c085dcd7
bare bones ASLD
2015-05-31 22:16:14 -07:00
redmatrix
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
Habeas Codice
0df0fb4b46
fix unable to crop profile pic on postgres
2015-05-30 19:49:32 -07:00
redmatrix
cd3284d081
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-30 15:04:11 -07:00
redmatrix
edd228decb
strip images from directory text entries
2015-05-30 15:03:44 -07:00
Mario Vavti
8516b3259f
whitespace
2015-05-29 16:14:54 +02:00
Mario Vavti
d11d130021
add some yes/no labels and minor template fixes
2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763
some fixes to make menu sharing work and expose it in the ui.
2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b
show created/edited dates for menus
2015-05-29 11:07:57 +02:00
redmatrix
3c82156d63
untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
2015-05-28 20:50:29 -07:00
redmatrix
8fe3daab21
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
redmatrix
1a86e3321b
catch a window that wasn't yet saved when the last checkin occurred
2015-05-27 21:46:36 -07:00
redmatrix
12c17f1265
menu encoding for sharing/exchange
2015-05-27 21:09:21 -07:00
redmatrix
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
2dd02cc166
missing row in sql query which is used further down
2015-05-27 19:26:42 -07:00
redmatrix
11301d51a5
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
2015-05-27 17:30:36 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
redmatrix
675aa96f22
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-25 17:01:02 -07:00
redmatrix
23abfb0a5b
add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page.
2015-05-25 16:56:28 -07:00
redmatrix
dfa4984089
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 20:21:30 -07:00
redmatrix
1828771557
timezone setting not saved issue #336
2015-05-24 18:09:41 -07:00
redmatrix
d537fc854b
typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page
2015-05-24 17:59:31 -07:00
redmatrix
27137e48eb
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 17:16:12 -07:00
redmatrix
d9061fd09e
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-24 15:59:03 -07:00
redmatrix
52e38d7c24
search result heading not translatable
2015-05-24 15:57:59 -07:00
redmatrix
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
redmatrix
a332dfcf6b
Merge pull request #331 from solstag/jqueryprop
...
Fix accepting contacts by using correct jquery calls.
2015-05-24 12:50:43 +10:00
Klaus Weidenbach
e90c331bf6
Add PHP's xml module check and upload limits to setup.
...
And some documentation.
2015-05-24 02:58:52 +02:00
Alexandre Hannud Abdo
d37c51ef2e
Fix accepting contacts by using correct jquery calls.
...
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.
See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
while the checked property does.
"""
2015-05-22 10:15:29 -03:00
