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

• 1c6faa3a00 Added Link to TOS to EMail templates targeting members Tobias Luther 2016-03-06 18:45:43 +01:00
• b7f15ccac1 Update of readme according to the last changes einervonvielen 2016-03-06 18:40:49 +01:00
• 1fb7b9baae Doco: corrected git URL in git for non-developers www-data 2016-03-06 18:34:50 +01:00
• a1e4940bea Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-06 18:33:28 +01:00
• 287ffe93f6 Merge branch 'master' of https://github.com/redmatrix/hubzilla root 2016-03-06 17:24:15 +01:00
• 2407379623 Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://github.com/einervonvielen/hubzilla root 2016-03-06 17:19:33 +01:00
• 7162403292 Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more jeroenpraat 2016-03-06 17:02:58 +01:00
• 004468f231 Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it's not clear that you can click on it to show something (the channel in this case). jeroenpraat 2016-03-06 16:21:26 +01:00
• 2d7e307e74 Updated Norwegian strings for Hubzilla Haakon Meland Eriksen 2016-03-05 14:11:56 +01:00
• d7466ade46 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-05 10:01:42 +01:00
• 01c0e5c46c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-04 23:42:30 +01:00
• 86f840843f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-04 14:38:47 -08:00
• 9a0f0181a5 issues #306 and #307 redmatrix 2016-03-04 14:38:14 -08:00
• 25ebac8d0b show cover-photo upload link only for the default profile Mario Vavti 2016-03-04 16:07:41 +01:00
• edf6da7189 add cover photo upload link to edit profile Mario Vavti 2016-03-04 15:44:33 +01:00
• 059da4d017 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-04 06:05:47 +01:00
• a59d1b22f6 Update the CHANGELOG for V1.3 redmatrix 2016-03-03 18:55:10 -08:00
• dd4a66353a Merge https://github.com/redmatrix/hubzilla into pending_merge 1.3 redmatrix 2016-03-03 14:49:34 -08:00
• 2cf54c465d remove the markdown feature. Do not re-enable unless you are willing to support it. redmatrix 2016-03-03 14:47:39 -08:00
• d3491c9165 fix jot form Mario Vavti 2016-03-03 13:46:08 +01:00
• 8ca877bdd3 slide up cover on click Mario Vavti 2016-03-03 12:31:49 +01:00
• b704f977da Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-03 12:08:21 +01:00
• 59e04aed1b move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template. Mario Vavti 2016-03-03 12:07:58 +01:00
• 436e91a1e1 rename the menu entry and page to 'Profile Fields' to maintain consistency redmatrix 2016-03-02 16:39:34 -08:00
• 6f4c45a489 UI cleanup for admin profile field management page redmatrix 2016-03-02 15:36:14 -08:00
• 157bbb14b5 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-02 11:35:48 -08:00
• 5c22f59c4f issue #305 redmatrix 2016-03-02 11:32:32 -08:00
• aa62bad07b little nl string fix Jeroen van Riet Paap 2016-03-02 15:33:18 +01:00
• d3f2d2a2db small fix to simple cover-photo Mario Vavti 2016-03-02 14:30:33 +01:00
• c5d08fd5fd add a fade in effect to main while scrolling up cover photo Mario Vavti 2016-03-02 13:33:18 +01:00
• 22729da2a2 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-02 12:31:46 +01:00
• c97cc1487c a simple cover-photo implementation for redbasic default template Mario Vavti 2016-03-02 12:31:25 +01:00
• 428b4dbad6 sort out the with and howlong dependencies redmatrix 2016-03-01 22:47:07 -08:00
• 264abef817 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-02 06:06:39 +01:00
• 548bf884a4 profile field admin page (functional only: still needs a lot of HTML/CSS cleanup) redmatrix 2016-03-01 21:06:27 -08:00
• a0baa480e3 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-01 15:01:48 -08:00
• 765dd5569b Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page. redmatrix 2016-03-01 14:55:04 -08:00
• c19a1a6b82 revup redmatrix 2016-03-01 14:13:38 -08:00
• 8b61e546fe Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2016-03-01 22:09:06 +01:00
• 7206e8af3a Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels) jeroenpraat 2016-03-01 22:08:50 +01:00
• 7808689198 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-01 20:40:33 +01:00
• 966d1586c0 fix js error and add id to field input block Mario Vavti 2016-03-01 20:40:11 +01:00
• edffd9f183 Merge pull request #304 from phormanns/master redmatrix 2016-03-02 06:22:46 +11:00
• 7edc505c2f fix typo in postgres schema Peter Hormanns 2016-03-01 17:54:52 +01:00
• 4df78b06cf fix padding Mario Vavti 2016-03-01 15:11:15 +01:00
• 492609d20b do not show empty buttons if not logged in Mario Vavti 2016-03-01 14:41:14 +01:00
• 0f76af261c another resize issue Mario Vavti 2016-03-01 14:11:42 +01:00
• 9d00db06b2 fix resize issue Mario Vavti 2016-03-01 14:03:34 +01:00
• 141f3e21b2 move preview content outside of editor space Mario Vavti 2016-03-01 13:40:19 +01:00
• fe6cbb414c adjust padding Mario Vavti 2016-03-01 13:32:18 +01:00
• e13d65eea3 set line-height to initial Mario Vavti 2016-03-01 13:29:59 +01:00
• 4d6050f8e5 another css fix Mario Vavti 2016-03-01 13:22:19 +01:00
• 0ebce75c7d css fixes to make jot look better with background colors or images Mario Vavti 2016-03-01 13:09:04 +01:00
• 91bb4bdf50 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-29 19:34:23 -08:00
• be2b7c0b5f abconfig redmatrix 2016-02-29 19:31:52 -08:00
• 2d45f9f385 provide footer bbcode Mario Vavti 2016-02-29 23:58:32 +01:00
• 44b2503572 revup redmatrix 2016-02-29 13:42:30 -08:00
• 3f90da5643 remove unused variable Mario Vavti 2016-02-29 22:07:14 +01:00
• d27a627c4f simplify profile edit button(s) and make it useful for multiple profiles Mario Vavti 2016-02-29 22:01:13 +01:00
• 55ab5360d9 update es-es. tested it and it works now. Don't know what happened earlier. jeroenpraat 2016-02-29 19:36:53 +01:00
• bfeeb76143 fix deletion of files from filesystem Mario Vavti 2016-02-29 15:37:34 +01:00
• f2d3be2e67 do not process update activity if there is no item to update and simplify code a little Mario Vavti 2016-02-29 14:22:35 +01:00
• 60b818eb24 revert es-es update. something went wrong. later today I will examine what. jeroenpraat 2016-02-29 09:07:29 +01:00
• ebe70a41b9 build_sync_packet - no need to sleep after the last sync delivery. redmatrix 2016-02-28 18:26:08 -08:00
• da79662081 stop the PHP warnings from Thomas's buggered sitekey redmatrix 2016-02-28 16:33:52 -08:00
• 72f3f7c172 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-28 15:07:00 -08:00
• 713a796d9f revup redmatrix 2016-02-28 15:06:42 -08:00
• 69c6d8b617 update es-es strings jeroenpraat 2016-02-28 17:33:22 +01:00
• e084a85e79 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-28 09:10:39 +01:00
• a1f046992d I haven't investigated 'why', but the addition of the router class in 1db3409f36 resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented. redmatrix 2016-02-27 17:27:46 -08:00
• cd5630476f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-27 16:29:13 -08:00
• f7f20c5917 z_fetch_url and z_post_url returning false redmatrix 2016-02-27 16:27:37 -08:00
• 44797fe988 Merge pull request #302 from phellmes/de20160227 redmatrix 2016-02-28 09:57:04 +11:00
• c5333b5187 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-27 21:40:00 +01:00
• 2d045a12bf Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-02-27 16:52:11 +01:00
• a2fe22412f missing include Mario Vavti 2016-02-27 16:51:54 +01:00
• df69465357 update NL strings jeroenpraat 2016-02-27 15:56:45 +01:00
• e4361cb202 Update DE translation strings phellmes 2016-02-27 14:28:06 +01:00
• 58cf9d832c make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment. Mario Vavti 2016-02-27 12:31:07 +01:00
• cf5383fdbe Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-27 11:24:02 +01:00
• 6126070a1d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-26 12:49:02 -08:00
• 459166116d turn timezone aware birthdays into a feature for those who want an uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone. redmatrix 2016-02-26 12:45:44 -08:00
• 776bc51172 fix link to photo album and make sure that small photos are not overwritten by body text. Mario Vavti 2016-02-26 15:21:14 +01:00
• df57c90d2d several photo item template fixes Mario Vavti 2016-02-26 14:25:18 +01:00
• 5a563b8e76 some improvement for file activity Mario Vavti 2016-02-26 11:17:21 +01:00
• 0653a2e0a9 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-02-26 09:21:01 +01:00
• d19dfc87a6 get rid of duplicate function Mario Vavti 2016-02-26 09:20:44 +01:00
• dc8c7a2d2e small improvements to profile like activity redmatrix 2016-02-25 16:21:38 -08:00
• ba2ede0a8f this reverts ea54987ca4 redmatrix 2016-02-25 15:41:52 -08:00
• 6892ba4cd8 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-25 15:14:57 -08:00
• 5ad9b48f1d revert f62ec4132e - allow one self to be added to a privacy group. Mario Vavti 2016-02-25 23:59:57 +01:00
• 7972de13ca backtrace openssl_verify errors so that we can find bad keys - as there is very little relevant context available at this level. redmatrix 2016-02-25 14:34:30 -08:00
• ea54987ca4 in update_birthdays() we should probably set adjust to 0 instead of 1 since a birthday is more a kind of a global holiday Mario Vavti 2016-02-25 23:03:38 +01:00
• b2474334a7 provide an edit button for the profile page Mario Vavti 2016-02-25 22:50:16 +01:00
• 2a0d4a2011 Merge pull request #299 from git-marijus/master redmatrix 2016-02-26 06:27:42 +11:00
• be27fb5644 we have got a button for events in the nav. no need for it in the tabs if we are local. Mario Vavti 2016-02-25 13:40:15 +01:00
• ebfa1a12b9 when creating an event from a post in our stream, if the original post was private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions. redmatrix 2016-02-25 00:36:35 -08:00
• 21f2df399d Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-25 06:05:12 +01:00
• 43521bb10b Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-24 18:56:04 -08:00
• c95d7c69eb issue #216 - calendar sharing redmatrix 2016-02-24 18:54:52 -08:00