Commit graph

14373 commits

Author SHA1 Message Date
Mario Vavti
e1338f5a7f make redmatrix focus scheme default for hubzilla 2015-09-10 22:19:51 +02:00
redmatrix
2d94a038a5 ensure connections have a name 2015-09-10 01:21:18 -07:00
redmatrix
f2889d24e6 decentralise likes of things so they can be cloned 2015-09-09 22:03:23 -07:00
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
f3b560b453 fix the lock state when using forum mode 2015-09-09 18:57:06 -07:00
redmatrix
43e064749c major changes to "forum mode" on the network/matrix page 2015-09-09 18:50:15 -07:00
redmatrix
4af339da63 slight hack to improve public forum detection in the forum widget 2015-09-09 18:18:27 -07:00
redmatrix
4cd6e7ec91 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-09 17:00:02 -07:00
redmatrix
197b5de9da update bug reporting doco 2015-09-09 16:59:26 -07:00
redmatrix
cdfddc0fc5 Merge pull request #37 from MicMee/master
typo
2015-09-10 06:26:07 +10:00
Michael Meer
f4d3ec908d typo 2015-09-09 17:08:53 +02:00
redmatrix
918aaa64e2 profile photo issues #36 2015-09-09 03:40:53 -07:00
redmatrix
0a051ff2cd preserve code blocks on item import if channel has code rights. When importing the channel itself,
turn code access off unless this is the admin.
2015-09-08 22:46:34 -07:00
redmatrix
d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
redmatrix
2aaee311f3 differentiate Community Server from Enterprise Server 2015-09-08 19:57:07 -07:00
redmatrix
e8d431c2f6 issues with "use this photo for profile photo" #36 2015-09-08 19:51:52 -07:00
redmatrix
0f4c012321 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	mod/menu.php
2015-09-08 19:16:07 -07:00
redmatrix
f13a8f725c export TERM_FILE when mirroring 2015-09-08 19:14:29 -07:00
redmatrix
e6690c818d export TERM_FILE when mirroring 2015-09-08 19:13:43 -07:00
redmatrix
5d32aa94d9 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/menu.php
	mod/menu.php
	mod/mitem.php
2015-09-08 18:46:15 -07:00
redmatrix
d413b6eba8 merge conflicts 2015-09-08 18:45:58 -07:00
redmatrix
f0847e6f32 debugging menu sync 2015-09-08 18:40:56 -07:00
redmatrix
50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix
b28d3015fe Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/identity.php
2015-09-08 17:53:43 -07:00
redmatrix
75d521d42a menu import and sync 2015-09-08 17:52:39 -07:00
redmatrix
1ebaacfd5e menu export 2015-09-08 17:50:24 -07:00
redmatrix
c6bdf7e891 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 22:55:42 -07:00
redmatrix
11e19a06b7 export events 2015-09-07 22:54:43 -07:00
redmatrix
880ca35681 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 21:02:05 -07:00
redmatrix
650e98b2a9 work on event sync 2015-09-07 21:01:49 -07:00
redmatrix
f84946c135 minor fix to event sync 2015-09-07 21:00:54 -07:00
redmatrix
508969a183 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 20:29:13 -07:00
redmatrix
c39e3613a8 create event sync packets 2015-09-07 20:28:02 -07:00
redmatrix
4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-09-07 18:20:47 -07:00
redmatrix
6d1b64065a consolidate import_items/sync_items 2015-09-07 18:14:30 -07:00
redmatrix
5751437c93 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 18:13:17 -07:00
redmatrix
9fa0490c44 sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred. 2015-09-07 18:11:30 -07:00
Habeas Codice
6711ceb662 fix postgres zotfeed 2015-09-07 16:28:42 -07:00
Wave
dc7677f5fa Merge pull request #391 from tuscanhobbit/master
Updated Italian strings
2015-09-07 17:29:13 +02:00
Paolo Tacconi
78fb6f55ed Updated Italian strings 2015-09-07 17:24:43 +02: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
5d59462e49 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-07 04:04:15 -07:00
redmatrix
1b09c64856 PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer. 2015-09-07 03:59:38 -07:00
redmatrix
2312f03eac Always open rpost editor on document ready 2015-09-06 20:50:31 -07:00
redmatrix
1d09e4b620 use conversation defaults for /public page instead of collapsed list mode, but allow over-ride 2015-09-06 16:42:50 -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