harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,122 Commits 6 Branches 36 Tags
97eef2b88c5e2e709b8efdb2ea597a5803783e24
Commit Graph
16122 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti 97eef2b88c removed link to connected apps by accident 2016-03-26 19:34:38 +01:00
Mario Vavti f714e97d63 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-26 18:46:07 +01:00
Mario Vavti a507063174 move link to /locs to settings menu if we have more than one location and some template work on locs 2016-03-26 18:43:38 +01:00
git-marijus 3caf51b075 Merge pull request #333 from phellmes/de20160324 
Update DE translation strings
 2016-03-25 10:26:12 +01:00
redmatrix 92ec46b62e revup 2016-03-24 19:18:25 -07:00
phellmes 9b06d952a2 Update DE translation strings 2016-03-24 09:08:12 +01:00
redmatrix 531710142c add hook to allow plugins to perform a follow activity from an activityfeed 2016-03-23 20:04:09 -07:00
redmatrix f200dd4395 atom specifies a uri or iri for the id. message_id isn't suitable here. 2016-03-23 16:36:27 -07:00
redmatrix a8ac0ed549 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-22 19:59:47 -07:00
redmatrix 6f2ba0c619 rewrite the webfinger discovery logic 2016-03-22 19:58:59 -07:00
Wave 0a14ac1f60 Merge pull request #332 from wave72/master 
Updated Italian strings
 2016-03-22 11:53:57 +01:00
Paolo Tacconi 02140b2f76 Updated Italian strings 2016-03-22 11:49:03 +01:00
Mario Vavti c6b89b99b9 Add a link to /locs to channel manager 2016-03-22 10:29:17 +01:00
redmatrix 51a840f46a update network_to_name (reserve DFRN for future use) 2016-03-21 22:02:18 -07:00
redmatrix b081c3e94b Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-21 21:32:35 -07:00
redmatrix ec99e3ed62 attempting to work with braindead lighttpd gnusocial servers 2016-03-21 21:31:28 -07:00
Mario Vavti 97e1a6dfde whip mod manage into shape 2016-03-22 02:06:19 +01:00
redmatrix 28599fe652 more federation work 2016-03-20 21:41:19 -07:00
redmatrix d3e7ef70e8 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-20 19:56:36 -07:00
redmatrix fea532af4d rework salmon - important, update addons also if you have enabled gnusoc addon 2016-03-20 19:55:53 -07:00
Mario Vavti f5b22dfd5b erge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-21 00:41:09 +01:00
redmatrix 48e62bb50a Merge pull request #329 from git-marijus/master 
fix #328 by using a seperate query instead of group_concat
 2016-03-21 10:22:30 +11:00
Mario Vavti 513078e1f7 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-20 23:52:55 +01:00
redmatrix 23151100de Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-20 15:32:09 -07:00
redmatrix eb68b66c58 issue #330 - permit archived connections in ACLs. If they are to be blocked for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition. 2016-03-20 15:27:26 -07:00
Mario Vavti 1ddb43b0d3 an attempt to visualize the supremacy of dont show over show in the acl selector 2016-03-20 23:07:39 +01:00
Mario Vavti 9fcd470aca fix #328 by using a seperate query instead of group_concat 2016-03-20 20:26:55 +01:00
jeroenpraat 23419e4c26 Update NL + es_ES strings. 2016-03-20 14:39:22 +01:00
Mario Vavti 34b42566b6 add fixme 2016-03-20 02:25:59 +01:00
Mario Vavti f7ff48f806 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-20 01:46:13 +01:00
Mario Vavti 30cf56bdb5 make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected 2016-03-20 01:45:56 +01:00
redmatrix 77094f8d2b make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move. 2016-03-19 16:17:19 -07:00
Mario Vavti 51cd4e8519 missing return false for map link 2016-03-19 02:20:59 +01:00
Mario Vavti bd249b276d add use as cover photo link to photos view 2016-03-18 17:49:31 +01:00
redmatrix b6ae2bff01 change rev 1.3.1 2016-03-17 18:42:32 -07:00
redmatrix 21c1f89eba SECURITY: DAV authentication issue 2016-03-17 18:40:03 -07:00
redmatrix df61970b39 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-17 12:16:25 -07:00
redmatrix f82afca84d no xchan here if using zot protocol 2016-03-17 12:15:28 -07:00
jeroenpraat eca119d695 See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss. 2016-03-17 15:48:44 +01:00
Mario Vavti 40162cd6b7 some work on profile listing 2016-03-17 12:56:55 +01:00
Mario Vavti a41a05e6c0 bring more structure to profiles edit 2016-03-17 11:50:53 +01:00
redmatrix a83cdbeb39 typo 2016-03-16 22:02:19 -07:00
redmatrix 6d4fe5c56f Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-16 21:06:15 -07:00
redmatrix 3a8f6e6576 more federation backend 2016-03-16 21:05:52 -07:00
redmatrix 38eb79705e lots of work on federated channel discovery 2016-03-16 18:00:13 -07:00
git-marijus f7ddd44c2e Merge pull request #327 from anaqreon/ownmapp-typo 
Misspelling of ownMapp in homeinstall script
 2016-03-16 23:10:24 +01:00
Mario Vavti 2165733ddc move buttons to dropdown menu and some cleanup 2016-03-16 23:07:29 +01:00
Mario Vavti d22b21c56f still more janitor work on profiles 2016-03-16 13:45:24 +01:00
redmatrix 4188419b30 more federation backend work 2016-03-15 17:54:06 -07:00
Mario Vavti d98d7003ed even more janitor work on profiles 2016-03-15 21:38:03 +01:00