Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 5040506184 should not redefine $var in the function call Mario Vavti 2015-05-29 17:59:31 +02:00
• 2514af6524 fix menu render for menu item edit - menu preview Mario Vavti 2015-05-29 17:51:50 +02:00
• 8516b3259f whitespace Mario Vavti 2015-05-29 16:14:54 +02:00
• d11d130021 add some yes/no labels and minor template fixes Mario Vavti 2015-05-29 15:23:51 +02:00
• b8d3280763 some fixes to make menu sharing work and expose it in the ui. Mario Vavti 2015-05-29 13:08:01 +02:00
• 5f1ae2930b show created/edited dates for menus Mario Vavti 2015-05-29 11:07:57 +02:00
• 3a9139f76e there was a reason we included that file redmatrix 2015-05-28 22:06:22 -07:00
• 9ff988e3d7 parse error redmatrix 2015-05-28 21:27:48 -07:00
• 07203c1de3 another case of committing with unsaved changes in a second window redmatrix 2015-05-28 20:54:57 -07:00
• 3c82156d63 untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links. redmatrix 2015-05-28 20:50:29 -07:00
• 8fe3daab21 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-28 19:06:31 -07:00
• df5223fe98 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-28 17:00:30 -07:00
• 0f09a4499b add menu_created, menu_edited fields to DB redmatrix 2015-05-28 16:59:56 -07:00
• f5a4e7ef7b Merge pull request #341 from solstag/ptbrupdate redmatrix 2015-05-29 09:33:45 +10:00
• af46587f3c update pt_BR translation Alexandre Hannud Abdo 2015-05-28 16:18:58 -03:00
• 1a86e3321b catch a window that wasn't yet saved when the last checkin occurred redmatrix 2015-05-27 21:46:36 -07:00
• 12c17f1265 menu encoding for sharing/exchange redmatrix 2015-05-27 21:09:21 -07:00
• b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-27 19:27:38 -07:00
• 2dd02cc166 missing row in sql query which is used further down redmatrix 2015-05-27 19:26:42 -07:00
• 11301d51a5 some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. redmatrix 2015-05-27 17:30:36 -07:00
• 5a889558aa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-27 16:02:16 -07:00
• 3ecc9efd8d fix for forked thread on diaspora redmatrix 2015-05-27 16:01:51 -07:00
• 33a7f76ebc Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-05-27 15:26:12 +02:00
• 3d79d4f577 define some custom attributes and html5 elements for htmlpurifier Mario Vavti 2015-05-27 15:25:45 +02:00
• 5ccc9e1b8d make it possible to include menus in blocks - this will only work in html blocks of course Mario Vavti 2015-05-27 15:21:30 +02:00
• 3fdf1ac458 revert for now redmatrix 2015-05-27 01:49:47 -07:00
• 07e8fe1b1c Comments need to have some kind of routing instructions. redmatrix 2015-05-26 21:00:27 -07:00
• ae69bf54a6 Update api.php jeroenpraat 2015-05-26 22:20:45 +02:00
• bd25f8577f add ability to change existing channel/account service class with util/service_class add link from main doc Habeas Codice 2015-05-26 00:21:08 -07:00
• 06eae98e53 placeholder for dynamic rego redmatrix 2015-05-25 22:50:36 -07:00
• 1780ebafd3 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-25 22:50:19 -07:00
• f7731d7e8f Add docs about current service class system, tiny util to make updates a little easier than the standard config util Habeas Codice 2015-05-25 22:40:04 -07:00
• 9e6e41c6cb slow but forward progress on dynamic client registration redmatrix 2015-05-25 21:31:23 -07:00
• 9a0264f5d2 some work on issue #329 redmatrix 2015-05-25 19:17:35 -07:00
• 675aa96f22 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-25 17:01:02 -07:00
• 29a8d580be Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-25 16:57:47 -07:00
• 23abfb0a5b add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. redmatrix 2015-05-25 16:56:28 -07:00
• d9b9faaa89 add this to better support mobile devices out of the box in zen template Mario Vavti 2015-05-25 21:27:33 +02:00
• dfa4984089 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-24 20:21:30 -07:00
• 1828771557 timezone setting not saved issue #336 redmatrix 2015-05-24 18:09:41 -07:00
• d537fc854b typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page redmatrix 2015-05-24 17:59:31 -07:00
• 27137e48eb Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-24 17:16:12 -07:00
• d9061fd09e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-24 15:59:03 -07:00
• 52e38d7c24 search result heading not translatable redmatrix 2015-05-24 15:57:59 -07:00
• 851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-24 15:50:05 -07:00
• 1354616787 one more Habeas Codice 2015-05-24 09:30:31 -07:00
• b15a68f05d avoid db compatibility issues Habeas Codice 2015-05-24 09:26:12 -07:00
• 57d520e69f logic has changed - this is not needed anymore Mario Vavti 2015-05-24 15:09:30 +02:00
• 125cd5e32b should not call prepare text here anymore Mario Vavti 2015-05-24 14:57:01 +02:00
• a332dfcf6b Merge pull request #331 from solstag/jqueryprop redmatrix 2015-05-24 12:50:43 +10:00
• 08b00f0f5e Merge pull request #333 from dawnbreak/docu redmatrix 2015-05-24 12:35:49 +10:00
• 1ce3d01bb8 Merge pull request #332 from solstag/zotfeedcleanup Klaus 2015-05-24 03:12:25 +02:00
• e90c331bf6 Add PHP's xml module check and upload limits to setup. Klaus Weidenbach 2015-05-24 01:34:08 +02:00
• 7f9e4d6add federation problem from diaspora comments relayed through red channels due to typo redmatrix 2015-05-23 15:24:16 -07:00
• 11861949bb add channel_id to local_dir_update hook redmatrix 2015-05-23 15:19:50 -07:00
• 45259fed14 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-23 15:10:18 -07:00
• ee14657863 add local_dir_update hook redmatrix 2015-05-23 15:07:24 -07:00
• f575ef551d use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation Mario Vavti 2015-05-23 22:19:02 +02:00
• 760f17b173 Import security only when necessary, use correct variable in log Alexandre Hannud Abdo 2015-05-22 10:27:17 -03:00
• d37c51ef2e Fix accepting contacts by using correct jquery calls. Alexandre Hannud Abdo 2015-05-22 10:15:29 -03:00
• 5795e2a58b more migration of page types redmatrix 2015-05-21 22:17:17 -07:00
• 25bd332aab Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-21 20:39:10 -07:00
• 81d94dae2c preserve lock on edited comments redmatrix 2015-05-21 02:03:44 -07:00
• 3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-20 20:49:06 -07:00
• c10a4ca9c7 re-arrange the html cache a bit redmatrix 2015-05-20 20:28:16 -07:00
• 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. redmatrix 2015-05-20 20:20:35 -07:00
• 0689816772 check for success before updating remote id redmatrix 2015-05-20 19:27:05 -07:00
• 0826c5fd96 don't allow item_id to update without a valid post id redmatrix 2015-05-20 19:18:32 -07:00
• c55d13a836 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-20 18:48:05 -07:00
• 6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances redmatrix 2015-05-20 18:46:23 -07:00
• a7d39cf654 Another update for Dutch with complete $Projectname substitutions (and channel activity as suggested on previous discussion) jeroenpraat 2015-05-20 15:24:23 +02:00
• 578d21120a make design elements translateable Mario Vavti 2015-05-20 08:34:40 +02:00
• e68a00d381 more db structure redmatrix 2015-05-19 22:43:24 -07:00
• 507dfb9f85 add rot47 to the mix. This shouldn't affect the speed to any measurable degree. redmatrix 2015-05-19 21:51:48 -07:00
• acc8e10a45 merge redmatrix fix redmatrix 2015-05-19 18:28:52 -07:00
• d63bcde6e2 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-19 18:26:46 -07:00
• fe00d29047 issue with deleting imported design elements and re-installing them redmatrix 2015-05-19 18:25:27 -07:00
• c78869e437 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-19 17:36:11 -07:00
• e54198e5b8 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-19 17:17:04 -07:00
• d84c2835cd version update redmatrix 2015-05-19 17:16:46 -07:00
• 9485e917c6 Merge pull request #327 from solstag/help redmatrix 2015-05-20 10:14:35 +10:00
• 3471e98989 remove dbg code Mario Vavti 2015-05-19 21:09:35 +02:00
• 5641d81f03 be verbose about what type of element (block, layout, webpage) is beeing installed Mario Vavti 2015-05-19 21:07:43 +02:00
• a2696bea19 Document widget creation. Alexandre Hannud Abdo 2015-05-19 16:59:28 +00:00
• 2c7b786907 Document php-xml requirement for webdav. Alexandre Hannud Abdo 2015-05-19 16:46:15 +00:00
• 5e87bd8843 New update Dutch jeroenpraat 2015-05-19 12:12:16 +02:00
• 77e2ef45f0 mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements. redmatrix 2015-05-19 02:16:12 -07:00
• c11b1f8b0d vsprintf error redmatrix 2015-05-18 22:07:38 -07:00
• 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. redmatrix 2015-05-18 21:32:55 -07:00
• b7ae85e89a get rid of photo_flags in the code redmatrix 2015-05-18 20:10:44 -07:00
• da7abbb089 bring the new photo schema into play redmatrix 2015-05-18 19:43:53 -07:00
• eae241df56 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-18 17:38:07 -07:00
• c2ca2a09e7 this should fix undeletable blocks and layouts redmatrix 2015-05-18 17:32:36 -07:00
• 4c319a98a8 fix some merge errors redmatrix 2015-05-18 17:20:59 -07:00
• 71a2f2d773 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-18 17:00:04 -07:00
• ad07d48d3c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-18 16:30:55 -07:00
• 0340639cb1 fix po2php to handle projectname variables correctly redmatrix 2015-05-18 16:30:00 -07:00
• 2dd0e7f6bd Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-18 15:58:13 -07:00
• d42d7d0532 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-05-18 22:29:34 +02:00
• 9b1e540880 if block title contains $content but $content title is empty do not show an empty <h3> tag Mario Vavti 2015-05-18 22:29:13 +02:00