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

• 5e985ef34f consistency of event form redmatrix 2015-07-31 15:42:52 -07:00
• 6f9771768d event parse cleanup redmatrix 2015-07-30 22:49:43 -07:00
• acc9a8e43b escape $ in events redmatrix 2015-07-30 22:29:10 -07:00
• 1d218784d1 undefined function redmatrix 2015-07-30 20:37:32 -07:00
• f45cb8cf1f minor - add all the newly supported table columns redmatrix 2015-07-30 20:04:02 -07:00
• 4035c6f161 incorrect photo permissions when uploaded via /cloud; issue #21 redmatrix 2015-07-30 19:50:06 -07:00
• fd947c205b make /cloud work again after all the shuffling this morning redmatrix 2015-07-30 18:34:30 -07:00
• ec41899328 update some of the old attach.flag values to the new schema redmatrix 2015-07-30 17:16:23 -07:00
• 26411ab385 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-30 17:12:23 -07:00
• d5a40cac25 Merge branch 'master' of https://github.com/redmatrix/redmatrix several dav fixes Conflicts: include/items.php redmatrix 2015-07-30 17:11:16 -07:00
• 4c6368d075 dummy update redmatrix 2015-07-30 17:07:03 -07:00
• 1097cd2583 minor cleanup redmatrix 2015-07-29 19:01:25 -07:00
• b1ceb33ae0 Merge branch 'vobject' redmatrix 2015-07-29 18:59:28 -07:00
• 00fa2e2fe8 convert ics import to sabre/vobject redmatrix 2015-07-29 18:57:52 -07:00
• df41ce9536 incorrect function name redmatrix 2015-07-29 17:04:50 -07:00
• 845024e1e7 add connection filter to non-zot posts redmatrix 2015-07-29 17:04:17 -07:00
• e3f605e242 PRIVACY: imported events redmatrix 2015-07-29 16:30:00 -07:00
• 98fa996b3f Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-07-29 22:04:07 +02:00
• 4c83e9b6b4 initial work on using sabre as a vcalendar parser redmatrix 2015-07-28 21:55:28 -07:00
• 03756c65fc make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant redmatrix 2015-07-28 17:55:21 -07:00
• cbb6d37b6c Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-27 20:59:37 -07:00
• 52ccbd6b64 align buttons on event calendar redmatrix 2015-07-27 20:58:25 -07:00
• 3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-27 18:01:20 -07:00
• 0b232a610c logic issue in connection filter redmatrix 2015-07-27 13:48:41 -07:00
• 85f546e691 crude but more or less functional event import from thunderbird ics files redmatrix 2015-07-26 22:44:49 -07:00
• 9e6aea7382 backend code for importing events from "simple" ics calendar files. redmatrix 2015-07-26 21:39:46 -07:00
• 70a5a7b717 Merge branch 'master' of https://github.com/redmatrix/hubzilla redmatrix 2015-07-26 16:51:01 -07:00
• 3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-26 16:50:33 -07:00
• 44e92d80c7 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-26 16:43:02 -07:00
• 4b96b76f5c revision and string update redmatrix 2015-07-26 16:42:36 -07:00
• 54336ba43b comment out some popover infos - we provide enough visual feedback now Mario Vavti 2015-07-26 21:24:33 +02:00
• f6142d18c4 Provide connection status if status is "a-normal" Mario Vavti 2015-07-26 20:54:09 +02:00
• 7d66122240 Merge pull request #22 from git-marijus/master redmatrix 2015-07-26 07:18:23 +10:00
• 7f2b5a08c0 Merge pull request #378 from solstag/ptbrupdate git-marijus 2015-07-25 18:03:48 +02:00
• 6e557aa153 fix abook_pending reset to 1 loop if $new_friend is false and remove unused var Mario Vavti 2015-07-25 17:41:19 +02:00
• a3de9f9e41 update pt-br strings Alexandre Hannud Abdo 2015-07-24 22:37:09 -03:00
• cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-23 21:07:35 -07:00
• 908da4589d event privacy issue redmatrix 2015-07-23 21:02:41 -07:00
• bd131433b6 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-23 18:50:08 -07:00
• 27fa908233 patch to allow theme based widgets redmatrix 2015-07-23 18:49:37 -07:00
• c0e67db070 refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time. redmatrix 2015-07-22 18:57:48 -07:00
• ab4ce0e2f4 Merge pull request #377 from zzottel/master redmatrix 2015-07-22 17:51:41 +10:00
• 5c52120fb4 make content filter by language work for excludes zottel 2015-07-22 09:34:32 +02:00
• c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-21 17:13:48 -07:00
• 3ec6a431b6 ics calendar export - commas need to be escaped redmatrix 2015-07-21 17:07:16 -07:00
• db9a0282c4 provide content-disposition for exported ics file redmatrix 2015-07-20 21:28:33 -07:00
• 5146e6e76b Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-20 19:35:00 -07:00
• d87c7ceeb0 there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it. redmatrix 2015-07-20 19:33:42 -07:00
• 9495d2c701 indicate where progress has been made redmatrix 2015-07-20 17:13:47 -07:00
• 4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. Mario Vavti 2015-07-20 21:01:11 +02:00
• 464625cd91 show icons instead of disabled checkboxes Mario Vavti 2015-07-20 15:03:55 +02:00
• 6645846ad3 allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes) redmatrix 2015-07-20 02:04:51 -07:00
• 24ec104819 silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why. redmatrix 2015-07-19 21:18:13 -07:00
• 15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-19 21:08:34 -07:00
• fd8e6f3130 typo redmatrix 2015-07-19 21:04:02 -07:00
• ec00c5b18a the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage redmatrix 2015-07-19 17:53:52 -07:00
• 736db4992b string update redmatrix 2015-07-19 13:20:04 -07:00
• ed3d9d1f80 some photo/attach permissions issues redmatrix 2015-07-18 16:39:12 -07:00
• 22c1737fc9 Merge branch 'master' of https://github.com/redmatrix/hubzilla redmatrix 2015-07-18 16:11:54 -07:00
• e62a4b1bc9 Merge pull request #20 from git-marijus/master redmatrix 2015-07-19 09:11:31 +10:00
• 09f6337930 make likes/dislikes work again Mario Vavti 2015-07-17 22:45:35 +02:00
• fd16de335c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-16 20:21:20 -07:00
• 3c60a0c22c provide any single year of exported items redmatrix 2015-07-16 20:20:42 -07:00
• ec249d465b provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import) redmatrix 2015-07-16 20:19:20 -07:00
• 4299ae65a4 abook clone sync - change logic to also unset existing cross-project flags besides just setting them redmatrix 2015-07-16 18:07:23 -07:00
• c3dbacfb88 don't including rating stuff from cloned abooks redmatrix 2015-07-16 17:53:59 -07:00
• 39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos Mario Vavti 2015-07-16 22:04:52 +02:00
• 5506f178a5 Merge pull request #376 from tuscanhobbit/master Paolo T 2015-07-16 11:51:50 +02:00
• c9b5046fc0 Updated Italian strings Paolo Tacconi 2015-07-16 11:33:49 +02:00
• cdc0464de1 Merge pull request #18 from zzottel/master redmatrix 2015-07-16 18:03:42 +10:00
• 2bd05971ab fix observer tags for now (issue #17) zottel 2015-07-16 08:28:37 +02:00
• 498e2f7279 since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided. redmatrix 2015-07-15 22:59:55 -07:00
• 070397ef14 make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. redmatrix 2015-07-15 21:43:42 -07:00
• 964e461e09 allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system. redmatrix 2015-07-15 21:01:18 -07:00
• b9fd8b4614 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-15 18:41:50 -07:00
• 7db515b77c fix for empty recip array resulting from a mangled xchan redmatrix 2015-07-15 18:31:37 -07:00
• 7f6e4d5f4a more clone sync issues across projects redmatrix 2015-07-15 18:21:04 -07:00
• 95cf1668de Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-15 18:15:25 -07:00
• 59b67d52e6 clone sync fixes across red/hz redmatrix 2015-07-15 18:14:19 -07:00
• 6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-15 17:50:24 -07:00
• bfcdf5bd9e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-15 16:51:01 -07:00
• 86ad41a2db revision update redmatrix 2015-07-15 16:50:37 -07:00
• 99dfd2f5b1 Merge pull request #375 from zzottel/master redmatrix 2015-07-16 09:46:16 +10:00
• ba7acf88ad also change the update_ scripts zottel 2015-07-15 15:40:23 +02:00
• f4a1ca0692 change sh to bash in shebang to make scripts work zottel 2015-07-15 15:29:08 +02:00
• ca1f6f8c5b provide info text for automatic permissions Mario Vavti 2015-07-15 14:14:10 +02:00
• 5fcf1256bd whitespace Mario Vavti 2015-07-15 14:07:35 +02:00
• 0c77a127f2 show inherited state in Connection Default Permissions Mario Vavti 2015-07-15 14:03:34 +02:00
• 0d1a541e88 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-14 22:40:22 -07:00
• 9b15dbde1c group fixes to import redmatrix 2015-07-14 22:38:04 -07:00
• 5487b22dd7 fix import of group members redmatrix 2015-07-14 22:19:21 -07:00
• 89fbfd2bf8 more stuff to resume failed imports redmatrix 2015-07-14 22:04:07 -07:00
• a87e318403 log the import progress redmatrix 2015-07-14 21:30:13 -07:00
• caaf7192ff provide resumable imports if things go wrong redmatrix 2015-07-14 21:02:54 -07:00
• 10406c6d15 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-14 17:17:45 -07:00
• 46aacfe64d stream_perms_xchans() set to empty quoted string when no results rather than return an empty string redmatrix 2015-07-14 17:15:53 -07:00
• e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-14 17:10:13 -07:00
• 3687fef53c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-14 16:55:58 -07:00
• a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. redmatrix 2015-07-14 16:54:16 -07:00
• 104cbcab72 make strings translateable Mario Vavti 2015-07-14 21:32:18 +02:00