Commit graph

13687 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
Habeas Codice
bd25f8577f add ability to change existing channel/account service class with
util/service_class
add link from main doc
2015-05-26 00:21:08 -07:00
redmatrix
06eae98e53 placeholder for dynamic rego 2015-05-25 22:50:36 -07:00
redmatrix
1780ebafd3 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-25 22:50:19 -07:00
Habeas Codice
f7731d7e8f Add docs about current service class system, tiny util to make updates a
little easier than the standard config util
2015-05-25 22:40:04 -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
29a8d580be Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-25 16:57:47 -07:00
redmatrix
23abfb0a5b add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. 2015-05-25 16:56:28 -07:00
Mario Vavti
d9b9faaa89 add this to better support mobile devices out of the box in zen template 2015-05-25 21:27:33 +02:00
redmatrix
1828771557 timezone setting not saved issue #336 2015-05-24 18:09:41 -07:00
redmatrix
d537fc854b typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page 2015-05-24 17:59:31 -07:00
redmatrix
d9061fd09e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-24 15:59:03 -07:00
redmatrix
52e38d7c24 search result heading not translatable 2015-05-24 15:57:59 -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
redmatrix
a332dfcf6b Merge pull request #331 from solstag/jqueryprop
Fix accepting contacts by using correct jquery calls.
2015-05-24 12:50:43 +10:00
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
81d94dae2c preserve lock on edited comments 2015-05-21 02:03:44 -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
fe00d29047 issue with deleting imported design elements and re-installing them 2015-05-19 18:25:27 -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
c2ca2a09e7 this should fix undeletable blocks and layouts 2015-05-18 17:32:36 -07:00
redmatrix
ad07d48d3c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-18 16:30:55 -07:00