harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,608 Commits 6 Branches 36 Tags
cf00a9dbfc5644ea534c66f0f4df0e9df41b2369
Commit Graph
21608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
git-marijusandGitHub cf00a9dbfc Merge pull request #1190 from fadelkon/dev 
Update catalan translation for sources changes up to Apr 23rd 2018
 2018-05-24 11:55:47 +02:00
git-marijusandGitHub bace238e9f Merge pull request #1183 from galettesaucisse/patch-50 
Create TermsOfService.md
 2018-05-24 11:54:09 +02:00
git-marijusandGitHub 7586bc9dcf Merge pull request #1182 from galettesaucisse/patch-49 
Create gdpr1.md
 2018-05-24 11:53:50 +02:00
fadelkon ea17b46e94 Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35. 2018-05-24 03:59:01 +02:00
Mario Vavti 9cf8931136 paint the locks on private activitypub items red. their privacy model is "slightly" different from ours 2018-05-23 22:11:13 +02:00
zotlabs afb29176a4 deal with db failure gracefully 2018-05-23 02:33:46 -07:00
zotlabs 76d8e59e9b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-21 21:15:24 -07:00
zotlabs 1061027071 new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick 2018-05-21 20:17:17 -07:00
zotlabs a403611ac9 update response types 2018-05-21 19:34:03 -07:00
zotlabs 2b3f931c85 oauth2 discovery per draft-ietf-oauth-discovery-10 2018-05-21 19:25:03 -07:00
zotlabs 9bf26cee6d add hook 'get_system_apps' 2018-05-21 16:19:17 -07:00
zotlabs d9066ef26b not null violation oauth1 2018-05-21 13:37:55 -07:00
Mario Vavti fff720c00d address globbing issue in #1170 2018-05-21 20:01:03 +02:00
Galette SaucisseandGitHub 7e26200510 Update gdpr1.md 2018-05-21 10:25:03 +02:00
Galette SaucisseandGitHub 1dbf89362f Update gdpr1.md 2018-05-21 10:22:19 +02:00
Galette SaucisseandGitHub cc1453a8de Update gdpr1.md 2018-05-21 10:16:39 +02:00
Galette SaucisseandGitHub a8def37dcf Create TermsOfService.md 2018-05-21 10:08:00 +02:00
Galette SaucisseandGitHub 355a9ac7ee Create gdpr1.md 2018-05-21 10:05:17 +02:00
Mario Vavti a8274bbfb3 missing permission description 2018-05-21 09:25:57 +02:00
Mario Vavti 7dadbbbac7 bring jot reset to some more places 2018-05-21 09:13:14 +02:00
zotlabs 49f7d63290 first cut at a general purpose gdpr document. What we would like to do is use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community. 2018-05-20 23:40:10 -07:00
zotlabs 0044906fab Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-20 20:19:11 -07:00
zotlabs ac8706e919 pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint) 2018-05-20 20:15:19 -07:00
Mario 469809183d update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 2018-05-20 22:42:47 +02:00
zotlabs 8611e7f8a6 remove unused mindate parameter in the network/stream API method 2018-05-20 13:29:48 -07:00
Mario Vavti 55e1026c98 improve abconfig queries 2018-05-20 20:48:52 +02:00
Mario Vavti 9e1af2492f more local_channel() is not string 2018-05-20 14:15:46 +02:00
Mario Vavti 4eb40528a9 local_channel() is not string 2018-05-20 14:07:30 +02:00
Mario Vavti 6ba77ce0e2 css fix 2018-05-20 13:47:05 +02:00
Mario Vavti a256195767 remove preview on jot reset 2018-05-20 12:30:08 +02:00
git-marijusandGitHub 26d69796d0 Merge pull request #1176 from galettesaucisse/patch-48 
Update hstrings.php
 2018-05-20 11:43:22 +02:00
git-marijusandGitHub 71307d3a2e Merge pull request #1175 from galettesaucisse/patch-47 
Update hmessages.po
 2018-05-20 11:43:06 +02:00
git-marijusandGitHub acb114d0d1 Merge pull request #1174 from anaqreon/dev 
Rename Permission Groups to Permission Categories and clarify feature…
 2018-05-20 11:42:13 +02:00
git-marijusandGitHub 1781df006f Merge pull request #1171 from mjfriaza/dev 
Added one space & Grammatical consistency error on Spanish translation
 2018-05-20 11:41:44 +02:00
Mario Vavti 63f84ece6e backport waitmans changes #1170 from master 2018-05-20 11:39:59 +02:00
Mario Vavti b11db26edf do not update #acl-list-content on every click in jot. we just need this updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts. 2018-05-20 11:12:39 +02:00
Mario Vavti 6d7e364a0d remove some cruft from initEditor(); 2018-05-20 11:02:18 +02:00
Mario Vavti 7e99931733 implement jot reset button 2018-05-20 09:23:44 +02:00
Mario Vavti 7a1afc315d update to fork-awesome 1.1 and fix an old font-awesome reference 2018-05-19 22:01:10 +02:00
Mario Vavti 244e813bfa fix issue where images were not visible in acl selector after using search 2018-05-19 21:21:02 +02:00
Mario Vavti 0bc2a4f603 fix issues with attachment labels 2018-05-19 11:04:34 +02:00
Mario Vavti 6abbadf6c8 Merge remote-tracking branch 'mike/master' into dev 2018-05-19 10:20:14 +02:00
zotlabs 8b4af7cf0b hubzilla issue #1086, pending count on admin summary page 2018-05-19 00:54:47 -07:00
Mario Vavti 1ca6ef0f60 Merge remote-tracking branch 'mike/master' into dev 2018-05-19 08:45:41 +02:00
zotlabs dae89ce91c wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes) 2018-05-18 16:57:45 -07:00
Mario Vavti 056f3d352c remove debug code 2018-05-18 21:32:18 +02:00
Mario Vavti 620e8f2f0b version 2018-05-18 21:30:58 +02:00
Mario Vavti 7f7e049397 an attempt to fix the new_channel validation situation 2018-05-18 21:30:07 +02:00
Galette SaucisseandGitHub 2dd66df8eb Update hstrings.php 2018-05-18 16:05:30 +02:00
Galette SaucisseandGitHub eabf804dc9 Update hstrings.php 2018-05-17 16:09:42 +02:00