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

4800 Commits

Author SHA1 Message Date
redmatrix
3fdf1ac458 revert for now 2015-05-27 01:49:47 -07:00
redmatrix
07e8fe1b1c Comments need to have some kind of routing instructions. 2015-05-26 21:00:27 -07:00
jeroenpraat
ae69bf54a6 Update api.php 
one comma to much
 2015-05-26 22:20:45 +02:00
redmatrix
06eae98e53 placeholder for dynamic rego 2015-05-25 22:50:36 -07:00
redmatrix
9e6e41c6cb slow but forward progress on dynamic client registration 2015-05-25 21:31:23 -07:00
redmatrix
9a0264f5d2 some work on issue #329 2015-05-25 19:17:35 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	index.php
	mod/setup.php
 2015-05-24 15:50:05 -07:00
Habeas Codice
1354616787 one more 2015-05-24 09:30:31 -07:00
Habeas Codice
b15a68f05d avoid db compatibility issues 2015-05-24 09:26:12 -07:00
Mario Vavti
57d520e69f logic has changed - this is not needed anymore 2015-05-24 15:09:30 +02:00
Mario Vavti
125cd5e32b should not call prepare text here anymore 2015-05-24 14:57:01 +02:00
Klaus
1ce3d01bb8 Merge pull request #332 from solstag/zotfeedcleanup 
Import security only when necessary, use correct variable in log
 2015-05-24 03:12:25 +02:00
redmatrix
7f9e4d6add federation problem from diaspora comments relayed through red channels due to typo 2015-05-23 15:24:16 -07:00
redmatrix
11861949bb add channel_id to local_dir_update hook 2015-05-23 15:19:50 -07:00
redmatrix
45259fed14 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-23 15:10:18 -07:00
redmatrix
ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
Mario Vavti
f575ef551d use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation 2015-05-23 22:19:02 +02:00
Alexandre Hannud Abdo
760f17b173 Import security only when necessary, use correct variable in log 
Just some cleanup, seemed like the intent of previous changes was so
 2015-05-22 10:27:17 -03:00
redmatrix
5795e2a58b more migration of page types 2015-05-21 22:17:17 -07:00
redmatrix
3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix
c10a4ca9c7 re-arrange the html cache a bit 2015-05-20 20:28:16 -07:00
redmatrix
62df06b3d6 cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken. 2015-05-20 20:20:35 -07:00
redmatrix
0826c5fd96 don't allow item_id to update without a valid post id 2015-05-20 19:18:32 -07:00
redmatrix
c55d13a836 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-20 18:48:05 -07:00
redmatrix
6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
Mario Vavti
578d21120a make design elements translateable 2015-05-20 08:34:40 +02:00
redmatrix
e68a00d381 more db structure 2015-05-19 22:43:24 -07:00
redmatrix
507dfb9f85 add rot47 to the mix. This shouldn't affect the speed to any measurable degree. 2015-05-19 21:51:48 -07:00
redmatrix
c78869e437 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-05-19 17:36:11 -07:00
Mario Vavti
3471e98989 remove dbg code 2015-05-19 21:09:35 +02:00
Mario Vavti
5641d81f03 be verbose about what type of element (block, layout, webpage) is beeing installed 2015-05-19 21:07:43 +02:00
redmatrix
77e2ef45f0 mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements. 2015-05-19 02:16:12 -07:00
redmatrix
c11b1f8b0d vsprintf error 2015-05-18 22:07:38 -07:00
redmatrix
e521da05da consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting. 2015-05-18 21:32:55 -07:00
redmatrix
da7abbb089 bring the new photo schema into play 2015-05-18 19:43:53 -07:00
redmatrix
4c319a98a8 fix some merge errors 2015-05-18 17:20:59 -07:00
redmatrix
2dd0e7f6bd Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-05-18 15:58:13 -07:00
Mario Vavti
9b1e540880 if block title contains $content but $content title is empty do not show an empty <h3> tag 2015-05-18 22:29:13 +02:00
Mario Vavti
9b64301e0c remove dbg code 2015-05-18 22:19:08 +02:00
Mario Vavti
4e3583ab45 allow block title to contain $content title 2015-05-18 22:18:01 +02:00
redmatrix
7c7a5cba8f Merge branch 'master' into tres 2015-05-17 19:49:36 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
 2015-05-17 19:48:57 -07:00
redmatrix
ac3b886cc4 missing $ 2015-05-17 19:00:17 -07:00
redmatrix
f985c08d12 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 18:19:49 -07:00
redmatrix
3b859aa9ef Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. 2015-05-17 18:14:50 -07:00
redmatrix
7233967ad5 Merge pull request #322 from dawnbreak/master 
Add functions to parse and get some values from php.ini.
 2015-05-18 09:41:53 +10:00
redmatrix
1cca24dfdc Merge pull request #323 from dawnbreak/docu 
Add some more documentation to attach_store()
 2015-05-18 09:41:32 +10:00
redmatrix
a7071b17c0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 16:35:17 -07:00
redmatrix
91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
Klaus Weidenbach
6757e86e85 Add some more documentation to attach_store() 2015-05-17 01:24:47 +02:00