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

• 7738083f3e replace really old example widgets with pointer to current widget list zotlabs 2017-05-28 16:02:10 -07:00
• 98fe474276 Merge pull request #796 from dawnbreak/QA_testing git-marijusandGitHub 2017-05-28 18:00:58 +02:00
• 03b8ecd0de fix update_r1189() for mysql and postgres Mario Vavti 2017-05-28 17:54:05 +02:00
• bb669ccd2c update changelog for 2.4 Mario Vavti 2017-05-28 13:01:20 +02:00
• e9d924b5d7 update changelog for 2.4 Mario Vavti 2017-05-28 13:01:20 +02:00
• 143601374c Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-27 16:22:51 -07:00
• 586c72fbe5 Don't drop PHP5 support yet. Klaus Weidenbach 2017-05-27 22:44:54 +02:00
• 8bb832e23f Merge pull request #798 from zotlabs/pagetitlefix git-marijusandGitHub 2017-05-27 19:24:15 +02:00
• 184f522d5f hubzilla issue #795 zotlabs 2017-05-26 14:52:45 -07:00
• 0f0e23445a :hammer:✅ Add html2markdown unit tests. Klaus Weidenbach 2017-05-24 23:47:03 +02:00
• 1b75e4de0d hubzilla issue #795 zotlabs 2017-05-26 14:52:45 -07:00
• 2deafa0dea update link to account roles help on new_channel page zotlabs 2017-05-25 23:03:55 -07:00
• 938a621810 update the link to account roles help on register page zotlabs 2017-05-25 23:02:48 -07:00
• 583a047e83 looks like a commit was lost someplace, but I'll re-do it later (convert sql schema files to default integers to int values); in any event change all the mysql strings that were 255 maxlength to 191 maxlength in case they get used as indexes down the line zotlabs 2017-05-25 22:50:16 -07:00
• 57edfa7ae8 put back obsolete permission fields in abook and channel schema files so we can restore the old data without choking when upgrading the table type zotlabs 2017-05-25 22:10:01 -07:00
• b4da2d35bf start using the abook_not_here flag (requires changes in addons, not easily portable to hubzilla) zotlabs 2017-05-25 13:37:13 -07:00
• fd357f87be only store search info for text filetypes when updating the documentation indexes zotlabs 2017-05-24 22:34:52 -07:00
• df8c69f73b some minor help cleanup - add '-/foo' override of language detection zotlabs 2017-05-24 22:24:45 -07:00
• 8ce98e38dc ⬆️ Update dev libraries. Klaus Weidenbach 2017-05-18 21:43:50 +02:00
• 3a00140797 remove php version checks for older ( < 5.4) code incompatibilities zotlabs 2017-05-23 21:20:40 -07:00
• bf580fcc06 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-23 16:14:41 -07:00
• 31d9208172 bump version Mario Vavti 2017-05-23 21:53:34 +02:00
• 508ea9153c this looks like a slightly cleaner solution to the unicode dl issue zotlabsandMario Vavti 2017-05-14 21:04:34 -07:00
• 6ff16e2651 hubzilla issue #777 zotlabsandMario Vavti 2017-05-14 20:51:15 -07:00
• da682717ab wiki auto language select to match webpages implementation zotlabsandMario Vavti 2017-05-22 20:18:47 -07:00
• 647b5d098f apporder style improvement and add to nav menu, also add language awareness to webpages zotlabsandMario Vavti 2017-05-22 17:07:34 -07:00
• 3a9e5f0f98 schema fixes zotlabsandMario Vavti 2017-05-22 00:57:56 -07:00
• 50c9aec436 some issues with the app order template logic zotlabsandMario Vavti 2017-05-21 22:42:22 -07:00
• ec7ecc285e apporder module and all the associated backend stuff to make it work; probably needs a bit of UI cleanup and a link to it from somewhere zotlabsandMario Vavti 2017-05-21 22:23:36 -07:00
• dea0d07b9a Merge pull request #794 from dawnbreak/dev git-marijusandGitHub 2017-05-23 21:39:47 +02:00
• 357e7af6ad add 'apps' app zotlabs 2017-05-23 01:18:34 -07:00
• 53057830e0 wiki auto language select to match webpages implementation zotlabs 2017-05-22 20:18:47 -07:00
• 7ae0317b6a apporder style improvement and add to nav menu, also add language awareness to webpages zotlabs 2017-05-22 17:07:34 -07:00
• 547df2219a Replace Mardownify library with html-to-markdown library. Klaus Weidenbach 2017-05-23 00:32:11 +02:00
• 1c8c7479b8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-22 03:51:58 -07:00
• 36a960adec schema fixes zotlabs 2017-05-22 00:57:56 -07:00
• 07ee4984cb some issues with the app order template logic zotlabs 2017-05-21 22:42:22 -07:00
• e4448423fb apporder module and all the associated backend stuff to make it work; probably needs a bit of UI cleanup and a link to it from somewhere zotlabs 2017-05-21 22:23:36 -07:00
• 50e9d02458 bump version Mario Vavti 2017-05-20 23:04:18 +02:00
• 45233dd53c 2.4RC1.1 Mario Vavti 2017-05-20 23:03:06 +02:00
• 1a9fdc565c resolve merge conflict zotlabsandMario Vavti 2017-05-15 22:58:13 -07:00
• e32e616031 resolve merge conflict zotlabsandMario Vavti 2017-05-15 22:58:13 -07:00
• b14fb1759d 2.4RC1 Mario Vavti 2017-05-20 22:24:54 +02:00
• abd757d356 always wonder about people who say "do as I say, not as I do..." zotlabsandMario Vavti 2017-05-14 18:37:36 -07:00
• 28645b492e one file hadn't yet been saved when doing pull request zotlabsandMario Vavti 2017-05-03 19:02:20 -07:00
• 3919c8f79f abook_not_here flag created to indicate singleton connections which are connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented. zotlabsandMario Vavti 2017-05-03 18:50:32 -07:00
• 803be11bbc Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering zotlabsandMario Vavti 2017-05-14 18:02:22 -07:00
• 335de94343 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-05-19 10:48:23 +02:00
• b62463107c smileybutton fixes Mario Vavti 2017-05-19 10:47:33 +02:00
• 93ce1661af smileybutton fixes Mario Vavti 2017-05-19 10:47:33 +02:00
• f59ed38a38 some styling for system notifications Mario Vavti 2017-05-18 14:57:10 +02:00
• 3fad69e5ca some styling for system notifications Mario Vavti 2017-05-18 14:57:10 +02:00
• 005db13c45 silence php warning during install Mario Vavti 2017-05-17 11:24:27 +02:00
• d7ddafb39f css first aid for mod setup Mario Vavti 2017-05-17 11:25:14 +02:00
• 3fe7bf27de Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-05-17 11:25:33 +02:00
• 4b718929df css first aid for mod setup Mario Vavti 2017-05-17 11:25:14 +02:00
• a44c908147 silence php warning during install Mario Vavti 2017-05-17 11:24:27 +02:00
• 1bf37305a8 Implemented switch statement logic in Comanche layout parser. rootandMario Vavti 2017-05-08 20:55:31 -04:00
• ed4d589077 Merge pull request #783 from zotlabs/app_order git-marijusandGitHub 2017-05-17 10:06:14 +02:00
• 47a080d79c Merge pull request #782 from dawnbreak/QA_testing git-marijusandGitHub 2017-05-17 10:04:52 +02:00
• 66a8e5ddbb Merge pull request #780 from zotlabs/docbug git-marijusandGitHub 2017-05-17 10:03:07 +02:00
• 8c39ed61a9 Merge pull request #778 from beardyunixer/dev git-marijusandGitHub 2017-05-17 10:02:35 +02:00
• a12d403981 Merge pull request #774 from zotlabs/pgapps git-marijusandGitHub 2017-05-17 09:57:50 +02:00
• ccf0274d13 Merge pull request #775 from zotlabs/pgstuff git-marijusandGitHub 2017-05-17 09:57:32 +02:00
• 21103f8bc4 provide mechanism to arbitrarily sort the nav tray apps, currently the preferred order list needs to be manually created zotlabs 2017-05-16 22:57:34 -07:00
• a1ba44db72 provide mechanism to arbitrarily sort the nav tray apps, currently the preferred order list needs to be manually created zotlabs 2017-05-16 22:57:34 -07:00
• 3c22a7b482 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-16 17:51:00 -07:00
• d056b13e14 :construction_worker:✅ Documentation Permissions.php. Klaus Weidenbach 2017-05-13 00:16:50 +02:00
• 7a39ccf7bb regenerate optimized autoload files Mario Vavti 2017-05-16 19:03:37 +02:00
• 3be90c2e45 include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader. zotlabsandMario Vavti 2017-04-17 17:54:50 -07:00
• 60caecffdd include attach.php here (boot.php) instead of each file that uses it. Eventually this needs to move to an autoloader. zotlabsandMario Vavti 2017-04-17 17:54:50 -07:00
• df3eb562f0 danger - do not use 'char(n)' with postgres it creates a thing called a bpchar which is different than a normal text field in subtle ways. zotlabs 2017-05-15 22:58:13 -07:00
• c4b247e75e no bug reporting info in docs zotlabs 2017-05-15 20:37:29 -07:00
• d9fdd0ce36 no bug reporting info in docs zotlabs 2017-05-15 20:37:29 -07:00
• 226fcac72e Update nginx Thomas Willingham 2017-05-15 10:55:33 +01:00
• 5c8a911c93 this looks like a slightly cleaner solution to the unicode dl issue zotlabs 2017-05-14 21:04:34 -07:00
• 2cc1844d97 hubzilla issue #777 zotlabs 2017-05-14 20:51:15 -07:00
• 3916d5c567 always wonder about people who say "do as I say, not as I do..." zotlabs 2017-05-14 18:37:36 -07:00
• ef51c1c2b2 Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering zotlabs 2017-05-14 18:02:22 -07:00
• f637faf0d2 Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds but this prevents it from rendering zotlabs 2017-05-14 18:02:22 -07:00
• d010f4fcae issue #769 zotlabsandMario Vavti 2017-05-11 18:32:34 -07:00
• d5e436d15b Empty ACL should not result in no ACL when uploading a file Mario Vavti 2017-05-11 13:31:36 +02:00
• 18ee1ba589 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-05-12 10:04:00 +02:00
• 795b39250f Merge pull request #770 from zotlabs/mast496 git-marijusandGitHub 2017-05-12 10:02:33 +02:00
• ae89f1b3b3 Merge pull request #771 from zotlabs/filesync git-marijusandGitHub 2017-05-12 10:02:12 +02:00
• cbe600369c Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-11 20:59:50 -07:00
• 1de1b58a08 consolidate email validation checks zotlabs 2017-05-11 19:01:04 -07:00
• 4f577cbdeb issue #769 zotlabs 2017-05-11 18:32:34 -07:00
• c2bd7d1e56 issue #769 zotlabs 2017-05-11 18:32:34 -07:00
• e501289a55 consolidate and simplify the generation of activitystreams persons, add a couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also. zotlabs 2017-05-11 17:39:26 -07:00
• 1ebc9de1e6 Empty ACL should not result in no ACL when uploading a file Mario Vavti 2017-05-11 13:31:36 +02:00
• f34b060e23 Merge pull request #767 from zotlabs/realm_ac git-marijusandGitHub 2017-05-11 10:41:57 +02:00
• 84064b90a6 disable oauth2 until I can get back to it - it's throwing typos zotlabs 2017-05-10 22:15:01 -07:00
• 08e21fd0b8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-05-10 17:11:17 -07:00
• 1077686bda send directory realm_token for navbar autocomplete searches - if configured zotlabs 2017-05-10 17:02:56 -07:00
• 582d075c45 missing clearfix Mario Vavti 2017-05-10 17:39:15 +02:00
• b60f1085db missing clearfix Mario Vavti 2017-05-10 17:39:15 +02:00
• a3bdfc1580 Update DE translation strings phellmesandMario Vavti 2017-05-09 16:00:02 +02:00
• 76a8711570 Merge pull request #766 from phellmes/dev git-marijusandGitHub 2017-05-10 14:52:41 +02:00
• 87b424123b don't allow html in plugin comment blocks zotlabsandMario Vavti 2017-05-09 20:33:25 -07:00