Commit Graph

4458 Commits

Author SHA1 Message Date
jeroenpraat
e58ad35fb0 Update siteinfo.php 2015-09-14 16:42:32 +02:00
redmatrix
43ba690eda profile photo change activities 2015-09-13 19:04:46 -07:00
redmatrix
77807d439e minor change on invite 2015-09-11 14:32:18 -07:00
redmatrix
f2171173fe separate the links 2015-09-10 19:35:26 -07:00
redmatrix
7f30863df2 forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx" 2015-09-10 19:31:42 -07:00
redmatrix
a6a2c02b6a duplicated code 2015-09-10 19:21:32 -07:00
redmatrix
d3ee99d677 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	mod/like.php
2015-09-10 19:20:21 -07:00
redmatrix
4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix
05e0ed5173 export likes to clones 2015-09-10 19:17:20 -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
918aaa64e2 profile photo issues #36 2015-09-09 03:40:53 -07:00
redmatrix
d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
redmatrix
e8d431c2f6 issues with "use this photo for profile photo" #36 2015-09-08 19:51:52 -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
50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00
redmatrix
75d521d42a menu import and sync 2015-09-08 17:52:39 -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
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
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
redmatrix
3f6d6745de syntax 2015-09-05 15:33:09 -07:00
redmatrix
b1888afa10 fix typos before pushing 2015-09-03 18:47:03 -07:00
redmatrix
d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix
c83da012ff profile import error #34 2015-09-03 16:19:59 -07:00
redmatrix
c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix
470915a55b sync "things" (obj elements) 2015-09-02 20:07:15 -07:00
redmatrix
d105f324af import apps 2015-09-01 22:27:09 -07:00
redmatrix
6cc60ba477 initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose. 2015-09-01 22:03:10 -07:00
redmatrix
1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix
85daf26eb1 more work on objs/things 2015-09-01 19:01:19 -07:00
redmatrix
286be43963 issue #31 2015-09-01 17:16:10 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
417da13353 this is a bit harder than anticipated. 2015-08-31 21:12:37 -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
039f56f390 mostly doc tweaks, some import/export work 2015-08-31 20:58:05 -07:00
redmatrix
d7cf7316be change the likes db structure to make it more easily importable/exportable 2015-08-31 20:55:25 -07:00
redmatrix
e23f86faa9 more work on doco search 2015-08-30 22:39:33 -07:00
redmatrix
7ba1217a13 improvements to documentation search 2015-08-30 20:47:15 -07:00
redmatrix
a42b236587 more AccessList stuff - this time it's mod-item, which is a biggie 2015-08-28 14:21:49 -07:00
redmatrix
d05fd9632e now we get to the heavy lifting with AccessList stuff 2015-08-27 23:04:17 -07:00