13956 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	f7d9523c7d	export chatrooms	2015-09-03 18:43:44 -07:00
redmatrix	2a7ff3018b	channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked.	2015-09-03 17:21:20 -07:00
redmatrix	e1af81ea55	in this case no results is not an error	2015-09-03 15:48:01 -07:00
redmatrix	90d48d60d8	revision update	2015-09-03 13:10:03 -07:00
redmatrix	48c0efd20e	Merge pull request #390 from zzottel/master ... fix update 1148	2015-09-04 06:09:26 +10:00
zottel	5cef672f9a	fix update 1148	2015-09-03 13:55:47 +02:00
redmatrix	945ba5d788	more adjustment to apps containers	2015-09-02 21:46:19 -07:00
redmatrix	3e7edf504d	sort out some app display weirdness	2015-09-02 21:35:49 -07:00
redmatrix	3285c71995	increase height of app-container so edit controls aren't shadowed	2015-09-02 21:17:23 -07:00
redmatrix	2018b88093	dummy update	2015-09-02 20:53:26 -07:00
redmatrix	470915a55b	sync "things" (obj elements)	2015-09-02 20:07:15 -07:00
redmatrix	d9a67d64b1	Update the credits	2015-09-02 18:04:22 -07:00
redmatrix	2a26c898ca	protect from sql injection	2015-09-02 15:52:54 -07:00
redmatrix	3647b74d33	Merge pull request #389 from zzottel/master ... really fix post filtering	2015-09-03 06:12:54 +10:00
zottel	441946b9d3	really fix post filtering	2015-09-02 15:49:07 +02:00
redmatrix	184c544a24	export apps	2015-09-01 22:26:21 -07:00
redmatrix	f72a3113f5	add the baseurl so we can easily relocate objects	2015-09-01 21:03:55 -07:00
redmatrix	3c29b46c42	use different obj export output format for hubzilla compatibility	2015-09-01 20:57:53 -07:00
redmatrix	eb2df761d5	cert updates	2015-09-01 20:20:45 -07:00
redmatrix	d753ae4cf1	dummy update placeholder	2015-09-01 16:25:10 -07:00
redmatrix	69dc1b03c3	typo in sql	2015-08-31 21:01:47 -07:00
redmatrix	d7cae1ce2a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-31 20:56:22 -07:00
redmatrix	d7cf7316be	change the likes db structure to make it more easily importable/exportable	2015-08-31 20:55:25 -07:00
jeroenpraat	60ac0cef5c	Removed redmatrix.nl as a fallback server (directory mode to normal) + update strings ES	2015-08-29 17:21:20 +02:00
jeroenpraat	8db5d3ba5c	Update es and nl strings	2015-08-28 14:13:13 +02:00
redmatrix	96c61fc5f2	fallback directory server list update	2015-08-27 15:53:52 -07:00
redmatrix	0b5bad4aa7	use extended export format for items in api photo_detail	2015-08-26 22:58:53 -07:00
redmatrix	0d2c90cc2e	add item info to photo detail in api	2015-08-26 22:11:50 -07:00
redmatrix	d1c23477df	support likes on comments with diaspora owner by sending as activity	2015-08-26 20:20:41 -07:00
redmatrix	8fb1356623	required for future work	2015-08-26 17:49:57 -07:00
redmatrix	71308fe8c1	syntax error in last checkin	2015-08-26 13:50:51 -07:00
redmatrix	da649e397e	import fixes	2015-08-26 13:49:07 -07:00
redmatrix	250d286f1d	remove orphan mod_connections editing code (now done in mod/connedit)	2015-08-24 01:28:13 -07:00
redmatrix	852d19f209	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-23 17:41:23 -07:00
redmatrix	b1f091e4d7	issues with abook sync between hubzilla and red	2015-08-23 17:40:47 -07:00
jeroenpraat	957abf1c1b	Final (temporary I suppose) Spanish string update	2015-08-22 16:29:34 +02:00
redmatrix	72bdca009c	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-20 22:14:03 -07:00
redmatrix	fef93af0a6	missed this one - it's required	2015-08-20 22:13:25 -07:00
jeroenpraat	20fc4ee021	Another Spanish strings update	2015-08-20 20:57:08 +02:00
redmatrix	c96f121d41	add photo_detail api call	2015-08-18 22:14:16 -07:00
redmatrix	72b7b19937	update to_do	2015-08-18 20:00:11 -07:00
redmatrix	37d07a7d2a	add event_sequence for vtodo's	2015-08-18 17:10:40 -07:00
redmatrix	75fbf21e6b	add month to export filename when using month	2015-08-17 22:27:41 -07:00
redmatrix	9f4f967ead	off by one	2015-08-17 22:25:17 -07:00
redmatrix	f682325924	provide ability to export by month as well as by year	2015-08-17 22:20:10 -07:00
redmatrix	1982fc807f	add item_id to yearly dump files	2015-08-17 21:38:43 -07:00
redmatrix	4ebee195cc	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-17 16:12:35 -07:00
redmatrix	98eeff7538	commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css	2015-08-17 16:11:10 -07:00
jeroenpraat	f2fdc91ad5	Replaced Dutch po file by Spanish po file by accident. Had no visible impact.	2015-08-17 22:27:33 +02:00
jeroenpraat	d88c25c982	Final Spanish strings for now	2015-08-17 22:21:55 +02:00