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

• 857e13e9b8 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-12-02 09:44:42 +01:00
• 593423434c fix attachment rendering for mail Mario Vavti 2015-12-02 09:44:25 +01:00
• 25caeee854 issue #204 redmatrix 2015-12-01 20:21:44 -08:00
• 20ce7a2d9f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-01 15:51:39 -08:00
• 1ba74d824b usercache is no longer used redmatrix 2015-12-01 15:51:15 -08:00
• be7b706486 Merge pull request #200 from anaqreon/update-addon-script redmatrix 2015-12-02 09:08:25 +11:00
• 78e18fcdcf fix badge padding in narrow navbar Mario Vavti 2015-12-01 13:28:50 +01:00
• 706598313e make narrow navbar setting work again Mario Vavti 2015-12-01 13:18:08 +01:00
• b96f09bb3a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-01 00:35:01 +01:00
• 4b191fb558 version redmatrix 2015-11-30 14:54:34 -08:00
• de1abf9981 Merge pull request #201 from wave72/master Wave 2015-11-30 16:29:16 +01:00
• c69f6ca1f4 Updated Italian strings Paolo Tacconi 2015-11-30 16:25:24 +01:00
• d4b04d22ed Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-addon-script Andrew Manning 2015-11-30 07:50:21 -05:00
• b1f4b9759b Abort addon update if repo does not exist Andrew Manning 2015-11-30 07:49:56 -05:00
• 650f882265 generalise the site black|white allow lists, also add a channel black|white list for future use redmatrix 2015-11-29 20:26:00 -08:00
• a2747403f2 report correct directory mode for standalone directories in siteinfo redmatrix 2015-11-29 19:45:29 -08:00
• 3f9412add2 create get_site_info() function so we can have a siteinfo.json module instead of or actually in addition to siteinfo/json redmatrix 2015-11-29 19:37:03 -08:00
• 29877963be issue #189 redmatrix 2015-11-29 18:07:59 -08:00
• 302c5afdee don't try to pull public content from dead sites redmatrix 2015-11-29 16:28:35 -08:00
• 9f90806027 log whatever is showing up in the delivery hash array since it seems that one site has something unusual there and it is throwing errors. redmatrix 2015-11-29 15:23:29 -08:00
• 519862115c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-29 11:56:47 +01:00
• 4d97ea106c Resolving merge conflict Haakon Meland Eriksen 2015-11-29 11:55:39 +01:00
• d3aa50c9c3 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-28 19:17:28 -08:00
• 1708769d42 version redmatrix 2015-11-28 19:16:55 -08:00
• 4e223f816a reflect in form if we are editing or creating Mario Vavti 2015-11-28 17:05:37 +01:00
• 8cf6b4064f My version of jot.tpl Haakon Meland Eriksen 2015-11-28 16:44:02 +01:00
• 17907f11a3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-28 16:26:24 +01:00
• cb7df797e1 Removed my version of jot.tpl Haakon Meland Eriksen 2015-11-28 16:23:17 +01:00
• 7db86a4e05 css fixes Mario Vavti 2015-11-28 14:47:17 +01:00
• 122d7281f7 fix tpl if clause Mario Vavti 2015-11-28 11:04:33 +01:00
• 4bfd34b479 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-27 20:05:47 -08:00
• 962d9f36d0 document dreport expiration setting redmatrix 2015-11-27 20:05:20 -08:00
• 216d41cd64 Reverted. ken restivo 2015-11-27 16:32:32 -08:00
• 4af104384b Re-reading zottel's excellent docs, 70 seems the recommended default. Changed. ken restivo 2015-11-27 14:43:17 -08:00
• aa78d51521 More sane defaults, to avoid problems. Addresses #188 ken restivo 2015-11-27 14:40:22 -08:00
• 16e7ec7bfe Safe defaults to prevent #188 ken restivo 2015-11-27 14:38:29 -08:00
• fce1dc083b add templates Mario Vavti 2015-11-27 22:53:36 +01:00
• bcfa72ed31 move events tools to aside widget Mario Vavti 2015-11-27 22:45:28 +01:00
• b92cc852d1 css fixes Mario Vavti 2015-11-27 21:44:02 +01:00
• 6762af4158 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-11-27 20:55:44 +01:00
• f691e8981a fixes #194 - New directory server is selected on every directory page reload Mario Vavti 2015-11-27 20:55:27 +01:00
• 6875a540ec Merge pull request #193 from zzottel/master git-marijus 2015-11-27 14:04:59 +01:00
• e569f5d6eb unset does not work in webkit browsers Mario Vavti 2015-11-27 14:00:37 +01:00
• 61a5e81bc6 only show edit icon for your own events and minoe cleanup Mario Vavti 2015-11-27 13:55:02 +01:00
• ee153f64d4 add spinner to events Mario Vavti 2015-11-27 13:32:20 +01:00
• 4c4db6f73c added info about Apache settings to avoid Apache running wild zottel 2015-11-27 10:35:31 +01:00
• fa5a382c4b don't show item_delayed_publish items in tag clouds redmatrix 2015-11-26 17:35:41 -08:00
• a73c385831 lost calendar icon Mario Vavti 2015-11-26 23:29:49 +01:00
• 91b35c5349 various css fixes Mario Vavti 2015-11-26 23:19:06 +01:00
• 056db37c66 beautify event item code Mario Vavti 2015-11-26 22:14:20 +01:00
• 5cb71fa5da default timepicker to 15 min steps. abbr -> span Mario Vavti 2015-11-26 21:00:04 +01:00
• 55d00243fb Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-11-26 20:53:59 +01:00
• 8a269823d2 improve event rendering Mario Vavti 2015-11-26 20:53:42 +01:00
• 5ec5b127d0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-26 11:38:07 -08:00
• 0cf9e498b9 version redmatrix 2015-11-26 11:37:43 -08:00
• c407e72dcc add location Mario Vavti 2015-11-26 16:40:40 +01:00
• 8e3b796a2f fix event rendering Mario Vavti 2015-11-26 16:38:14 +01:00
• 17e7b276f6 we also need nofinish in the object. css fices Mario Vavti 2015-11-26 14:45:22 +01:00
• 306ce3819e css fixes Mario Vavti 2015-11-26 14:16:35 +01:00
• f80aff4a65 also catch the other object Mario Vavti 2015-11-26 13:28:31 +01:00
• c7cbd41c16 first iteration on the event item Mario Vavti 2015-11-26 12:26:27 +01:00
• 41542e6886 document that you probably shouldn't set a primary directory server in somebody else's realm. redmatrix 2015-11-25 17:34:03 -08:00
• a039869ba0 issue #185 redmatrix 2015-11-25 17:30:11 -08:00
• 192e85ffa4 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-25 15:14:20 -08:00
• b334201797 removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable redmatrix 2015-11-25 15:12:54 -08:00
• 3ea84d7eab some basic event styling Mario Vavti 2015-11-25 22:55:07 +01:00
• a80c45940e add a if clause for the case we do not have a finish date Mario Vavti 2015-11-25 19:02:48 +01:00
• ab71e33d83 note to self: do not make things more complicated than they need to be. Mario Vavti 2015-11-25 17:28:26 +01:00
• fe57e7059b events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted Mario Vavti 2015-11-25 15:05:21 +01:00
• 2de65ab39f Merge pull request #3 from redmatrix/master Wave 2015-11-25 09:39:44 +01:00
• 0559db9cf8 fix event form initial values redmatrix 2015-11-24 15:37:33 -08:00
• bae7b034e6 add (blank?) label param to other instances of datetimesel redmatrix 2015-11-24 14:54:13 -08:00
• 74a40adece Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-11-24 19:18:52 +01:00
• 1767a07f4d efent form template fixes Mario Vavti 2015-11-24 19:18:26 +01:00
• af7549d2f6 Merge pull request #187 from wave72/master Wave 2015-11-24 17:02:58 +01:00
• e785b723aa Updated Italian strings Paolo Tacconi 2015-11-24 16:50:12 +01:00
• f520cd92d0 open form on dbl-click Mario Vavti 2015-11-24 14:33:23 +01:00
• eb6fd311df fix event droping Mario Vavti 2015-11-24 14:25:16 +01:00
• 5a12944b39 oups :) Mario Vavti 2015-11-24 14:18:29 +01:00
• 987619130b some event heavy lifting - please test and report issues Mario Vavti 2015-11-24 14:15:28 +01:00
• 2b2723cb74 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-24 07:23:43 +01:00
• e485ecb3b4 more database doco redmatrix 2015-11-23 20:23:20 -08:00
• 8c5203f7e1 issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time. redmatrix 2015-11-23 17:47:18 -08:00
• dfaf1a1075 issue #183 redmatrix 2015-11-23 15:27:57 -08:00
• bf5c0e0b0d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-23 15:18:19 -08:00
• 167e754a1b issue #184 redmatrix 2015-11-23 15:17:38 -08:00
• 34b804e9dc Merge pull request #182 from anaqreon/url-selected redmatrix 2015-11-24 09:41:55 +11:00
• 7338649fa5 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-23 14:16:14 +01:00
• ae1103c5a3 doco updates redmatrix 2015-11-22 18:20:19 -08:00
• a7e4553ea7 delivery report tweaks redmatrix 2015-11-22 17:12:30 -08:00
• 6f27e8db38 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-22 14:08:20 -08:00
• 292b02b58c webpages and design elements weren't being included in the item export query. redmatrix 2015-11-22 14:06:52 -08:00
• e60f527cb0 Documenting the need to change database server address from 127.0.0.1 to localhost when installing Hubzilla on OpenShift with the deploy script Haakon Meland Eriksen 2015-11-22 10:50:17 +01:00
• b5a5a91b13 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-22 01:56:25 +01:00
• 4c84a2ce61 update datetimepicker and fix it for finish date Mario Vavti 2015-11-22 00:13:33 +01:00
• 18e0e4b597 do not hide scrollbars Mario Vavti 2015-11-21 23:51:50 +01:00
• 74b574d0b1 datetimepicker should also respect first day of week setting Mario Vavti 2015-11-21 23:49:29 +01:00
• 9ba1b8d720 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-21 17:18:44 +01:00
• d726c921eb make calendar week start (sun or mon) configurable Mario Vavti 2015-11-21 15:33:57 +01:00
• bd45bb3ad3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-21 12:17:38 +01:00