1792 commits

Author	SHA1	Message	Date
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