redmatrix
4511f8855b
issue #516
2016-09-20 15:53:30 -07:00
Mario Vavti
8d0a0674c6
fix issue #517
2016-09-19 13:35:36 +02:00
redmatrix
2863c35ab5
a couple more namespace issues with exception handlers
2016-09-18 17:51:40 -07:00
redmatrix
44d945cd08
couple of minor issues with dba namespace during install and enotify::format referencing an unknown variable
2016-09-18 17:35:11 -07:00
redmatrix
0754da58da
some changes merged from wrong branch... new function channel_reddress() instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file
2016-09-17 14:51:57 -07:00
Mario Vavti
81624a601a
fix settings/account
2016-09-12 15:03:51 +02:00
redmatrix
a90a0874b8
fix for old style version specifiers
2016-09-08 22:56:51 -07:00
redmatrix
2d83ea86dc
more get rid of illegal offset in include/conversation
2016-09-08 22:33:39 -07:00
redmatrix
abaf752a9b
comanche: simple test issue
2016-09-08 16:54:22 -07:00
Mario Vavti
35f1055739
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-09-08 09:52:35 +02:00
Mario Vavti
98d5ae91f5
patch foundation-6.2.3 to work with jquery-3.1
2016-09-08 09:52:22 +02:00
redmatrix
83b89b9576
pro: provide settings for techlevel and techlevel_lock on admin/site page
2016-09-08 00:50:53 -07:00
redmatrix
4c89f5d397
pro: better handling of system techlevel settings.
...
system.techlevel = initial techlevel for all new accounts
system.techlevel_lock = if 1, account techlevel cannot be changed
this allows accounts to exist with alternate techlevels than a locked default, but they need to be set by the administrator. By default with no config settings, everybody starts at 0 but can set their own level.
2016-09-07 21:02:57 -07:00
redmatrix
c2f83639d4
provide version info in /pubsites
2016-09-07 17:36:45 -07:00
redmatrix
77e865fc8e
pubsites: we still need to filter really really old redmatrix sites. These will not provide a pleasant experience. We probably should add version to the table.
2016-09-07 13:45:52 -07:00
redmatrix
0d7eb186d1
Remove the platform check in pubsites, since we're reporting it now. Folks can decide for themselves.
2016-09-07 13:40:07 -07:00
redmatrix
de03f7f9ce
photo move to another album - resurrected from a temporary branch where the work had gotten lost
2016-09-06 23:13:55 -07:00
redmatrix
6e149a2dd3
turn Settings page into sub-modules
2016-09-06 20:10:56 -07:00
redmatrix
884bb60c7d
document the SubModule class and provide an option to change where the submodule name is located in the url path
2016-09-06 16:40:38 -07:00
redmatrix
95d24f1d30
final cleanup on submodules
2016-09-05 21:08:40 -07:00
redmatrix
dbb4ccbcc0
move the rest of mod_admin to sub modules
2016-09-05 21:00:00 -07:00
redmatrix
ed213c4d6d
move admin/plugins::post to submodule and get rid of absolute paths
2016-09-05 19:50:55 -07:00
redmatrix
abb7695624
move admin/security to submodule
2016-09-05 19:10:12 -07:00
redmatrix
2cadda657c
superfluous backslash
2016-09-05 18:16:29 -07:00
redmatrix
bedc7b7b69
use SubModule class for generalising submodules, move back to the zotlabs/module hierarchy
2016-09-05 18:11:00 -07:00
redmatrix
d7d46def9d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-05 17:10:31 -07:00
redmatrix
1639f5b83d
add links to zcards #500 ; also provide drag/drop highlighting of comment regions when a link is being dragged over them
2016-09-05 17:08:48 -07:00
Mario Vavti
ba33c51b8c
json_decode() should return an array instead of an object at this place
2016-09-05 10:31:19 +02:00
redmatrix
aaa7d6a0ec
begin to organise the admin module into independent sub-modules. The same needs to happen with the API module. Using admin/plugins->get() as the first test case
2016-09-04 22:42:13 -07:00
redmatrix
ecb44ad572
sidebar table of contents for help hierarchies; note that these should probably be html due to extraneous linefeeds you might find in bbcode or markdown
2016-09-04 18:35:06 -07:00
redmatrix
5a1887ed17
move doc file parsing and rendering from the module level to the help library so that it can be re-used by widgets
2016-09-04 00:50:35 -07:00
redmatrix
8b17a6ddd1
don't send purge_all notification to self.
2016-09-03 17:32:48 -07:00
redmatrix
a7eae1031c
update diaspora compatibility list, and also remove private mail 'unsend' (recall) from techlevel 0 which includes the basic server configuration. It's one less cross network compatibility issue that basic members will have to be aware of and one less complication for entry-level 'pro' members.
2016-09-03 16:33:48 -07:00
redmatrix
904881e207
pro: allow admin to set a site techlevel and optionally lock it.
2016-09-02 16:08:30 -07:00
redmatrix
75c1e7a193
missed the namespace
2016-09-02 02:34:33 -07:00
redmatrix
5897ed896a
empty schema
2016-09-02 02:06:05 -07:00
redmatrix
47dd1da6fb
put theme config into its own namespace
2016-09-01 22:20:08 -07:00
redmatrix
b3efdf2109
turn theme configuration into a class object
2016-09-01 22:10:56 -07:00
redmatrix
e5c077243c
check that the advanced_theming feature is enabled before the pdledit module can be accessed.
2016-09-01 20:35:52 -07: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
redmatrix
720f1d7123
actively set all the theme options on the display settings page based on the current theme selection
2016-09-01 17:09:58 -07:00
redmatrix
678148b9aa
more work on theme select backend
2016-09-01 13:48:11 -07:00
redmatrix
549943fb10
provide json module to load theme specific settings so we can auto-fill the display settings page with schemas and theme settings whenever somebody makes a different theme selection
2016-09-01 13:19:08 -07:00
redmatrix
2ebb8851f6
theme preview - that was easy; plus a bit more tweaking of the saved search widget to try and get the sucker to auto submit
2016-09-01 12:42:47 -07: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
4bdb028499
Hubzilla pro: Don't offer 'custom/expert' permissions below a techlevel of 4; but any existing expert mode members are grandfathered in.
2016-08-31 19:55:45 -07:00
redmatrix
d18a8e849e
Do not allow PERMS_PUBLIC as a choice for writable permission limits. Change text of buttons in expert mode for consistency with usage ('Channel Permission Limits' and 'Default Access Control List (ACL)').
2016-08-31 19:22:47 -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
redmatrix
bf3a409569
only check permissions on normal photos and force cover photos as well as profile photos to be public. As a side effect 'thing' photos will also be considered public.
2016-08-30 20:54:54 -07: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
d03c66c924
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-30 13:36:01 -07:00
Andrew Manning
ad5c93d673
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-30 06:14:22 -04:00
redmatrix
52b80711f6
remove duplicated include
2016-08-29 21:21:09 -07:00
redmatrix
8b6230726f
add authors to post distribution; case insensitive sort apps
2016-08-29 18:06:39 -07:00
redmatrix
6b4cfe4f18
Before throwing a 'smarty3 dir does not exist' fatal error, try and create it. We did try and create it during install, but the template processor is initalised long before we get to that code (and throws that ugly error).
2016-08-28 22:24:27 -07:00
redmatrix
810d9fefd9
create smarty dir before any templates can be initialised
2016-08-28 22:18:51 -07:00
redmatrix
fb13e69b8e
supercedes pull request #503
2016-08-28 21:48:17 -07:00
redmatrix
689f232243
move allowed email domains to admin->security page
2016-08-28 19:36:14 -07:00
redmatrix
8931adc048
fix aconfig
2016-08-28 16:17:58 -07:00
Andrew Manning
07e28a9757
Display text around the searched query in documentation search
2016-08-27 21:26:16 -04:00
Andrew Manning
b05474fc30
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-27 18:58:10 -04:00
redmatrix
381b1a066d
doc search broken
2016-08-27 15:30:46 -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
8e243edd20
add a couple of useful observer constructs to support identity aware pages
2016-08-26 14:43:58 -07:00
redmatrix
86dd67f57d
comanche: generalise the conditional variable usage and add $observer as a test. Update comanche doco to reflect recent changes.
2016-08-26 13:58:37 -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
f1fbcd7c02
some more complex test scenarios for comanche conditionals: equals x, not equals x, in_array, and array_key_exists
2016-08-24 17:42:59 -07:00
redmatrix
dd654b9766
provide a mechanism for global template values (macro replacements that are available to all templates). There's a strong likelihood this list will increase but we may wish to actively prevent it from mushrooming out of control.
2016-08-24 13:11:01 -07:00
redmatrix
238621ee92
allow changing the server role - as well as configuring any of the three options during installation
2016-08-23 23:00:24 -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
d177cf94da
server role management, part 1
2016-08-22 16:21:07 -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
redmatrix
4d34d9c032
issue #496
2016-08-21 16:26:30 -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
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
e4244c0cac
remove insecure repository warning.
2016-08-18 17:22:54 -07:00
Andrew Manning
f2e87a204d
Progress implementing zip file export
2016-08-17 21:25:50 -04:00
redmatrix
537401cf27
don't set session theme unless logged in.
2016-08-16 22:15:51 -07:00
redmatrix
8a89cfb158
move schema settings into the display settings main so we can set theme:schema theme selectors in settings
2016-08-15 22:45:07 -07:00
redmatrix
4facae674d
fix attached photo/file permissions on clones
2016-08-15 13:18:25 -07: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
5365e9b3a5
string update
2016-08-12 14:45:16 -07:00
zottel
dc3cc655db
fix auto-connect setting
2016-08-12 23:27:03 +02:00
redmatrix
6bc5dd75bd
more cleanup of api
2016-08-11 19:42:44 -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
a8a3812890
optimise Onepoll so it doesn't try and fetch posts for a channel that we've not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place.
2016-08-10 20:01:52 -07:00
Mario Vavti
82e867a9a8
implement acl for folder creation
2016-08-10 16:17:09 +02:00
redmatrix
5243dd153b
use config system.server_role and deprecate 'UNO'
2016-08-07 17:29:35 -07:00
redmatrix
e1659b0725
fix cloud path
2016-08-07 16:21:51 -07:00
Mario Vavti
4f0b138692
bring back acl for cloud file uploads
2016-08-06 12:46:10 +02:00
redmatrix
9068ae68ad
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-05 15:40:10 -07:00
Mario Vavti
b2298d44a4
multi acl: port /settings
2016-08-05 14:45:06 +02:00
Mario Vavti
c029839971
multi acl: port /display
2016-08-05 14:25:37 +02:00
Mario Vavti
e7e73e6fd1
multi acl: port /thing
2016-08-05 13:37:47 +02:00
Mario Vavti
bed0a5773f
multi acl: port /rpost
2016-08-05 13:20:03 +02:00
Mario Vavti
53a2262fef
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-05 12:13:50 +02:00
redmatrix
eeabf514ea
minor cleanup on ratings - no real functional changes at this time
2016-08-04 18:56:05 -07:00
Andrew Manning
6a82ff871f
Parse bbcode when page loads
2016-08-04 19:45:35 -04:00
Mario Vavti
036b72757c
multi acl: port /wiki
2016-08-04 12:09:06 +02:00
Mario Vavti
120e9a1e4c
multi acl: port /webpages and /mitem
2016-08-04 11:23:43 +02:00
Mario Vavti
b49cfb2efd
multi acl: port /chat
2016-08-04 10:46:50 +02:00
Mario Vavti
0340160ba7
multi acl: port /cloud and /filestorage
2016-08-04 10:36:45 +02:00
Mario Vavti
4ede3fd771
multi acl: port photos
2016-08-04 09:10:21 +02:00
Mario Vavti
3783c1af3e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-04 08:10:13 +02:00
Andrew Manning
05a9f0aa14
Convert select bbcode tags including [observer], [baseurl], [sitename]
2016-08-03 20:53:51 -04:00
redmatrix
178c983871
issue #473 - unable to delete privacy groups
2016-08-03 16:10:28 -07: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
0febfce268
missing comma in atoken update sql
2016-08-02 19:31:31 -07:00
redmatrix
69354e808f
this should sort out likes showing up as wall-to-wall posts on diaspora
2016-08-01 22:12:44 -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
3d0c90cbc5
allow individual permissions on atokens
2016-07-31 23:17:07 -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
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
Andrew Manning
32366284a8
Import element selection page added to allow selective importing.
2016-07-30 09:56:47 -04: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
redmatrix
02fc082e45
github didn't accept the last push. Touching the files to force a git revision
2016-07-27 22:40:33 -07:00
redmatrix
be1ffca6f4
fix italian strings (messed up by rtl variable); and finish removing openid from core
2016-07-27 22:28:30 -07:00
redmatrix
5f3a8cbe93
add the hidden flag also
2016-07-27 16:14:46 -07:00
Mario Vavti
f808f1601b
rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism
2016-07-27 16:49:55 +02:00
redmatrix
672c3d7c6d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-26 22:51:07 -07:00
redmatrix
72479041ae
don't include deleted or orphaned xchans in ratings search
2016-07-26 22:50:31 -07:00
hubzilla
e286b510f1
Merge pull request #463 from git-marijus/dev
...
allow multiple-file cloud upload
2016-07-27 14:54:51 +10:00
redmatrix
315dafbe12
restrict url cache to 254 maxlen
2016-07-26 20:05:40 -07:00
redmatrix
80e4338314
missing s
2016-07-26 19:28:28 -07:00
redmatrix
db176eec40
set App::$error on 404 so we don't get two 'Page not found.' page bodies.
2016-07-26 17:24:17 -07:00
Mario Vavti
560af7a5b8
allow multiple-file cloud upload
2016-07-26 13:17:46 +02:00
Mario Vavti
6900dd34a4
URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav clients
2016-07-26 09:04:52 +02:00
redmatrix
5d4245ff01
move openid to addon
2016-07-25 17:16:41 -07:00
redmatrix
01338a7610
make drag/drop work with acl, which bypassed the form
2016-07-24 22:58:26 -07:00
redmatrix
063b4286e7
trace log pconfig cache if for some reason it isn't an array
2016-07-24 22:36:37 -07:00
redmatrix
271f85be3b
add acl selection to files upload via /cloud (still missing from directory creation)
2016-07-24 20:27:59 -07:00
redmatrix
b5f2b4af35
string update and some minor comment edits
2016-07-24 16:11:34 -07:00
Andrew Manning
6998bb1f23
Multiple file upload by drag and drop with progress indicators and auto page reload
2016-07-24 07:41:53 -04:00
redmatrix
7d897a3f03
more work on #453
2016-07-21 23:06:55 -07:00
redmatrix
0c3d5e99a2
PConfig : Check for is_null($uid) as well as false. We actually allow $uid = 0 though it shouldn't normally happen.
2016-07-21 20:50:39 -07:00
Andrew Manning
5a63ddd645
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-21 21:14:54 -04:00
Mario Vavti
b63aff77df
merge 1.10RC into dev
2016-07-22 01:13:56 +02:00
Mario Vavti
5a1eb65ed6
missing $
2016-07-22 01:07:53 +02:00
redmatrix
77a021025f
DAV auth issue
2016-07-21 15:51:10 -07:00
redmatrix
63123759ed
DAV auth issue
2016-07-21 15:50:07 -07:00
redmatrix
824dedbe9d
issue #453 and a bug noted from the logfiles related to the schema change last month
2016-07-20 23:05:31 -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
8f57bb95fe
undefined function
2016-07-20 21:57:15 -07:00
redmatrix
0c3543ac43
undefined function
2016-07-20 21:55:23 -07:00
redmatrix
6a56a509d3
Merge branch 'dev' into perms
2016-07-20 19:03:18 -07:00
Andrew Manning
d504197a78
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 21:22:53 -04:00
redmatrix
542fcaff9a
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
2016-07-20 17:57:42 -07:00
redmatrix
bc8c74eb42
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:57:17 -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
redmatrix
df0cd4dbc7
Merge branch 'dev' into perms
2016-07-20 13:39:10 -07:00
Mario Vavti
d54ad98802
Merge branch '1.10RC' into dev
2016-07-20 22:01:58 +02:00
Mario Vavti
4da005e209
type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid
2016-07-20 22:00:41 +02:00
Mario Vavti
8c2b93da72
Merge branch '1.10RC' into dev
2016-07-20 20:44:20 +02:00
Mario Vavti
ca82b45fe4
fix /mail wsod issue reported by giac hellvecio
2016-07-20 20:43:12 +02:00
Andrew Manning
99f7dd0fd4
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 05:38:19 -04:00
Andrew Manning
0c7ad924a8
Starting to make the import selection page after element scan.
2016-07-20 05:33:40 -04:00
redmatrix
a3e5307b93
fix the forum detection in include/zot
2016-07-19 22:57:23 -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
9421e42dad
doc correction
2016-07-19 17:04:38 -07:00
redmatrix
b63165b6e0
more perms work (a lot more)
2016-07-18 21:37:34 -07:00
redmatrix
b5b57523f1
more perms work
2016-07-18 16:45:43 -07:00
redmatrix
de4f9d68bd
Merge branch 'dev' into perms
2016-07-17 21:40:04 -07:00
redmatrix
279359c1bd
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-17 16:05:46 -07:00
redmatrix
dc9fa7cf64
include attach.php at the module level since 2d4b75428a87038 wasn't backported to dev and we're about to branch an RC
2016-07-17 16:04:00 -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
75fb065526
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-17 11:54:36 -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
Mario Vavti
2b674d4cd9
hide fullscreen button in embedphotos modal album view
2016-07-17 12:54:10 +02: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
aac0fa2b5f
os_delete_prohibit
2016-07-16 01:02:41 -07:00
redmatrix
8e667866fd
add service class restrictions to access_tokens
2016-07-15 21:57:41 -07:00
redmatrix
01fe7d6620
remove expired access tokens
2016-07-15 17:34:44 -07:00
redmatrix
f3aff45042
provide examples for using access tokens in urls
2016-07-15 16:31:21 -07:00
redmatrix
dcb3c2c299
mod_home: if using an atoken login on the home page redirect to the channel page of the channel that owns the atoken.
2016-07-15 15:26:36 -07:00
redmatrix
da5ec98f98
make lockview work with throwaway identities
2016-07-15 02:07:27 -07:00
redmatrix
d54f5a3831
more cleanup of atoken UI
2016-07-15 01:43:09 -07:00
redmatrix
5e475acb85
cleanup and debug of atoken feature
2016-07-15 01:33:28 -07:00
redmatrix
f666d8a083
enforce non-empty name and token/password on access tokens until better checks are instituted.
2016-07-15 01:06:25 -07: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
f70f4a4e85
add zat to acl
2016-07-14 20:26:22 -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
