harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,284 Commits 6 Branches 36 Tags
2ce1e3678acd59409f1013433db99df6624c2895
Commit Graph
14284 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Haakon Meland Eriksen 2ce1e3678a Merge remote-tracking branch 'upstream/master' 2015-09-01 20:46:29 +02:00
Haakon Meland Eriksen 365d690d7d Fix filename 2015-09-01 20:46:14 +02:00
jeroenpraat e75616517d Updated all 300px default profile photos to 300px. Most using the SVG source, some enlarged using the Gimp. 2015-09-01 20:40:36 +02:00
Haakon Meland Eriksen 5cb2fa5981 Fixed deploy script 2015-09-01 19:25:41 +02:00
Haakon Meland Eriksen e854562803 Merge remote-tracking branch 'upstream/master' 2015-09-01 18:45:06 +02:00
Haakon Meland Eriksen fad9594b31 Added openshift-hubzilla-deploy to .openshift/action_hooks/deploy 2015-09-01 18:44:37 +02:00
redmatrix 1447499776 don't log the mundane - especially at normal levels. 2015-08-31 22:41:48 -07:00
Haakon Meland Eriksen 4fe3b5c6a6 Merge remote-tracking branch 'upstream/master' 2015-09-01 07:21:17 +02: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 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
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 53a0920f20 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-08-31 16:27:17 -07:00
redmatrix 5fe9021375 rename 'register_account' hook to 'create_identity'. 2015-08-31 16:26:29 -07:00
jeroenpraat fd28550ad2 Changed favicon to new one (based on new Hubzilla arrow). Please revert when it's not okay. Also added a new optional default profile photo, in the same style. 2015-08-31 20:26:26 +02:00
redmatrix c0cb21a07c unclosed link tags 2015-08-30 23:01:39 -07:00
redmatrix c865f17dc0 schedule a doco update once weekly 2015-08-30 22:46:00 -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
jeroenpraat 60ac0cef5c Removed redmatrix.nl as a fallback server (directory mode to normal) + update strings ES 2015-08-29 17:21:20 +02:00
redmatrix a42b236587 more AccessList stuff - this time it's mod-item, which is a biggie 2015-08-28 14:21:49 -07:00
jeroenpraat 8db5d3ba5c Update es and nl strings 2015-08-28 14:13:13 +02:00
redmatrix d05fd9632e now we get to the heavy lifting with AccessList stuff 2015-08-27 23:04:17 -07:00
redmatrix ca0bc2bb7b more work on AccessList integration 2015-08-27 22:20:30 -07:00
redmatrix 3fbb955cf2 start conversion to AccessList object 2015-08-27 21:22:59 -07:00
redmatrix 04b4897dd8 First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication. 2015-08-27 18:55:30 -07:00
redmatrix c2bc6a04ab Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-27 18:55:02 -07:00
redmatrix 96c61fc5f2 fallback directory server list update 2015-08-27 15:53:52 -07:00
Haakon Meland Eriksen 1b82fb7349 Merge remote-tracking branch 'upstream/master' 2015-08-27 17:57:59 +02:00
redmatrix 7b28c42693 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-26 23:00:59 -07:00
redmatrix 58ffa31e91 redphotos updates 2015-08-26 23:00:33 -07:00
redmatrix 0b5bad4aa7 use extended export format for items in api photo_detail 2015-08-26 22:58:53 -07:00
redmatrix 2bce61d18b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-26 22:14:19 -07:00
redmatrix 9cebd24987 change attach_store to allow a predefined item to accompany a photo 2015-08-26 22:13:20 -07:00
redmatrix 0d2c90cc2e add item info to photo detail in api 2015-08-26 22:11:50 -07:00
redmatrix 54c88dfae9 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/diaspora.php
 2015-08-26 20:22: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 d2fec56456 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/import.php
 2015-08-26 16:00:13 -07:00
redmatrix bd2d99aced import fixes 2015-08-26 15:56:32 -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 1dbcfaa2c6 add repository type as one that is able to self-identify as a public forum 2015-08-25 21:54:16 -07:00
redmatrix 2d471e39dc this is weird 2015-08-25 19:23:21 -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 5fa2aa6d48 lots of stuff that was needed for successful photo import from red 2015-08-24 20:58:12 -07:00
redmatrix 0edac8810b don't try to optimise the session table. Just let it fragment and let the DB worry about it. 2015-08-24 16:05:51 -07:00