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

• 1be98d7b7f ✅ Some more work on unit tests. Klaus Weidenbach 2017-10-28 01:22:59 +02:00
• 66832c41e9 ⬆️ Update intl library. Klaus Weidenbach 2017-10-25 23:21:07 +02:00
• 8e4c5db766 ⬆️ Update Text_LanguageDetect. Klaus Weidenbach 2017-10-25 01:57:18 +02:00
• 1dc3253d4a Added mode to Portfolio widget Haakon Meland Eriksen 2017-10-29 16:41:49 +01:00
• feebe7d4c6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Haakon Meland Eriksen 2017-10-29 13:24:41 +01:00
• 9a8071e014 Spanish translation revised again. Manuel Jiménez Friaza 2017-10-28 12:54:57 +02:00
• 9ce817bb6e Merge pull request #894 from mjfriaza/dev git-marijus 2017-10-29 11:50:20 +01:00
• fe2a937cf2 fix "unstar" zotlabs 2017-10-28 15:24:37 -07:00
• 1cf90dd14d Spanish translation revised again. Manuel Jiménez Friaza 2017-10-28 12:54:57 +02:00
• 6823f0aa52 1/2 of hubzilla issue #893 zotlabs 2017-10-26 22:45:54 -07:00
• f2efa8c753 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Haakon Meland Eriksen 2017-10-27 05:58:10 +02:00
• e5cfb8a0cd encrypt the owa token zotlabs 2017-10-26 15:23:04 -07:00
• 4a3149d1ba hubzilla issue #890, separate the pdl preview feature from the mod_page webpage query so that the webpage will always win if a webpage and pdl have the same name. zotlabs 2017-10-25 22:33:03 -07:00
• dafe0a5547 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-25 16:55:18 -07:00
• fe5f1e4d67 ✅ Some unit test for include/language.php Klaus Weidenbach 2017-10-24 16:33:58 +02:00
• 5cf06a679c Context help for cards 2.8 Andrew Manning 2017-10-24 21:41:49 -04:00
• 859195d07a Merge pull request #888 from anaqreon/card-context git-marijus 2017-10-25 13:33:58 +02:00
• 344aa13c64 Merge branch '2.8RC' Mario 2017-10-25 13:29:19 +02:00
• 69b22e3f79 bump version and update changelog Mario 2017-10-25 13:27:30 +02:00
• a782c9944c Context help for cards Andrew Manning 2017-10-24 21:41:49 -04:00
• 39055c919c Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Haakon Meland Eriksen 2017-10-24 20:44:25 +02:00
• bc890d3038 version RC1 Mario 2017-10-24 19:43:06 +02:00
• e424ae0473 comment out statistics link in mod pubsites until we have something functional again Mario Vavti 2017-10-24 18:21:19 +02:00
• 780abe7dd4 Update composer autoload cache. Klaus Weidenbach 2017-10-22 21:19:42 +02:00
• a3fc9e3742 Portfolio widget - CSS update Haakon Meland Eriksen 2017-10-22 19:52:08 +02:00
• 325cbfcdb3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-10-24 18:30:00 +02:00
• 69e7a7594a Merge pull request #884 from dawnbreak/dev git-marijus 2017-10-24 18:28:42 +02:00
• c489f734db Merge pull request #882 from HaakonME/dev git-marijus 2017-10-24 18:22:35 +02:00
• 60a54e9aac comment out statistics link in mod pubsites until we have something functional again Mario Vavti 2017-10-24 18:21:19 +02:00
• 280baf7c82 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Haakon Meland Eriksen 2017-10-24 17:56:20 +02:00
• a23f8b6231 add hcard to webfinger Mario 2017-10-24 10:41:37 +02:00
• ccc8ff107e acl encoding issues zotlabs 2017-10-23 17:52:17 -07:00
• 59a9f6bf02 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-23 22:29:29 -07:00
• 2aff3a1a05 not sure when but the hcard went missing in webfinger zotlabs 2017-10-23 21:03:18 -07:00
• 25988ddefa not sure when but the hcard went missing in webfinger zotlabs 2017-10-23 21:03:18 -07:00
• c99962106d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Haakon Meland Eriksen 2017-10-24 06:03:09 +02:00
• 52c1f79f2e acl encoding issues zotlabs 2017-10-23 17:52:17 -07:00
• 2c07a92ad7 hubzilla issue #885 zotlabs 2017-10-23 12:35:46 -07:00
• e67ff5c122 hubzilla issue #885 zotlabs 2017-10-23 12:35:46 -07:00
• 37b7b2f1a8 mod_display: provide alternate serialisations (starting with atom) zotlabs 2017-10-22 21:44:39 -07:00
• fd5764e166 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-22 19:32:31 -07:00
• c49eec71f0 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-22 19:32:08 -07:00
• 812d904c98 bring back the markdown post feature (after investing some effort to make it work) zotlabs 2017-10-22 18:23:37 -07:00
• a4fdf3fbbb We call Theme:url() statically, make it also static. Klaus Weidenbach 2017-10-23 01:34:37 +02:00
• 9090bfd1c3 Update composer autoload cache. Klaus Weidenbach 2017-10-22 21:19:42 +02:00
• 8c57ed64d0 wrong key zotlabs 2017-10-22 12:35:17 -07:00
• b58bf75f21 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-10-22 21:44:37 +02:00
• 189a15fe37 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-22 21:44:20 +02:00
• c7d9a5ac91 wrong key zotlabs 2017-10-22 12:35:17 -07:00
• d0bc81f8d2 do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates Mario Vavti 2017-10-22 21:01:58 +02:00
• 0dc777bc45 Update DE translation strings phellmes 2017-10-21 13:52:53 +02:00
• 4f39119e37 Fixed the Spanish translation Manuel Jiménez Friaza 2017-10-21 13:01:46 +02:00
• 8aa4af372d Merge pull request #880 from mjfriaza/dev git-marijus 2017-10-22 21:14:03 +02:00
• d5e90d678a Merge pull request #881 from phellmes/dev git-marijus 2017-10-22 21:13:49 +02:00
• 0061ac8584 do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates Mario Vavti 2017-10-22 21:01:58 +02:00
• f648809856 Portfolio widget - CSS update Haakon Meland Eriksen 2017-10-22 19:52:08 +02:00
• 687114b407 Update DE translation strings phellmes 2017-10-21 13:52:53 +02:00
• 40f805c94a Fixed the Spanish translation Manuel Jiménez Friaza 2017-10-21 13:01:46 +02:00
• 9751d03a4d changelog Mario Vavti 2017-10-20 00:09:54 +02:00
• 36678d1b90 register workflow was getting over-ridden in include/security zotlabs 2017-10-19 18:48:11 -07:00
• 8f465e3097 Display different info message if using invite code Andrew Manning 2017-10-19 21:09:12 -04:00
• c80f4feb62 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-20 10:08:57 +02:00
• 2d06e86b5b Merge pull request #879 from redmatrix/anaqreon-patch-1 git-marijus 2017-10-20 10:04:03 +02:00
• 400441d56b register workflow was getting over-ridden in include/security zotlabs 2017-10-19 18:48:11 -07:00
• 7d92e9026e typo zotlabs 2017-10-19 18:48:01 -07:00
• 42416aad22 Display different info message if using invite code Andrew Manning 2017-10-19 21:09:12 -04:00
• 9d51318c53 table structure for pseudo or proxy channels (pchan) zotlabs 2017-10-19 17:24:11 -07:00
• cdb1bc9be6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-19 16:27:24 -07:00
• 52183f8bf8 changelog Mario Vavti 2017-10-20 00:09:54 +02:00
• 00dc7c916d Merge branch '2.8RC' of https://github.com/redmatrix/hubzilla into 2.8RC Mario Vavti 2017-10-19 12:08:48 +02:00
• 5fd6e36be7 strings Mario Vavti 2017-10-19 12:07:42 +02:00
• c2714262b3 strings Mario Vavti 2017-10-19 12:07:42 +02:00
• a58f386831 version Mario Vavti 2017-10-19 11:50:52 +02:00
• e61b44ddbb version Mario 2017-10-19 11:49:55 +02:00
• f3c374b6ff redirect to be moderated items to /moderate and change the conv link to partent mid in /modrate Mario Vavti 2017-10-19 11:20:09 +02:00
• 21b2c0afa3 fix issue #837 - w2w posts not removed in contact_remove() Mario Vavti 2017-10-19 10:21:47 +02:00
• ca4c725d57 remove redundant js Mario Vavti 2017-10-18 12:28:56 +02:00
• fe1aa90304 streamline the notifications js and change notification icon to exclamation-triangle if we have personal notifications Mario Vavti 2017-10-18 11:38:45 +02:00
• 656ec585b2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-17 21:24:07 -07:00
• 64a49eb54a update notifications if a notification area remains open Mario Vavti 2017-10-18 00:25:00 +02:00
• b106b53d05 don't translate 'guest:' since it is part of a url zotlabs 2017-10-16 23:01:00 -07:00
• a791809a84 ensure guests hve a unique (non-existent) url so that network discovery on remote servers doesn't come up mis-attributing the token. Future work should probably provide an actual page at this location describing it as a guest account of 'xyz'. zotlabs 2017-10-16 22:31:38 -07:00
• 71c3a0a197 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-16 18:20:42 -07:00
• 9497c6c0f7 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-16 18:20:17 -07:00
• 18279234fd mod_register - don't re-use the password, force them to type it in twice each time unless their browser saves passwords. zotlabs 2017-10-16 15:55:41 -07:00
• 4dd05dc4e8 regression in zot site info after zot6 work zotlabs 2017-10-16 15:20:45 -07:00
• cf7481da53 regression in zot site info after zot6 work zotlabs 2017-10-16 15:20:45 -07:00
• b8a9390f49 fix typos in comment Felix Wolfsteller 2017-10-11 09:13:59 +02:00
• 61c86212b9 Merge pull request #874 from fwolfst/comment_typo_fix git-marijus 2017-10-16 21:30:57 +02:00
• a33562144b documentation updates. I've been sitting on these for quite some time waiting for the current documentation work to complete; but if I leave this any longer I may forget the changes that I need to make. The last time there was a major documentation update all my intervening changes were lost, so hopefully I won't lose these and have to do them over again. zotlabs 2017-10-15 17:39:14 -07:00
• 9b94ad2ffe was unable to make the modal login dialog work on the channel page with a cover photo. So for mod_channel, send login to the login page instead of the modal popup. zotlabs 2017-10-14 01:17:47 -07:00
• 70b39e829b template not hidden zotlabs 2017-10-13 13:06:54 -07:00
• 29a29f277e create an actual logout module instead of relying on internal variables zotlabs 2017-10-12 22:10:42 -07:00
• e5f1bcacc8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-12 12:00:55 -07:00
• ccbc532c1a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-12 12:00:38 -07:00
• e6c166a182 sort out the notification ids zotlabs 2017-10-12 11:36:25 -07:00
• 26bd532bc5 remove redundant classes Mario Vavti 2017-10-12 15:57:16 +02:00
• c89b2ac3b7 missing login and register links Mario Vavti 2017-10-12 15:54:01 +02:00
• 6acd96fd33 typo zotlabs 2017-10-11 17:52:03 -07:00
• a652e546cc add local_channel as a comanche condition variable zotlabs 2017-10-11 15:19:06 -07:00