Commit Graph

1961 Commits

Author SHA1 Message Date
Mario Vavti
263cfe2538 bump version 2017-05-03 14:46:45 +02:00
Mario Vavti
3645eb18f8 version and strings 2017-05-01 15:43:03 +02:00
zotlabs
88149f56bb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-26 20:11:12 -07:00
zotlabs
7d5ee81628 database support for client side e2ee for private mail 2017-04-25 21:52:24 -07:00
zotlabs
9c31e26cf1 include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader. 2017-04-17 17:54:50 -07:00
zotlabs
7a31c039fb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-17 16:04:17 -07:00
Mario Vavti
c48e90a556 bump version 2017-04-13 12:15:20 +02:00
git-marijus
2aa69257a4 Merge pull request #715 from zotlabs/cpp
backend infrastructure for 'channel protection password'; which will …
2017-04-13 12:08:17 +02:00
zotlabs
1c32564536 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes 2017-04-12 18:46:15 -07:00
zotlabs
d7f4526a00 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes 2017-04-12 17:32:28 -07:00
zotlabs
7b173a75e4 correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object 2017-04-12 07:04:22 +02:00
zotlabs
1609473e5d correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object 2017-04-11 20:17:22 -07:00
zotlabs
a76ad1478f crypto updates 2017-04-02 16:44:44 -07:00
zotlabs
810d9e21bc use aes-ctr which is slightly/arguably better than a poke in the eye and don't restrict the crypto algorithm by server role. 2017-04-01 15:30:59 -07:00
zotlabs
7256579c16 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-31 17:27:18 -07:00
Mario Vavti
47817b8ae1 version bump 2017-03-31 11:11:07 +02:00
zotlabs
8b7d0f33c3 fix a couple more instances where we were still calling mail() directly for site critical messages 2017-03-31 10:33:17 +02:00
zotlabs
a20fd4d463 get rid of some more deprecated uses of $a 2017-03-31 10:31:29 +02:00
zotlabs
bfd506f184 remove obsolete app argument from load_pdl 2017-03-31 10:30:41 +02:00
zotlabs
c20aa6062c get rid of get_app() 2017-03-31 10:30:17 +02:00
zotlabs
5f0004b416 move db_upgrade to zlib 2017-03-31 10:25:27 +02:00
zotlabs
2d4f84563b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-29 16:11:50 -07:00
Mario Vavti
3b6a0d8e5c remove hubzilla.site from directory fallback servers until further notice 2017-03-29 15:55:21 +02:00
Mario Vavti
954176cfc3 bump version 2017-03-29 14:22:37 +02:00
zotlabs
8d72cea2d1 get rid of some cruft in boot.php 2017-03-29 13:35:26 +02:00
zotlabs
0f7832dc30 code_allowed is a real mess. Start the cleanup by remving the account level code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. 2017-03-29 13:32:23 +02:00
zotlabs
a54bb07753 fix a couple more instances where we were still calling mail() directly for site critical messages 2017-03-28 17:49:48 -07:00
zotlabs
323ab3dba4 get rid of some more deprecated uses of $a 2017-03-28 17:00:44 -07:00
zotlabs
046e5e239f remove obsolete app argument from load_pdl 2017-03-28 16:07:22 -07:00
zotlabs
c5828fecc1 get rid of get_app() 2017-03-28 16:02:47 -07:00
zotlabs
e5e0a6b31f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-25 14:40:31 -07:00
zotlabs
a2e1019978 move db_upgrade to zlib 2017-03-23 21:49:20 -07:00
Mario Vavti
4d50fe0928 bump versions 2017-03-23 09:35:59 +01:00
zotlabs
e98938d03d rev update 2017-03-23 00:20:12 -07:00
zotlabs
ab58c95d27 get rid of some cruft in boot.php 2017-03-14 00:22:57 -07:00
zotlabs
58aa0f3e1a code_allowed is a real mess. Start the cleanup by remving the account level code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. 2017-03-13 16:19:47 -07:00
zotlabs
b1fc29be11 more cleanup 2017-03-12 16:30:05 -07:00
zotlabs
2a1f6e3df2 update std_version 2017-03-12 15:57:56 -07:00
zotlabs
1a49f0d164 one role. 2017-03-09 18:54:10 -08:00
zotlabs
c93db2cd21 more cleanup 2017-03-09 14:31:54 -08:00
Mario Vavti
285e04c77e bump version 2017-02-25 21:33:32 +01:00
zotlabs
3e992604c7 move some functions to more appropriate places 2017-02-23 14:52:36 -08:00
zotlabs
573846707c fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.

Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
2017-02-19 16:50:41 -08:00
zotlabs
73b28b5d94 change primary directory per request 2017-02-18 12:40:43 -08:00
zotlabs
28f0833237 fix immediate issue with multiple login forms until I can figure out an elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked. 2017-02-08 11:24:21 -08:00
zotlabs
2daafe80a5 move opensearch to plugins 2017-02-02 14:49:51 -08:00
zotlabs
94290102b6 tested extensible permissions by adding wiki permissions. Discovered a couple of issues that needed attention in the process. 2017-02-01 18:05:02 -08:00
zotlabs
db710cd2df fix a few style issues with nav login panel 2017-02-01 14:45:52 -08:00
zotlabs
7b065365e0 consolidate hubloc storage 2017-01-30 15:01:22 -08:00
zotlabs
d5d67708ac Alter the queue so that each queue item stores the scheduled time of the next delivery. This keeps the query for
queued items simple. We no longer group by posturl; as the queue update function will only keep one item per destination
scheduled for shorter term processing. Others (multiple queued items for a single destination) will be scheduled for
delivery far into the future and only delivered if the hub responds to the "active" or short term queue item.
2017-01-29 14:45:25 -08:00
zotlabs
5aa0017e91 provide lowlevel xchan storage function to ensure that all non-null rows are initialised 2017-01-28 15:01:19 -08:00
Hubzilla
6e504b7bc9 nwiki updates 2017-01-18 17:45:27 -08:00
zotlabs
52441dd754 add gravizot.de to directory server fallbacks 2017-01-10 11:21:51 -08:00
zotlabs
bb85e139f1 more vcard work 2016-12-21 15:03:33 -08:00
zotlabs
bae28965ab issue #446 apps usability - disable app if attached to a plugin that is uninstalled, allow system apps to be soft deleted and undeleted from the edit pane. 2016-12-14 19:11:01 -08:00
Mario Vavti
c9aca2a13d bump version 2016-12-12 14:42:08 +01:00
zotlabs
e06647b54e some preliminary work for email notification of likes - potentially destabilising so disabled until after next release 2016-12-11 17:54:03 -08:00
zotlabs
ec97464007 fallback directory servers need to be in the same realm 2016-12-01 20:03:23 -08:00
zotlabs
73876e5774 versioning for permission additions to ensure we're using the same set of files 2016-12-01 16:40:49 -08:00
zotlabs
97e70d62bf extensible perms: the really, really hard part - figuring out what to do about people with custom permissions so as to set sane defaults. 2016-12-01 15:52:54 -08:00
zotlabs
5b09829959 zot 1.2 2016-11-30 16:22:31 -08:00
zotlabs
4a9317db6e roll standard version to ensure that dba_pdo is the default and make this a dependency for the cdav plugin 2016-11-28 14:46:42 -08:00
zotlabs
6e016c439c db update required for Zot2 2016-11-22 14:15:33 -08:00
zotlabs
f926915e56 zot: specify crypto method 2016-11-20 21:18:38 -08:00
zotlabs
1274889931 issue #588, change 'Bug Report' app to 'Report Bug' 2016-11-17 11:00:34 -08:00
zotlabs
3c302bae5a move all the zid related stuff to one file 2016-11-13 20:22:01 -08:00
Mario Vavti
7cd7837e08 reverse logic 2016-11-07 23:24:07 +01:00
zotlabs
3885aa1e8c allow .htpreconfig.php to be loaded if you can't install without special settings or require PHP logging
at that time; it is ignored during normal use.
2016-10-26 00:17:23 -07:00
Klaus Weidenbach
745515b11f [FEATURE] Add config and use composer autoloader.
We use composer already to install SabreDAV. Include config
composer.(json|lock) to install and manage more dependencies
in future.
Also provide PSR-4 autoloading for our namespaced classes, e.g.
"Zotlabs\". To regenerate autoloader maps use:
$ composer install --optimize-autoloader --no-dev

We could also remove the whole vendor/ folder from our repository, but
that would need changes in deployment and how to install hubs and needs
more discussion first.
2016-10-18 18:11:41 +02:00
zotlabs
e46e3027fa rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generic use 2016-10-16 16:48:33 -07:00
zotlabs
facc6ee6b3 allow hooks to have negative priority 2016-10-12 20:04:19 -07:00
redmatrix
a2ccfc1e50 update version 2016-10-01 15:48:18 -07:00
Mario Vavti
b0dbb6708e std_version bump due to js and css changes 2016-09-29 12:06:40 +02:00
Mario Vavti
0add06380f upgrade fullcalendar to version 3 2016-09-14 22:51:00 +02:00
Mario Vavti
5680a88c59 version bump due to js caching issue 2016-09-09 10:01:25 +02:00
redmatrix
c2f83639d4 provide version info in /pubsites 2016-09-07 17:36:45 -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
Mario Vavti
2226d708ba bump STD_VERSION due to possible js chaching issue with new jotnets implementation 2016-09-05 10:36:28 +02: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
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
537401cf27 don't set session theme unless logged in. 2016-08-16 22:15:51 -07:00
redmatrix
8cbffdf0b4 s/$rr/$rv/ 2016-08-14 22:44:25 -07:00
redmatrix
b587bdf863 new version 2016-08-10 16:57:14 -07:00
redmatrix
de455e4cd0 server roles 2016-08-07 17:40:56 -07:00
redmatrix
5243dd153b use config system.server_role and deprecate 'UNO' 2016-08-07 17:29:35 -07:00
redmatrix
70dae328b5 check for new permissions and update channels and connections with defaults if any are found and if there are defaults for any channel roles which are being used on this site. 2016-07-25 21:59:52 -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
a961d5e6c8 permission fixes 2016-07-19 20:49:54 -07:00
redmatrix
8a9f062b95 Merge branch 'dev' into perms 2016-07-18 22:35:31 -07:00
redmatrix
269b3cef72 runaway cron emails 2016-07-18 22:33:26 -07:00
Mario Vavti
3beb94dc52 whitespace 2016-07-18 13:52:26 +02:00
Mario Vavti
4371e6ad97 resolve merge conflict 2016-07-18 13:50:32 +02:00
redmatrix
de4f9d68bd Merge branch 'dev' into perms 2016-07-17 21:40:04 -07:00
redmatrix
571b8cc85b roll version 2016-07-17 19:57:19 -07:00
redmatrix
fc78ba7c2f change std_version 2016-07-17 16:38:21 -07:00
redmatrix
d6d94d9427 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-07-15 15:31:50 -07:00
redmatrix
acb78205c8 login isn't always your email. 2016-07-15 15:30:52 -07:00
Mario Vavti
9048f8cffe bump minor version because of jquery update 2016-07-15 14:53:15 +02:00
redmatrix
94bd53c0f1 schema updates for zot access tokens 2016-07-14 20:51:15 -07:00
redmatrix
917a465ccd more work on perms 2016-07-09 19:03:29 -07:00
redmatrix
e6c8de5e4c if cron is broken because the entire db or config table is crashed, don't send a cron broken email - because we have no way of limiting it to just one email. We need a working config to do that. 2016-06-30 21:43:00 -07:00
redmatrix
51e2ef39c2 db update for abconfig transition 2016-06-23 18:35:01 -07:00
redmatrix
e5c66d94f2 relocate the cache class 2016-06-23 05:18:58 -07:00
Mario Vavti
953ac6f3c7 last merge from master did reset the std_version to 1.8 - set it back to 1.9 for dev 2016-06-20 22:03:39 +02:00
Mario Vavti
985fb44424 Merge branch 'master' into dev 2016-06-20 21:46:33 +02:00
redmatrix
3cf6f1f79c merge conflict 2016-06-19 21:47:04 -07:00
redmatrix
905374c86e experimental rtl support; this will probably require a fair bit of work. 2016-06-19 21:10:57 -07:00
redmatrix
953ca2c21e zot_revision should be string, not float 2016-06-19 19:15:26 -07:00
redmatrix
fb61c4fb34 Merge branch '1.8RC' 2016-06-19 19:12:33 -07:00
redmatrix
dbb0a0283f schema changes needed for the caldav client bit 2016-06-18 15:33:47 -07:00
redmatrix
1e68d4fb75 deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. 2016-06-13 19:58:24 -07:00
redmatrix
974ca9d526 move dev forward 2016-06-10 14:26:14 -07:00
Andrew Manning
7a242f829f Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-09 20:07:09 -04:00
redmatrix
2ad5010dc3 issue #59 2016-06-08 20:00:36 -07:00
Andrew Manning
08a9553ccc Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-05 16:52:02 -04:00
redmatrix
a6012af00d For emojis in posts, extend smilies and save a lot of duplication of effort 2016-06-04 17:06:12 -07:00
Andrew Manning
c08f428b5e Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-04 05:45:53 -04:00
redmatrix
a4474b49cb make init static on master also 2016-06-03 20:22:20 -07:00
redmatrix
0333dca550 App::init() should be static 2016-06-03 19:46:48 -07:00
Andrew Manning
b93e398674 Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-02 22:32:50 -04:00
redmatrix
f9075e2a2f some initial emoji reaction work 2016-06-02 18:42:51 -07:00
redmatrix
a9d7acda27 the rest of the schema updates - WARNING: some third party plugins may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files. 2016-06-01 21:48:54 -07:00
redmatrix
b1259876bf more db column renames 2016-05-31 21:45:33 -07:00
redmatrix
dfb6255f59 more removal of reserved words from DB schemas 2016-05-31 17:50:47 -07:00
redmatrix
ca78374f30 remove unused tables 2016-05-30 22:41:45 -07:00
redmatrix
6602ff83dd start removing reserved words from database column names (this run: addon and hook) 2016-05-30 19:44:30 -07:00
Andrew Manning
8f0c3f0e9b Merge remote-tracking branch 'upstream/dev' into wiki 2016-05-29 21:45:54 -04:00
redmatrix
3b2679db29 fix remote_channel(), update php minversion requirement 2016-05-29 18:38:24 -07:00
Andrew Manning
55b587002e Merge remote-tracking branch 'upstream/dev' into wiki 2016-05-28 14:12:53 -04:00
redmatrix
ac4688eac0 allow objs to represent inventory 2016-05-27 23:57:47 -07:00
redmatrix
0919c1eb61 check for session before querying session vars 2016-05-27 16:09:44 -07:00
Andrew Manning
d554681174 Merge remote-tracking branch 'upstream/dev' into wiki 2016-05-27 06:35:15 -04:00
redmatrix
1bce285eca don't need quite so many backslashes 2016-05-26 17:51:59 -07:00
redmatrix
096fdfc61b consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. 2016-05-26 16:33:01 -07:00
redmatrix
4716627453 run background/daemon tasks at approximately 4 hour intervals from web accesses if they aren't being run otherwise. This ensures they run, although perhaps a bit infrequently; even if unconfigured. This is not suitable for a production site, but may be acceptable for small single person hubs and test sites. The 'cron warning email' now means that background processes are totally borked; probably due to a fascist hosting provider that has blocked process execution. 2016-05-25 21:10:13 -07:00
redmatrix
80f2ba640e code cleanup 2016-05-24 20:49:23 -07:00
redmatrix
5e0698ba87 turn the oft-repeated block_public ... check into a function observer_prohibited() 2016-05-22 17:52:30 -07:00
redmatrix
de006771c7 renamed include files identity.php (channel.php) and Contact.php (connections.php) 2016-05-22 16:54:30 -07:00
Andrew Manning
049147a9d7 Successful new wiki git repo and item table record 2016-05-21 19:02:23 -04:00
redmatrix
d8ace38041 rework the conversation object stuff at a high level - still needs a bit of refactoring 2016-05-20 22:52:47 -07:00
redmatrix
ac095c89f1 code comments 2016-05-20 19:14:49 -07:00
redmatrix
f4da365abd move template stuff to zotlabs/render 2016-05-20 19:11:14 -07:00
redmatrix
b2f0d2d085 cleanup proc_run after messing it up with debugging yesterday 2016-05-20 17:44:26 -07:00
redmatrix
aefeda8c41 recurse one more level of array when processing args 2016-05-20 01:45:29 -07:00
redmatrix
fdece3b102 add some backtrace to find the issue 2016-05-20 01:33:34 -07:00
redmatrix
cae380f068 case issue 2016-05-20 01:21:19 -07:00
redmatrix
2e83c17e2d roll minor version, change example text 2016-05-19 22:47:20 -07:00
redmatrix
a2cec8899a daemon conversion continued... 2016-05-19 22:26:37 -07:00
redmatrix
014168a29b cleanup of daemon infrastructure 2016-05-19 21:32:19 -07:00