harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,903 Commits 6 Branches 36 Tags 152 MiB
37c78bcf05
Commit Graph

13903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix
08b00f0f5e Merge pull request #333 from dawnbreak/docu 
Add PHP's xml module check and upload limits to setup.
 2015-05-24 12:35:49 +10: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
Klaus Weidenbach
e90c331bf6 Add PHP's xml module check and upload limits to setup. 
And some documentation.
 2015-05-24 02:58:52 +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
Alexandre Hannud Abdo
d37c51ef2e Fix accepting contacts by using correct jquery calls. 
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.

See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
 while the checked property does.
"""
 2015-05-22 10:15:29 -03:00
redmatrix
5795e2a58b more migration of page types 2015-05-21 22:17:17 -07:00
redmatrix
25bd332aab Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-21 20:39:10 -07:00
redmatrix
81d94dae2c preserve lock on edited comments 2015-05-21 02:03:44 -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
0689816772 check for success before updating remote id 2015-05-20 19:27:05 -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
jeroenpraat
a7d39cf654 Another update for Dutch with complete $Projectname substitutions (and channel activity as suggested on previous discussion) 2015-05-20 15:24:23 +02: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
acc8e10a45 merge redmatrix fix 2015-05-19 18:28:52 -07:00
redmatrix
d63bcde6e2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-19 18:26:46 -07:00
redmatrix
fe00d29047 issue with deleting imported design elements and re-installing them 2015-05-19 18:25:27 -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
redmatrix
e54198e5b8 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-19 17:17:04 -07:00
redmatrix
d84c2835cd version update 2015-05-19 17:16:46 -07:00
redmatrix
9485e917c6 Merge pull request #327 from solstag/help 
Document php-xml requirement for webdav and widget creation.
 2015-05-20 10:14:35 +10: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
Alexandre Hannud Abdo
a2696bea19 Document widget creation. 2015-05-19 16:59:28 +00:00
Alexandre Hannud Abdo
2c7b786907 Document php-xml requirement for webdav. 2015-05-19 16:46:15 +00:00
jeroenpraat
5e87bd8843 New update Dutch 2015-05-19 12:12:16 +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
b7ae85e89a get rid of photo_flags in the code 2015-05-18 20:10:44 -07:00
redmatrix
da7abbb089 bring the new photo schema into play 2015-05-18 19:43:53 -07:00
redmatrix
eae241df56 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 17:38:07 -07:00
redmatrix
c2ca2a09e7 this should fix undeletable blocks and layouts 2015-05-18 17:32:36 -07:00
redmatrix
4c319a98a8 fix some merge errors 2015-05-18 17:20:59 -07:00
redmatrix
71a2f2d773 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 17:00:04 -07:00
redmatrix
ad07d48d3c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-18 16:30:55 -07:00
redmatrix
0340639cb1 fix po2php to handle projectname variables correctly 2015-05-18 16:30:00 -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
d42d7d0532 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 22:29:34 +02: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