Commit Graph

665 Commits

Author SHA1 Message Date
redmatrix 4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix 197b5de9da update bug reporting doco 2015-09-09 16:59:26 -07:00
redmatrix d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
jeroenpraat 6ea1cf71b5 Update dav_windows.bb 2015-09-06 23:36:26 +02:00
jeroenpraat 302fe94705 Update dav_nemo.bb 2015-09-06 23:35:35 +02:00
jeroenpraat 38ea8d1d86 Update dav_mount.bb 2015-09-06 23:32:14 +02:00
jeroenpraat 67ed7e40be Update dav_mount.bb 2015-09-06 23:30:25 +02:00
jeroenpraat 20f211b70a Update dav_dolphin.bb 2015-09-06 23:27:55 +02:00
jeroenpraat ebb07def7e Update dav_nautilus.bb 2015-09-06 23:26:28 +02:00
redmatrix d1480d9f56 bug reporting doc 2015-09-03 01:55:07 -07:00
redmatrix 837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	doc/credits.bb
	mod/thing.php
2015-09-02 20:33:58 -07:00
redmatrix d9a67d64b1 Update the credits 2015-09-02 18:04:22 -07:00
redmatrix 039f56f390 mostly doc tweaks, some import/export work 2015-08-31 20:58:05 -07:00
redmatrix b4cbb3aeb1 update history 2015-08-31 17:45:01 -07:00
redmatrix de3012ccf1 documentation re-org 2015-08-31 17:08:09 -07:00
redmatrix 5fe9021375 rename 'register_account' hook to 'create_identity'. 2015-08-31 16:26:29 -07:00
redmatrix c0cb21a07c unclosed link tags 2015-08-30 23:01:39 -07:00
redmatrix e23f86faa9 more work on doco search 2015-08-30 22:39:33 -07:00
redmatrix e5dec8671e make diaspora person guids for hubzilla folks globally unique. That's what a globally unique ID is. This forever kills the prospect of making nomadic identity work flawlessly on Diaspora. But since all your identities have the same guid, this allows your different identities to communicate with Diaspora; which would otherwise fail to connect to your other instances because of the guid collision. 2015-08-25 17:21:42 -07:00
redmatrix 39df2a475e add load_pdl hook for plugins 2015-08-22 14:28:33 -07:00
redmatrix 7c34911b1c add task widget 2015-08-21 02:30:17 -07:00
redmatrix 8d66fbccfa Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/api.php
2015-08-19 16:54:12 -07:00
redmatrix 72b7b19937 update to_do 2015-08-18 20:00:11 -07:00
redmatrix 2d9d4dfeb3 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	doc/history.md
	mod/import.php
2015-08-11 22:35:36 -07:00
redmatrix d882b3274b doc fixes 2015-08-11 22:32:53 -07:00
redmatrix b651604e8b remove the forum limit 2015-08-11 20:58:03 -07:00
redmatrix 0a34b96e11 bring back colour to abook_self in acl 2015-08-11 01:16:04 -07:00
redmatrix bd03603f58 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-08-06 21:08:33 -07:00
redmatrix ec5d91d8cf closing tags 2015-08-06 21:07:25 -07:00
redmatrix c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
redmatrix 9495d2c701 indicate where progress has been made 2015-07-20 17:13:47 -07:00
redmatrix 862bfbdd2b incorrectly named doc file 2015-07-06 20:29:21 -07:00
redmatrix f20933e1e0 more work on db storage of doco 2015-07-05 19:52:41 -07:00
redmatrix aa58f68bfd Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/it/messages.po
	view/it/strings.php
2015-07-03 14:59:04 -07:00
redmatrix 37c78bcf05 start doco cleanup 2015-07-03 14:56:48 -07:00
zottel 8042ae9fe8 update German main help file 2015-07-03 11:01:26 +02:00
redmatrix 1a5898bf80 sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
2015-07-02 21:58:28 -07:00
Thomas Willingham aa41842d24 Clean up 2015-06-30 17:49:09 +01:00
redmatrix 63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix 002be8f9ce project updates 2015-06-26 16:37:55 -07:00
redmatrix 5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php
2015-06-24 16:34:52 -07:00
zottel 38302051f2 update German help files 2015-06-24 16:54:17 +02:00
redmatrix 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/items.php
	mod/item.php
2015-06-23 17:30:35 -07:00
Mario Vavti a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/items.php
	util/messages.po
2015-06-21 20:51:07 -07:00
Mario Vavti c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00
redmatrix 3f0009ccd7 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	util/messages.po
2015-06-13 15:02:51 -07:00
Michael Johnston 053d4547fe nginx config change from Thomas 2015-06-13 00:24:11 -04:00
redmatrix 5733491ac8 more work on items
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-06-11 17:56:56 -07:00