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

• 5b9afd7555 Merge pull request #245 from chris1315/patch-2 redmatrix 2016-01-02 07:49:00 +11:00
• e665afcc2a Merge pull request #244 from anaqreon/anaqreon-titel-typo redmatrix 2016-01-02 07:48:42 +11:00
• b0ec0e9eac Create git_for_non_developers.bb chris1315 2016-01-01 16:24:49 +01:00
• 49e4016ba2 Misspelled Titel Andrew Manning 2016-01-01 05:53:29 -05:00
• 9ee7d60afe more issue #239 redmatrix 2015-12-31 15:17:12 -08:00
• 1964fa05e1 issue #239, provide 'Public' text on ACL selector when appropriate to do so. redmatrix 2015-12-31 15:10:36 -08:00
• caf3a69d99 yearly license update redmatrix 2015-12-31 13:25:23 -08:00
• 769ad4a836 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-31 12:31:17 -08:00
• 062c03c9f7 comment clarification redmatrix 2015-12-31 12:30:49 -08:00
• 2cf4ac26fd log API improvements and queue optimisation for singleton networks redmatrix 2015-12-31 12:26:41 -08:00
• 405725875d nl+es-es string update jeroenpraat 2015-12-29 22:09:47 +01:00
• 5f61f57b2c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-29 11:16:47 -08:00
• fbeb33479b store perms_accept on channel creation redmatrix 2015-12-29 11:16:13 -08:00
• ffd4557447 Merge pull request #238 from anaqreon/remove-bad-url redmatrix 2015-12-28 18:12:50 +11:00
• cf5df259e5 refresh issue redmatrix 2015-12-27 21:08:28 -08:00
• 3d6359f2e7 Removed defunct URL from old auto-update idea Andrew Manning 2015-12-26 16:20:56 -05:00
• 5a229234e7 Set accept permissions to that of role so if you change to a custom role you don't start with nothing. redmatrix 2015-12-25 15:56:29 -08:00
• b1a77b2235 don't send wall-post notifications when creating webpages on another channel redmatrix 2015-12-25 14:59:46 -08:00
• 6db6fef29f spelling redmatrix 2015-12-25 14:56:06 -08:00
• 31fbd19c86 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-25 14:32:16 -08:00
• a085f4df7f regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting. redmatrix 2015-12-25 14:25:58 -08:00
• cd2c6779b7 update es-es strings jeroenpraat 2015-12-25 17:37:05 +01:00
• d39cd088a1 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-24 14:41:47 -08:00
• e98fcf68f0 issue #235 redmatrix 2015-12-24 14:41:18 -08:00
• 7d5e066056 After reading and talking with experts I came to the conclusion that es-es and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960 jeroenpraat 2015-12-24 15:29:52 +01:00
• ba920260b8 reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958. jeroenpraat 2015-12-23 19:18:46 +01:00
• 2988d96cf0 Spanish language codes. See issue #234 jeroenpraat 2015-12-23 16:41:22 +01:00
• 36717e5f32 start on refactor of plugin/theme/widget info block parsing redmatrix 2015-12-22 19:53:00 -08:00
• 4dff54bcb8 update es+nl strings jeroenpraat 2015-12-22 19:29:52 +01:00
• 7a9fe0907a make the queue api accessible to addons redmatrix 2015-12-21 17:00:42 -08:00
• bc5a675cdf Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-20 14:57:01 -08:00
• f23e8f8d41 merge hell redmatrix 2015-12-20 14:55:43 -08:00
• 61fa97baab Merge branch 'HaakonME-master' redmatrix 2015-12-20 14:54:08 -08:00
• 047163b884 Merge pull request #232 from wave72/master redmatrix 2015-12-21 06:14:33 +11:00
• 6409237b29 Updated Norwegian strings for Hubzilla Haakon Meland Eriksen 2015-12-20 14:42:14 +01:00
• 598a428c6b Added 'invitation_only' to site info wave72 2015-12-20 14:41:49 +01:00
• 1cfb83f003 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-20 14:09:30 +01:00
• 2aad4c2cf9 Merge pull request #4 from redmatrix/master Wave 2015-12-20 10:20:36 +01:00
• e2692a4baa Merge pull request #230 from wave72/master Wave 2015-12-20 10:17:55 +01:00
• 474a1267d7 Updated Italian strings wave72 2015-12-20 10:08:43 +01:00
• ed5ca9e4cc use realpath to bypass symlinks and check actually directory redmatrix 2015-12-18 14:55:19 -08:00
• 8d61efa0e8 allow widget 'packages' as well as individual files redmatrix 2015-12-18 14:10:06 -08:00
• b816a575eb Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-18 13:46:38 -08:00
• a99d28dea9 sql delete with limit redmatrix 2015-12-18 13:46:03 -08:00
• 628e565a6c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-18 16:04:07 +01:00
• 84bf705811 update smarty to 3.1.28 stable Mario Vavti 2015-12-18 11:33:34 +01:00
• a721f39945 Commented out extra addons, themes etc. Haakon Meland Eriksen 2015-12-18 07:24:05 +01:00
• 1b9722c65a loop detection redmatrix 2015-12-17 18:16:46 -08:00
• 62a60e5542 more work on media uploads via api redmatrix 2015-12-17 16:22:13 -08:00
• 539d06f02d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-17 14:27:07 -08:00
• 9c23fe5ab6 issue #228 redmatrix 2015-12-17 14:26:42 -08:00
• f78e9001f3 fix search item attachment rendering Mario Vavti 2015-12-17 19:39:26 +01:00
• dee1841394 Merge pull request #227 from zzottel/master zzottel 2015-12-17 14:33:38 +01:00
• a5201a90e8 Merge remote-tracking branch 'upstream/master' zottel 2015-12-17 14:30:34 +01:00
• 5f5e4ee6b9 add forgotten German docs zottel 2015-12-17 14:29:35 +01:00
• cf6519da99 Merge pull request #226 from zzottel/master zzottel 2015-12-17 14:28:15 +01:00
• 63eaf643a8 small fixes to English docs zottel 2015-12-17 14:27:13 +01:00
• a57a3c709e reorganize German docs to fit the new docs structure fix mentions of RedMatrix zottel 2015-12-17 14:25:16 +01:00
• bcebd1d5b9 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-16 22:47:23 -08:00
• 4cacfe59bd queue/notification/delivery refactor continued redmatrix 2015-12-16 22:42:33 -08:00
• f3ad7b9a16 Merge pull request #225 from zzottel/master redmatrix 2015-12-17 10:39:49 +11:00
• b909c878b1 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-16 14:49:20 -08:00
• b155f2260f some notifier optimisations. Also put a fixme on the invite total generations for new accounts, which is incorrect and now commented out. redmatrix 2015-12-16 14:47:30 -08:00
• 63256bc9b2 small fixes in English help files zottel 2015-12-16 17:00:05 +01:00
• 87519e107a updates to some German help files zottel 2015-12-16 16:59:17 +01:00
• a38710aa4e Merge pull request #224 from zzottel/master zzottel 2015-12-16 14:01:33 +01:00
• 020fea3031 update to German strings zottel 2015-12-16 14:00:23 +01:00
• b4102489aa Merge pull request #223 from zzottel/master zzottel 2015-12-16 12:32:17 +01:00
• 871ee0f571 Merge pull request #222 from wave72/master Wave 2015-12-16 09:13:40 +01:00
• f0d90005ea remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead zottel 2015-12-16 09:06:20 +01:00
• 933e105f32 Updated Italian strings Paolo Tacconi 2015-12-16 09:00:27 +01:00
• 9b4e6e1ec0 some more minor api tweaks redmatrix 2015-12-15 20:21:40 -08:00
• 46e4d2d573 bring back the schemaspy makefile redmatrix 2015-12-15 20:00:48 -08:00
• 2aa3acae6b remove deprecated table redmatrix 2015-12-15 19:46:24 -08:00
• 8514789da9 additional fix for the array_key_exists message in #221 redmatrix 2015-12-15 17:50:14 -08:00
• 20dcf37976 issue #221 redmatrix 2015-12-15 17:42:49 -08:00
• 38d513181d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-15 15:17:39 -08:00
• f121b74bec enhance whitespace redmatrix 2015-12-15 15:17:10 -08:00
• cb8cccc537 fix typos before merging redmatrix 2015-12-15 15:13:16 -08:00
• 2924b9182e revise the photo activity a bit so that we always have a valid activity body. Several network connectors can get empty posts or posts that don't contain any reference whatsoever to the actual photo. Since this can cause duplicate images on our own site, just provide the activity summary and any included body text to the activity by default. Provide a function to enhance this activity with an actual photo which can be applied on demand for any network connectors that desire it. Otherwise they'll just get a link to the photo in the activity statement - which is better than an empty post. Have applied this "add actual photo to the post" function to both Diaspora and RSS feeds. Also provide the album as the activity target. redmatrix 2015-12-15 15:01:54 -08:00
• 5a59cd9b8c Invitation only added to the admin site page. Plus css wrapper class to docu search. jeroenpraat 2015-12-15 21:00:40 +01:00
• ba463afbdc even more queue api redmatrix 2015-12-15 00:42:19 -08:00
• 6f2a5117dc more queue api redmatrix 2015-12-15 00:04:30 -08:00
• b13241564b more work on queue api redmatrix 2015-12-14 22:44:05 -08:00
• 76816de3aa simplify queue insertion for normal items redmatrix 2015-12-14 20:49:12 -08:00
• 49108c230b regenerate the item body for linked photo items that now have no body to provide legal activities when going to other networks. Remove the signature since the signed text was an empty string and we've just replaced it with content that will not verify. redmatrix 2015-12-14 17:58:39 -08:00
• b32bba47c8 set following to false redmatrix 2015-12-14 17:25:40 -08:00
• 3b1ab5e79c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-14 18:55:43 +01:00
• dcf7946673 revert include/photos.php:L380 redmatrix 2015-12-14 02:34:18 -08:00
• fdd2da905a more work on api media uploads redmatrix 2015-12-13 19:15:42 -08:00
• 2cceca49e9 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-13 15:37:26 -08:00
• bb0e4044bf remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2. redmatrix 2015-12-13 15:35:45 -08:00
• 7244dfce1d Typos jeroenpraat 2015-12-12 17:32:29 +01:00
• fb5ac37ca2 That script is taken from someone else without any contribution (http://blog.strictly-software.com/2013/07/apache-performance-tuning-bash-script.html). Also the English is very bad. Anyway, I've replaced it with some general tips that all web admins should know. jeroenpraat 2015-12-12 17:30:02 +01:00
• f0a588547d Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2015-12-12 17:02:01 +01:00
• 04d3ac9aaf es+nl strings update jeroenpraat 2015-12-12 17:01:43 +01:00
• 565126a888 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-12 10:00:15 +01:00
• 395268da22 a couple of api improvements redmatrix 2015-12-11 21:10:20 -08:00
• ac3075bef7 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-11 17:01:23 -08:00
• 1f4c596841 add deprecated update_with_media endpoint redmatrix 2015-12-11 17:00:45 -08:00