4584 commits

Author	SHA1	Message	Date
redmatrix	db58b62235	don't auto-open the editor in forum mode. Save the forum selection text until we open it.	2015-09-09 19:54:16 -07:00
redmatrix	d702133ded	move mod_admin to Comanche finally	2015-09-08 20:48:35 -07:00
redmatrix	2f52b6c164	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: util/messages.po	2015-09-07 04:06:27 -07:00
redmatrix	2312f03eac	Always open rpost editor on document ready	2015-09-06 20:50:31 -07:00
Mario Vavti	ee21d87d1b	uexport template fixes	2015-09-04 09:33:34 +02:00
redmatrix	fb2d2c5585	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-09-02 21:59:44 -07: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	1ce8ce896b	provide consistent ui for things	2015-09-01 19:27:41 -07:00
redmatrix	3852b5ce7f	separate objs/things from taxonomy	2015-09-01 17:06:58 -07:00
redmatrix	d7089ab471	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po	2015-08-31 21:00:28 -07:00
redmatrix	e23f86faa9	more work on doco search	2015-08-30 22:39:33 -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	2d471e39dc	this is weird	2015-08-25 19:23:21 -07:00
redmatrix	eac9c8a7e6	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php install/update.php util/messages.po	2015-08-23 20:23:55 -07:00
redmatrix	2a59392ba8	change name of module	2015-08-22 19:31:39 -07:00
redmatrix	feabaedd83	increase width of tasklist input element	2015-08-22 15:46:40 -07:00
jeroenpraat	957abf1c1b	Final (temporary I suppose) Spanish string update	2015-08-22 16:29:34 +02:00
redmatrix	242cb047d4	limit the height of tasklist	2015-08-20 22:15:09 -07:00
redmatrix	3e7a76cc64	put tasklist into events page comanche layout	2015-08-20 21:02:42 -07:00
redmatrix	8fc321ca62	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-20 16:52:56 -07:00
redmatrix	6590ca02de	some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable.	2015-08-20 16:49:13 -07:00
jeroenpraat	20fc4ee021	Another Spanish strings update	2015-08-20 20:57:08 +02:00
redmatrix	abe362bdd4	issues encountered whilst testing import_items module using yearly dump files	2015-08-17 21:56:55 -07:00
redmatrix	1a4a921528	provide module for importing yearly content dumps	2015-08-17 21:40:40 -07:00
redmatrix	30fd17c58d	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: view/nl/messages.po	2015-08-17 16:14:15 -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
jeroenpraat	f70fd95361	Fixed Spanish strings	2015-08-17 13:38:43 +02:00
redmatrix	be3a272a80	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-08-16 19:54:38 -07:00
redmatrix	631eb4b2c2	issue #386 - account and channel bulk edit checkboxes not visible and therefore not useable. Also change wording to remove the offensive 'user' designation.	2015-08-16 19:52:25 -07:00
redmatrix	18bc12c21c	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php util/messages.po	2015-08-14 22:24:15 -07:00
jeroenpraat	7a8d0a03f6	update spanish	2015-08-14 15:57:05 +02:00
redmatrix	f88dc84091	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl	2015-08-12 20:36:32 -07:00
jeroenpraat	3099562a21	Some corrections of Spanish strings.	2015-08-12 20:52:46 +02:00
jeroenpraat	588d22974c	And Catalan!	2015-08-12 15:16:56 +02:00
jeroenpraat	4c2bbe3c41	Thanks to Manuel. Updated Spanish to 100 procent.	2015-08-12 15:11:04 +02:00
redmatrix	44dcbeaaa4	forum widget	2015-08-11 19:22:14 -07:00
jeroenpraat	eae88b0815	Update Dutch strings	2015-08-09 15:56:02 +02:00
jeroenpraat	510cb5df86	Update Dutch strings	2015-08-05 22:31:40 +02:00
redmatrix	b737e224b1	more work separating Diaspora from core	2015-08-03 16:52:51 -07:00
Paolo T	2f5a39bc2f	Merge pull request #382 from tuscanhobbit/master ... Italian translation	2015-08-03 09:24:39 +02:00
Paolo Tacconi	5d2f35dc60	Italian translation	2015-08-03 09:21:01 +02:00
redmatrix	c1a953f960	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: util/messages.po	2015-07-31 15:45:13 -07:00
redmatrix	5e985ef34f	consistency of event form	2015-07-31 15:42:52 -07:00
redmatrix	cbb6d37b6c	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-27 20:59:37 -07:00