15348 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	179730e485	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-18 02:45:39 -08:00
redmatrix	106b3257e4	wsod viewing photo widget	2015-11-18 02:45:22 -08:00
ken restivo	312cc415ce	Pass in account_id. Required for bulk identity importer.	2015-11-18 00:26:18 -08:00
ken restivo	1f2a408be0	Use provided account_id instead of user's logged in account_id. Necessary for bulk importer.	2015-11-18 00:03:59 -08:00
Haakon Meland Eriksen	0d232c612b	Merge remote-tracking branch 'upstream/master'	2015-11-18 06:48:29 +01:00
redmatrix	68da4d90dc	fix admin plugin hooks	2015-11-17 20:44:57 -08:00
Haakon Meland Eriksen	545dc5cf65	Merge remote-tracking branch 'upstream/master'	2015-11-18 01:52:11 +01:00
redmatrix	a089064588	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-17 15:04:04 -08:00
redmatrix	a06f7fbe2e	photo album widget permissions issue	2015-11-17 15:03:27 -08:00
Mario Vavti	7c4d9519c8	whitespace	2015-11-17 23:08:35 +01:00
Mario Vavti	6fa0807550	more css fixes	2015-11-17 23:01:24 +01:00
Haakon Meland Eriksen	c545ada746	Merge remote-tracking branch 'upstream/master'	2015-11-17 16:49:11 +01:00
Mario Vavti	868a0d8a90	missing closing " for src attribute	2015-11-17 13:45:00 +01:00
Mario Vavti	5079dff338	update bootstrap lib 3.3.4 -> 3.3.5	2015-11-17 11:39:47 +01:00
Mario Vavti	9e3d130ad9	css fixes	2015-11-17 11:32:37 +01:00
Mario Vavti	b531486dab	show jotnets toggle button only if there are jotnets and whitespace fixes	2015-11-17 10:46:38 +01:00
redmatrix	6df98f080b	fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML	2015-11-16 19:17:39 -08:00
Haakon Meland Eriksen	69487389d3	Merge remote-tracking branch 'upstream/master'	2015-11-16 06:42:08 +01:00
redmatrix	0cb5f009b4	tag_deliver of an edit to an already uplinked item wasn't resetting permissions and ownership bits before starting delivery chain on the edit.	2015-11-15 20:52:50 -08:00
redmatrix	c7b2ec8bba	allow plugins to also log to a different named logfile and also alter the log message	2015-11-15 19:40:01 -08:00
redmatrix	12b0a9f35f	add logger plugin hook	2015-11-15 19:37:26 -08:00
redmatrix	fff30b1c3d	permission issues editing wall-to-wall posts	2015-11-15 19:36:17 -08:00
redmatrix	6ad35e3d84	issue with dead hub detection	2015-11-15 18:12:53 -08:00
redmatrix	3d80073a0e	revert html in markdown for posts, but trim the input before processing the markdown	2015-11-15 18:03:37 -08:00
redmatrix	959c3ba89d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-15 17:29:07 -08:00
redmatrix	1029939f56	issues connecting to local forum	2015-11-15 17:28:45 -08:00
Haakon Meland Eriksen	fd5d1416d9	Merge remote-tracking branch 'upstream/master'	2015-11-15 00:27:23 +01:00
jeroenpraat	def5edf93c	nl+es and some other bits	2015-11-14 20:43:34 +01:00
Haakon Meland Eriksen	6bdde985ce	Merge remote-tracking branch 'upstream/master'	2015-11-14 08:32:37 +01:00
redmatrix	dba38821bc	superblock enhancements	2015-11-13 15:28:34 -08:00
Haakon Meland Eriksen	9d6a4c1d05	Reorder buttons HME	2015-11-13 19:44:42 +01:00
Haakon Meland Eriksen	94bef08f15	Adding original jot.tpl from GitHub	2015-11-13 18:32:25 +01:00
Haakon Meland Eriksen	0178840c19	Merge remote-tracking branch 'upstream/master'	2015-11-13 16:45:31 +01:00
Haakon Meland Eriksen	d04c73ae00	Reorder buttons	2015-11-13 16:31:48 +01:00
Haakon Meland Eriksen	495f21c08c	Reverted changes - got white screen	2015-11-13 07:36:32 +01:00
Haakon Meland Eriksen	d238cbea19	Regrouped post buttons	2015-11-13 07:03:30 +01:00
redmatrix	5d0646c9e1	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-12 20:23:17 -08:00
redmatrix	93e5449c08	really basic photo album widget for content regions	2015-11-12 20:22:36 -08:00
ken restivo	4872a30e2b	Add note about base64 and urlencode.	2015-11-12 18:02:20 -08:00
ken restivo	f5fcdf1de4	Fix spelling of documentation.	2015-11-12 17:53:26 -08:00
redmatrix	888bf76e4b	allow pdl content	2015-11-12 17:47:38 -08:00
redmatrix	22a650ade8	issue #154	2015-11-12 16:57:02 -08:00
redmatrix	391807b46c	small fixes, removed old unused database row, and log more prominently a missing directory server URL	2015-11-12 16:45:38 -08:00
Haakon Meland Eriksen	921a2e0dc4	Regrouped post buttons	2015-11-13 00:07:09 +01:00
jeroenpraat	5afe8e5aa1	Small update to Bluegrid and generic-content-wrapper-styled to dreport	2015-11-12 22:10:20 +01:00
Haakon Meland Eriksen	ba84d6ff7c	Regrouped post buttons	2015-11-12 21:11:47 +01:00
Haakon Meland Eriksen	d786502f19	Regrouped post buttons	2015-11-12 20:44:41 +01:00
Haakon Meland Eriksen	63063450b3	Merge remote-tracking branch 'upstream/master'	2015-11-12 07:46:29 +01:00
Haakon Meland Eriksen	90463ee67d	Make upload and encrypt easier on phones by editing jot.tpl	2015-11-12 07:45:37 +01:00
redmatrix	6e04dd96a1	will also need api doco	2015-11-11 20:51:15 -08:00