harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,036 Commits 6 Branches 36 Tags
ec00c5b18a1efea64517b18fa12bb9df6f0b95f7
Commit Graph

14036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix ec00c5b18a the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage 2015-07-19 17:53:52 -07:00
redmatrix ed3d9d1f80 some photo/attach permissions issues 2015-07-18 16:39:12 -07:00
redmatrix 22c1737fc9 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-18 16:11:54 -07:00
redmatrix e62a4b1bc9 Merge pull request #20 from git-marijus/master 
make likes/dislikes work again
 2015-07-19 09:11:31 +10:00
Mario Vavti 09f6337930 make likes/dislikes work again 2015-07-17 22:45:35 +02:00
redmatrix 3c60a0c22c provide any single year of exported items 2015-07-16 20:20:42 -07:00
redmatrix 4299ae65a4 abook clone sync - change logic to also unset existing cross-project flags besides just setting them 2015-07-16 18:07:23 -07:00
redmatrix c3dbacfb88 don't including rating stuff from cloned abooks 2015-07-16 17:53:59 -07:00
redmatrix cdc0464de1 Merge pull request #18 from zzottel/master 
fix observer tags for now (issue #17)
 2015-07-16 18:03:42 +10:00
zottel 2bd05971ab fix observer tags for now (issue #17) 2015-07-16 08:28:37 +02:00
redmatrix 498e2f7279 since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided. 2015-07-15 22:59:55 -07:00
redmatrix 070397ef14 make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. 2015-07-15 21:43:42 -07:00
redmatrix b9fd8b4614 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
 2015-07-15 18:41:50 -07:00
redmatrix 7db515b77c fix for empty recip array resulting from a mangled xchan 2015-07-15 18:31:37 -07:00
redmatrix 7f6e4d5f4a more clone sync issues across projects 2015-07-15 18:21:04 -07:00
redmatrix 95cf1668de Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 18:15:25 -07:00
redmatrix 59b67d52e6 clone sync fixes across red/hz 2015-07-15 18:14:19 -07:00
redmatrix 6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
redmatrix bfcdf5bd9e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-15 16:51:01 -07:00
redmatrix 86ad41a2db revision update 2015-07-15 16:50:37 -07:00
redmatrix 99dfd2f5b1 Merge pull request #375 from zzottel/master 
change sh to bash in shebang to make scripts work
 2015-07-16 09:46:16 +10:00
zottel ba7acf88ad also change the update_ scripts 2015-07-15 15:40:23 +02:00
zottel f4a1ca0692 change sh to bash in shebang to make scripts work 2015-07-15 15:29:08 +02:00
Mario Vavti ca1f6f8c5b provide info text for automatic permissions 2015-07-15 14:14:10 +02:00
Mario Vavti 5fcf1256bd whitespace 2015-07-15 14:07:35 +02:00
Mario Vavti 0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix 0d1a541e88 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/import.php
 2015-07-14 22:40:22 -07:00
redmatrix 9b15dbde1c group fixes to import 2015-07-14 22:38:04 -07:00
redmatrix 5487b22dd7 fix import of group members 2015-07-14 22:19:21 -07:00
redmatrix 89fbfd2bf8 more stuff to resume failed imports 2015-07-14 22:04:07 -07:00
redmatrix a87e318403 log the import progress 2015-07-14 21:30:13 -07:00
redmatrix caaf7192ff provide resumable imports if things go wrong 2015-07-14 21:02:54 -07:00
redmatrix 10406c6d15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-14 17:17:45 -07:00
redmatrix 46aacfe64d stream_perms_xchans() set to empty quoted string when no results rather than return an empty string 2015-07-14 17:15:53 -07:00
redmatrix e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
redmatrix 3687fef53c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-14 16:55:58 -07:00
redmatrix a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. 2015-07-14 16:54:16 -07:00
Mario Vavti 104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti 4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti dd57864867 revert provide inherited perms for connection default permissions 2015-07-14 13:46:22 +02:00
Mario Vavti d8edb66287 remove dbg 2015-07-14 13:21:39 +02:00
Mario Vavti 711dd1468d provide inherited perms for connection default permissions 2015-07-14 13:16:08 +02:00
Mario Vavti a28da40fa8 css fixes 2015-07-14 12:52:50 +02:00
Mario Vavti 7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix da5cec24e0 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-13 17:48:54 -07:00
redmatrix 800eec5bee merge from redmatrix 2015-07-13 17:48:11 -07:00
redmatrix 6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
redmatrix 86633bda48 Merge pull request #373 from zzottel/master 
change account_default_channel if default channel is removed
 2015-07-14 09:01:02 +10:00