redmatrix
|
0998a108ea
|
wrong operator
|
2016-09-03 19:43:11 -07:00 |
|
redmatrix
|
f17eb946f6
|
pro: add system techlevel to new accounts
|
2016-09-02 16:14:33 -07:00 |
|
Mario Vavti
|
b00d084243
|
show home icon in first position in nav, provide register link also if register policy is set to approve and whitespace cleanup
|
2016-09-02 15:05:19 +02:00 |
|
redmatrix
|
af87038150
|
separate the 'expert' feature into 'advanced_theming' and 'advanced_dirsearch'. Hide both features unless techlevel > 3.
|
2016-09-01 19:01:02 -07:00 |
|
Mario Vavti
|
24192ff1ef
|
introduce checklist BBcode for checklists
|
2016-09-01 13:57:45 +02:00 |
|
redmatrix
|
fa8febbb31
|
some issues with saved search - tags and connection searches weren't being saved.
|
2016-08-31 21:57:08 -07:00 |
|
redmatrix
|
8ba1bf02a4
|
document that include/permissions is being deprecated but may still be needed.
|
2016-08-31 20:29:32 -07:00 |
|
redmatrix
|
c3fdd00aa4
|
allow public comments (sort of - see the notes)
|
2016-08-31 18:39:50 -07:00 |
|
redmatrix
|
ea0be8ea1a
|
provide techlevels in the pro server role. Should have no visible effect on other roles.
|
2016-08-31 17:49:22 -07:00 |
|
Mario Vavti
|
e9462ba145
|
resolve merge conflict
|
2016-08-31 09:41:07 +02:00 |
|
Mario Vavti
|
2b9322fc7d
|
provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox
|
2016-08-31 09:38:47 +02:00 |
|
Andrew Manning
|
16b7df3717
|
Imported webpage elements update existing elements properly. AllowCode permission is checked correctly and issues error on import if denied.
|
2016-08-30 22:11:14 -04:00 |
|
redmatrix
|
85d8300421
|
increase timeout on oembed remote fetches. This is a balancing act. Too short and many sites won't show up. Too long and you could be watching a spinner anxiously waiting for the page to load even if your own site is blindingly fast.
|
2016-08-30 17:23:14 -07:00 |
|
Andrew Manning
|
ad5c93d673
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-30 06:14:22 -04:00 |
|
redmatrix
|
8b6230726f
|
add authors to post distribution; case insensitive sort apps
|
2016-08-29 18:06:39 -07:00 |
|
Andrew Manning
|
07e28a9757
|
Display text around the searched query in documentation search
|
2016-08-27 21:26:16 -04:00 |
|
Andrew Manning
|
69ca279101
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-27 14:14:28 -04:00 |
|
redmatrix
|
40b2e24c6d
|
vsprintf error on sql query
|
2016-08-27 05:06:12 -07:00 |
|
Andrew Manning
|
ddfc5209d3
|
Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.
|
2016-08-27 06:52:01 -04:00 |
|
redmatrix
|
aea2fa1629
|
issue #186 ...different check for pubforum with expert permissions
|
2016-08-26 16:02:04 -07:00 |
|
redmatrix
|
8a2b96c2f9
|
- implemented but untested: duplicate detection for photo 'move to another folder'
- weekly string update
|
2016-08-26 01:37:46 -07:00 |
|
redmatrix
|
38ea8bee93
|
ratings are gone. They can be enabled, but there is no UI for doing so at this time; and will likely only be available in a 'pro' configuration once the new implementation details have been hashed out. This appears to require a mechanism for rebuttal before it can again be opened to the public. There are also some synchronisation issues to contend with; as ratings are currently only distributed to active directory servers. There is no reliable mechanism for a new directory server to fetch existing ratings.
|
2016-08-25 17:43:07 -07:00 |
|
redmatrix
|
a969f18137
|
move premium channel to 'pro' since that's the only configuration where it works reliably.
|
2016-08-25 17:09:19 -07:00 |
|
redmatrix
|
8d94402d25
|
attach_move() function created to relocate files or photos to different directories in the cloud area and photo albums without deleting and recreating (which would create a new resource_id and invalidate any existing links).
|
2016-08-24 22:41:54 -07:00 |
|
redmatrix
|
d3369384d1
|
include port in pdo url when host is 'localhost'
|
2016-08-23 18:18:05 -07:00 |
|
Andrew Manning
|
420aa4bc44
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-23 06:57:10 -04:00 |
|
Andrew Manning
|
305e0538d2
|
Website export to cloud files works. Created new recursive copy function in attach.php.
|
2016-08-23 06:55:26 -04:00 |
|
redmatrix
|
38ca3bac40
|
optional server role compatibility checks for plugins
|
2016-08-22 17:41:41 -07:00 |
|
redmatrix
|
e967bc9c45
|
public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms
|
2016-08-22 17:04:13 -07:00 |
|
redmatrix
|
7045b920ef
|
make zid() do the right things when confronted with url fragments
|
2016-08-21 17:38:36 -07:00 |
|
redmatrix
|
b6a545b4a2
|
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
|
2016-08-21 16:33:59 -07:00 |
|
Mario Vavti
|
4f62d7a78f
|
move jotnets to jot and some cleanup (mostly whitespace)
|
2016-08-21 15:43:03 +02:00 |
|
Andrew Manning
|
1c61e316b4
|
Block export and re-import works. Fixed bug where layout content was not being imported properly.
|
2016-08-20 21:08:15 -04:00 |
|
Andrew Manning
|
2d42d58738
|
Layouts list and are selectable for export to the zip file
|
2016-08-20 16:05:27 -04:00 |
|
Andrew Manning
|
80ed05d45d
|
Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.
|
2016-08-20 15:22:30 -04:00 |
|
redmatrix
|
9fe4bae52f
|
block backdoor delivery of bulk imported items
|
2016-08-19 17:12:48 -07:00 |
|
Andrew Manning
|
cf93d9c3b4
|
Merge remote-tracking branch 'upstream/dev' into website-export
|
2016-08-19 19:34:04 -04:00 |
|
Andrew Manning
|
40a7d38210
|
Pages populate the available-to-export list. New checkbox class for smaller boxes.
|
2016-08-19 19:32:52 -04:00 |
|
redmatrix
|
fa98f4c55d
|
import anomaly
|
2016-08-17 19:44:24 -07:00 |
|
Andrew Manning
|
f2e87a204d
|
Progress implementing zip file export
|
2016-08-17 21:25:50 -04:00 |
|
Andrew Manning
|
c98b91f514
|
Stash changes for merge with dev
|
2016-08-17 18:19:36 -04:00 |
|
redmatrix
|
537401cf27
|
don't set session theme unless logged in.
|
2016-08-16 22:15:51 -07:00 |
|
redmatrix
|
b2eede891a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-08-16 19:01:20 -07:00 |
|
redmatrix
|
a2873c18ca
|
get rid of ugly code construct
|
2016-08-16 19:00:38 -07:00 |
|
Mario Vavti
|
291b0edbe0
|
rename limited -> custom
|
2016-08-16 08:05:46 +02:00 |
|
hubzilla
|
752bb169ed
|
Merge pull request #487 from git-marijus/dev
implement groups in the acl select.
|
2016-08-16 06:59:52 +10:00 |
|
Mario Vavti
|
4b101c2240
|
provide group options serverside and minor cleanup
|
2016-08-15 22:54:07 +02:00 |
|
redmatrix
|
4facae674d
|
fix attached photo/file permissions on clones
|
2016-08-15 13:18:25 -07:00 |
|
redmatrix
|
000861da0d
|
event_store_event hook
|
2016-08-14 18:22:18 -07:00 |
|
Andrew Manning
|
6868403383
|
Context help for settings/features page
|
2016-08-14 13:34:52 -04:00 |
|
Andrew Manning
|
229cc2ac43
|
Change text for submenu on small screens to be static toggle statement
|
2016-08-14 06:55:02 -04:00 |
|
Andrew Manning
|
cb9ac6dd34
|
Replace hardcoded button title in javascript to translatable text
|
2016-08-14 06:46:48 -04:00 |
|
Andrew Manning
|
2e7f4c1870
|
Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button
|
2016-08-14 06:41:12 -04:00 |
|
redmatrix
|
165f442d70
|
pending flag not being reset when using autoperms from custom role
|
2016-08-12 18:17:39 -07:00 |
|
redmatrix
|
ebbe18a426
|
better method of dealing with api versions
|
2016-08-11 20:09:38 -07:00 |
|
redmatrix
|
6bc5dd75bd
|
more cleanup of api
|
2016-08-11 19:42:44 -07:00 |
|
redmatrix
|
0257d660ad
|
move error processing back inside the function
|
2016-08-11 18:09:48 -07:00 |
|
redmatrix
|
c63deda71a
|
embed filter adjustments
|
2016-08-11 17:33:28 -07:00 |
|
redmatrix
|
3ba4b2c1c1
|
A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere.
|
2016-08-11 17:02:52 -07:00 |
|
redmatrix
|
e985436b3b
|
forum detection was off for forums with custom perms
|
2016-08-10 20:49:51 -07:00 |
|
Mario Vavti
|
82e867a9a8
|
implement acl for folder creation
|
2016-08-10 16:17:09 +02:00 |
|
redmatrix
|
5238a27ab3
|
function order reversed
|
2016-08-09 20:50:33 -07:00 |
|
redmatrix
|
ec3ca11d0d
|
bad code format
|
2016-08-09 16:59:35 -07:00 |
|
redmatrix
|
07dca90352
|
updates to hcard parsing
|
2016-08-07 21:00:23 -07:00 |
|
redmatrix
|
3338f3c5b2
|
diaspora vcard updates
|
2016-08-07 20:16:14 -07:00 |
|
redmatrix
|
5243dd153b
|
use config system.server_role and deprecate 'UNO'
|
2016-08-07 17:29:35 -07:00 |
|
Mario Vavti
|
89c026924b
|
fix /cloud upload for images
|
2016-08-06 14:40:23 +02:00 |
|
Mario Vavti
|
4f0b138692
|
bring back acl for cloud file uploads
|
2016-08-06 12:46:10 +02:00 |
|
Mario Vavti
|
53a2262fef
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-05 12:13:50 +02:00 |
|
Andrew Manning
|
6a82ff871f
|
Parse bbcode when page loads
|
2016-08-04 19:45:35 -04:00 |
|
Andrew Manning
|
05a9f0aa14
|
Convert select bbcode tags including [observer], [baseurl], [sitename]
|
2016-08-03 20:53:51 -04:00 |
|
Mario Vavti
|
908e15bc90
|
multi acl: port events
|
2016-08-03 23:57:41 +02:00 |
|
Mario Vavti
|
b959641ca8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-03 21:17:08 +02:00 |
|
Mario Vavti
|
c50bfa07ca
|
multiple acl work
|
2016-08-03 21:16:57 +02:00 |
|
redmatrix
|
c4fd0af16d
|
comment policy permissions typo
|
2016-08-02 18:21:43 -07:00 |
|
redmatrix
|
3a7d3e3a54
|
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
|
2016-08-01 20:12:52 -07:00 |
|
redmatrix
|
4c76b31684
|
/storeurl/cloudurl/
|
2016-08-01 17:44:21 -07:00 |
|
redmatrix
|
9b9621e10d
|
add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)
|
2016-07-31 20:14:25 -07:00 |
|
redmatrix
|
86eb923f29
|
make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
|
2016-07-31 18:08:41 -07:00 |
|
Andrew Manning
|
42b718b3e0
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-31 07:38:44 -04:00 |
|
Andrew Manning
|
7c47557554
|
Improved UI. Removed logger statements.
|
2016-07-31 07:30:25 -04:00 |
|
redmatrix
|
da9b6690e5
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-07-30 14:04:30 -07:00 |
|
Andrew Manning
|
f17f51a9c1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-30 06:30:46 -04:00 |
|
redmatrix
|
4ce8f965aa
|
issue #466, sql typo
|
2016-07-28 13:10:19 -07:00 |
|
Mario Vavti
|
9fa3956aa8
|
translate mime types to icons, update some icons, move file preview (upload progress) below table header
|
2016-07-28 10:28:48 +02:00 |
|
redmatrix
|
80e4338314
|
missing s
|
2016-07-26 19:28:28 -07:00 |
|
redmatrix
|
56957b60e2
|
issue #460 - remove reference to $a which was passed by value since it doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
|
2016-07-26 15:57:33 -07:00 |
|
redmatrix
|
2fb4952137
|
issue #460
|
2016-07-25 13:27:17 -07:00 |
|
redmatrix
|
b5f2b4af35
|
string update and some minor comment edits
|
2016-07-24 16:11:34 -07:00 |
|
redmatrix
|
2c1b432613
|
fix birthday addtocal
|
2016-07-21 21:35:26 -07:00 |
|
redmatrix
|
bc46f70a90
|
zat URL auth updated to match changes to the atoken_login interface
|
2016-07-21 20:04:30 -07:00 |
|
Andrew Manning
|
5a63ddd645
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-21 21:14:54 -04:00 |
|
redmatrix
|
8566f91303
|
fail oembed if it is attempted and less than 80% of the original content is left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
|
2016-07-21 17:44:04 -07:00 |
|
redmatrix
|
cf0b1f1f15
|
typo
|
2016-07-21 01:48:20 -07:00 |
|
redmatrix
|
da707736a0
|
issue #453 and a bug noted from the logfiles related to the schema change last month
|
2016-07-20 23:04:07 -07:00 |
|
redmatrix
|
6a56a509d3
|
Merge branch 'dev' into perms
|
2016-07-20 19:03:18 -07:00 |
|
redmatrix
|
779885f9af
|
fix vevent multi-line formatting
|
2016-07-20 18:59:51 -07:00 |
|
redmatrix
|
3affb2e817
|
sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.
|
2016-07-20 17:55:40 -07:00 |
|
Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
redmatrix
|
a3e5307b93
|
fix the forum detection in include/zot
|
2016-07-19 22:57:23 -07:00 |
|
redmatrix
|
ae6256f95a
|
another couple of minor perms fixes
|
2016-07-19 22:32:22 -07:00 |
|
redmatrix
|
a961d5e6c8
|
permission fixes
|
2016-07-19 20:49:54 -07:00 |
|
redmatrix
|
237cca7a0d
|
fixes to perms
|
2016-07-19 19:33:48 -07:00 |
|
redmatrix
|
ea83032863
|
translate more old perms calls
|
2016-07-19 17:52:45 -07:00 |
|
redmatrix
|
6a4573b935
|
Merge branch 'dev' into perms
|
2016-07-19 17:05:59 -07:00 |
|
redmatrix
|
f4b658d7b1
|
issue #411
|
2016-07-19 05:13:18 -07:00 |
|
redmatrix
|
7272b97e9a
|
yet more grungy perms work.
|
2016-07-19 01:26:28 -07:00 |
|
redmatrix
|
99cf2cbaa9
|
missing bracket
|
2016-07-18 21:46:40 -07:00 |
|
redmatrix
|
b63165b6e0
|
more perms work (a lot more)
|
2016-07-18 21:37:34 -07:00 |
|
redmatrix
|
32ce790717
|
move legacy code inside the legacy check
|
2016-07-18 19:09:27 -07:00 |
|
redmatrix
|
b5b57523f1
|
more perms work
|
2016-07-18 16:45:43 -07:00 |
|
redmatrix
|
7524948a97
|
Merge branch 'dev' into perms
|
2016-07-18 16:10:41 -07:00 |
|
redmatrix
|
f9b67d3630
|
more perms work
|
2016-07-18 13:44:39 -07:00 |
|
Mario Vavti
|
f44ca74e99
|
do not transform hashes to tags in [code=xxx] or [code] blocks
|
2016-07-18 13:48:09 +02:00 |
|
redmatrix
|
10fa5c20e7
|
export/import channel permissions
|
2016-07-17 22:40:39 -07:00 |
|
redmatrix
|
f7833411a1
|
clone channel perms
|
2016-07-17 22:18:35 -07:00 |
|
redmatrix
|
de4f9d68bd
|
Merge branch 'dev' into perms
|
2016-07-17 21:40:04 -07:00 |
|
Andrew Manning
|
d6b28cdc57
|
Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.
|
2016-07-17 16:05:26 -04:00 |
|
Andrew Manning
|
6c5086a933
|
Added functions to check cloud files path and return path with hashed names
|
2016-07-17 11:52:21 -04:00 |
|
Andrew Manning
|
99354ac576
|
Merge remote-tracking branch 'upstream/dev' into website-import-remote
|
2016-07-16 21:04:04 -04:00 |
|
Andrew Manning
|
e7b8531751
|
Stash changes to merge from dev
|
2016-07-16 21:02:13 -04:00 |
|
Andrew Manning
|
ff2f599142
|
Postpone remote folder import until filesystem mirroring matures.
|
2016-07-16 19:25:44 -04:00 |
|
redmatrix
|
7ee7f00bf3
|
Here's the basic UI for the Zot Access Tokens, requires some minor cleanup
|
2016-07-14 22:41:53 -07:00 |
|
redmatrix
|
397a23499d
|
make the xchan_hash for the access token location independent
|
2016-07-14 21:28:17 -07:00 |
|
redmatrix
|
f3eb9af046
|
more ZAT work
|
2016-07-14 19:43:47 -07:00 |
|
Andrew Manning
|
0edf248cd1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-14 22:25:30 -04:00 |
|
Andrew Manning
|
514ffb74aa
|
Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works.
|
2016-07-14 22:24:23 -04:00 |
|
redmatrix
|
e6c8614801
|
first cut at zot access tokens
|
2016-07-14 19:24:15 -07:00 |
|
redmatrix
|
191cd21028
|
more perms work
|
2016-07-13 23:05:19 -07:00 |
|
redmatrix
|
b3a785711c
|
deprecate/remove json_decode_plus
|
2016-07-13 22:11:06 -07:00 |
|
redmatrix
|
503b420292
|
rework perm_is_allowed
|
2016-07-13 20:23:20 -07:00 |
|
redmatrix
|
0aa205044b
|
Merge branch 'dev' into perms
|
2016-07-13 20:19:11 -07:00 |
|
redmatrix
|
00afe56cad
|
let abconfig specify a family
|
2016-07-13 20:17:40 -07:00 |
|
redmatrix
|
1fd65c934d
|
lots more permission work
|
2016-07-13 19:53:28 -07:00 |
|
Andrew Manning
|
75b943b98a
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-13 05:50:31 -04:00 |
|
redmatrix
|
f4e4e734de
|
more work on perms
|
2016-07-12 21:47:24 -07:00 |
|
redmatrix
|
6424bac47c
|
Merge branch 'dev' into perms
|
2016-07-12 20:50:27 -07:00 |
|
redmatrix
|
bdd7d24ac1
|
update_remote_id - updated to work with iconfig
|
2016-07-12 19:08:36 -07:00 |
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -04:00 |
|
redmatrix
|
0fa807e7ad
|
don't try to send sync packets to dead sites.
|
2016-07-12 18:38:39 -07:00 |
|
redmatrix
|
ed0e2b52d7
|
move permissiondescription class to zotlabs/lib
|
2016-07-11 21:46:16 -07:00 |
|
redmatrix
|
168d35747d
|
use the get_hostname function rather than parse the url
|
2016-07-11 18:59:54 -07:00 |
|
redmatrix
|
a01baab4f0
|
Merge branch 'dev' into perms
|
2016-07-11 17:45:10 -07:00 |
|
redmatrix
|
71b001fdb7
|
more perms work - notably the stuff in public_perms
|
2016-07-11 17:02:49 -07:00 |
|
redmatrix
|
833de9180e
|
create change_channel hook
|
2016-07-11 13:46:06 -07:00 |
|
redmatrix
|
cc83983ae5
|
perms work
|
2016-07-10 17:45:14 -07:00 |
|
Andrew Manning
|
c5e534c0cb
|
Clearer import control interface
|
2016-07-10 07:21:52 -04:00 |
|
Andrew Manning
|
a338a97d5b
|
First draft of website import tools
|
2016-07-10 06:58:20 -04:00 |
|
redmatrix
|
e6638b4715
|
change default so we don't have to check for array existence later
|
2016-07-09 21:23:00 -07:00 |
|
redmatrix
|
c9db8c6857
|
more permissions work
|
2016-07-09 21:08:02 -07:00 |
|