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

• b1ae4d776c fixed tpl Andrew Manning 2016-05-01 21:25:15 -04:00
• 95b9669213 Create form on admin/plugins page to add plugin git repo using PHPGit Andrew Manning 2016-05-01 21:20:49 -04:00
• b4bf71dd06 fix mime-type icons in /cloud Mario Vavti 2016-05-01 16:34:55 +02:00
• b35e69273d tweak dl bbcode in expanded autocomplete a bit more Mario Vavti 2016-05-01 16:17:34 +02:00
• 4560298b98 Merge pull request #363 from Treer/bbcode git-marijus 2016-05-01 15:50:11 +02:00
• d892a47ac9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-05-01 15:45:57 +02:00
• fa80a5c113 make weblink and attach button hideable and some minor fixes Mario Vavti 2016-05-01 15:45:42 +02:00
• 7fac859fbd css fix Mario Vavti 2016-05-01 12:16:42 +02:00
• 02d8363019 tweak dl bbcode in expanded autocomplete Treer 2016-05-01 16:03:36 +10:00
• 84d93cca6e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-30 15:02:45 -07:00
• 9446d0cbb4 Merge pull request #362 from Treer/fontawesome redmatrix 2016-05-01 08:02:03 +10:00
• 8a41e2a011 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-04-30 23:38:40 +02:00
• 36fe2ac87e css fix Mario Vavti 2016-04-30 23:38:25 +02:00
• 3fe8fc0aa8 update icon names in library Treer 2016-05-01 06:48:18 +10:00
• 3d9fcee075 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev jeroenpraat 2016-04-30 22:30:37 +02:00
• 917bcb55fd Small fix of Dutch strings jeroenpraat 2016-04-30 22:29:59 +02:00
• 026787fc73 whitespace Mario Vavti 2016-04-30 22:26:45 +02:00
• d43c7603bf more work on layout editors Mario Vavti 2016-04-30 22:21:00 +02:00
• 17dba9542a update icon names in view/ Treer 2016-05-01 05:59:02 +10:00
• c96b20c559 make mod editlayout use status_editor() Mario Vavti 2016-04-30 21:56:52 +02:00
• 8189a7c693 add dl bbcode to the expanded autocomplete Mario Vavti 2016-04-30 21:19:43 +02:00
• 2f74f9eb40 update icon names in view/js Treer 2016-05-01 04:51:01 +10:00
• ab17b2e0d6 minor cleanup Mario Vavti 2016-04-30 20:47:52 +02:00
• 8f16e9ad33 update icon names in include/ Treer 2016-05-01 04:39:57 +10:00
• 7d380570df update icon names in Zotlabs/ Treer 2016-05-01 04:13:30 +10:00
• 80c9a8b8f6 Merge pull request #361 from Treer/bbcode git-marijus 2016-04-30 19:24:43 +02:00
• 8544819be1 Update NL+ES-ES jeroenpraat 2016-04-30 14:13:16 +02:00
• 45654ffc5c update font-awesome library to 4.6.1 Perhaps this should be done as a submodule instead? Treer 2016-04-30 21:36:19 +10:00
• 45512e6aba Merge branch 'master' into dev redmatrix 2016-04-29 23:50:05 -07:00
• d7a64845fe version+strings redmatrix 2016-04-29 23:48:36 -07:00
• 4c47d22f4b trim engr_units string slight improvement to avoid subtle bugs redmatrix 2016-04-29 23:47:13 -07:00
• 931a4fafe3 get rid of the unused ispublic variable Mario Vavti 2016-04-29 21:38:36 +02:00
• 83a0e82d5c css fix Mario Vavti 2016-04-29 20:01:54 +02:00
• e7fbf1b017 clean up some doc/ formatting Treer 2016-04-30 02:42:28 +10:00
• b5b21ecad7 improve whitespace control around definition list ([dl]) bbcode Treer 2016-04-30 02:03:38 +10:00
• 9d079e5d2b Add definition lists to bbcode Treer 2016-04-28 23:48:50 +10:00
• 18f505608b Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp git-marijus 2016-04-29 14:32:50 +02:00
• b797528b78 some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit Mario Vavti 2016-04-29 13:18:42 +02:00
• d8aa0ac36c Merge branch 'dev' into dev_sasiflo_contexthelp sasiflo 2016-04-29 11:40:38 +02:00
• 49b957f7ea Added german translation to context help. sasiflo 2016-04-29 11:39:00 +02:00
• e01b90c4c6 css fixes Mario Vavti 2016-04-29 10:26:41 +02:00
• 1fdac57d61 jot: cleanup unused variables Mario Vavti 2016-04-29 09:58:44 +02:00
• 0788d37c60 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-04-29 08:37:51 +02:00
• 776b7074ea Merge remote-tracking branch 'upstream/master' into dev zottel 2016-04-29 08:34:14 +02:00
• bb96f44861 allow engineering units (e.g. 400M, 1G) as service class limits redmatrix 2016-04-28 21:02:27 -07:00
• 30a6ae3daa This setting isn't implemented so remove the UI until it is. redmatrix 2016-04-28 20:17:05 -07:00
• 37a852d2d1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-28 18:29:37 -07:00
• 59777333dd Merge branch 'master' into dev redmatrix 2016-04-28 18:29:27 -07:00
• eb85f8572f revup redmatrix 2016-04-28 18:27:58 -07:00
• b664af748e provide help button in context help popup Mario Vavti 2016-04-28 13:08:41 +02:00
• f108838ca9 css fix Mario Vavti 2016-04-28 11:42:37 +02:00
• 2ddd03f597 provide a Hook method to unregister all hooks with a given filespec component. This will be useful in upgrading plugins to use new interfaces, as you won't have to individually unregister hook declarations that you are no longer using in the code. redmatrix 2016-04-27 22:44:06 -07:00
• bdef71bda0 provide courtesy function for syncing one item. We'll probably be doing this a lot. redmatrix 2016-04-27 21:26:52 -07:00
• d4eb5e7c6d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-27 13:27:19 -07:00
• 8e8df26066 Use / for album name in photo activities if no album present. redmatrix 2016-04-27 13:25:58 -07:00
• c91e43af34 Merge pull request #359 from anaqreon/help-content redmatrix 2016-04-28 06:18:11 +10:00
• b13c21f872 Added context help content Andrew Manning 2016-04-27 06:23:05 -04:00
• f975d9dfe4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content Andrew Manning 2016-04-27 05:56:19 -04:00
• a6baa5a6da some refinements on jot Mario Vavti 2016-04-27 11:36:02 +02:00
• 26131ffc91 Merge branch 'master' into dev redmatrix 2016-04-27 00:53:05 -07:00
• aeda293bd0 revup redmatrix 2016-04-27 00:52:00 -07:00
• a67fa2651d implement the singleton delivery stuff redmatrix 2016-04-26 17:38:44 -07:00
• 509f25e46a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-26 16:14:10 -07:00
• f99daf8ff9 move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery redmatrix 2016-04-26 16:12:31 -07:00
• 607125e795 only padding-top needs adjustment Mario Vavti 2016-04-26 16:15:29 +02:00
• f34dcffbd9 hopefully fix jot dropdown visibility issue Mario Vavti 2016-04-26 13:45:39 +02:00
• ce50a429fa Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-04-26 11:41:23 +02:00
• 3446e68ac2 move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete Mario Vavti 2016-04-26 11:41:08 +02:00
• e508ad37c1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-26 01:07:52 -07:00
• f55d9e8c62 Merge branch 'master' into dev redmatrix 2016-04-26 01:07:40 -07:00
• 563e82feff revup redmatrix 2016-04-26 01:06:25 -07:00
• 5553df862a fix top padding for narrow navbar Mario Vavti 2016-04-26 09:49:54 +02:00
• 2e7028c976 some cleanup on the mysqli driver redmatrix 2016-04-25 22:03:02 -07:00
• 78e4b64c8b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-25 20:14:07 -07:00
• d62f490814 Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date Revert "remove global db variable" redmatrix 2016-04-25 20:12:36 -07:00
• 6bf7716518 Revert "Revert "revert inline-block for blockquote"" redmatrix 2016-04-25 20:11:36 -07:00
• ae02624793 Revert "revert inline-block for blockquote" redmatrix 2016-04-25 20:10:16 -07:00
• c3b0c0f32a remove global db variable redmatrix 2016-04-25 16:55:33 -07:00
• 6aef5593d5 Merge pull request #356 from Treer/CUI redmatrix 2016-04-26 06:19:41 +10:00
• 975140634c +es-es strings update jeroenpraat 2016-04-25 15:15:24 +02:00
• f336f38ad5 improve error message in config and pconfig Treer 2016-04-25 22:09:15 +10:00
• f027bf81cd Merge remote-tracking branch 'upstream/dev' into help-content Andrew Manning 2016-04-25 06:17:39 -04:00
• d67d8b6d6e util/pconfig can list channel IDs Treer 2016-04-25 19:46:04 +10:00
• 02ee7f17e8 add commandline help to util/pconfig Treer 2016-04-25 19:30:37 +10:00
• 78320ee3a6 add commandline help to util/config Treer 2016-04-25 19:00:10 +10:00
• a9d926886e make it more obvious what is behind the dropdowns Mario Vavti 2016-04-25 10:00:50 +02:00
• 6291c08e01 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-25 00:10:13 -07:00
• 4b9c3cc998 Merge branch 'master' into dev redmatrix 2016-04-25 00:09:55 -07:00
• fdf7120aec revup redmatrix 2016-04-25 00:08:42 -07:00
• e5e68d7350 Merge pull request #355 from Treer/document_tweaks redmatrix 2016-04-25 08:10:21 +10:00
• d914290002 merged duplicate entry in docs Treer 2016-04-25 03:17:48 +10:00
• 42ee3ab21c add default_photo_profile to docs Treer 2016-04-25 03:09:52 +10:00
• 15cfd6fda7 revert inline-block for blockquote Mario Vavti 2016-04-24 12:45:38 +02:00
• 0e34811886 add some missing hook entries to the doco redmatrix 2016-04-23 22:55:45 -07:00
• 5b3f536613 updated doco to document how to use hook callbacks which are object methods redmatrix 2016-04-23 17:47:00 -07:00
• ce45a1cf94 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-23 16:57:32 -07:00
• 79c63e3cf4 this should work to call a hook for a string class method redmatrix 2016-04-23 16:56:41 -07:00
• df2990b27e Class method support for hooks redmatrix 2016-04-23 15:16:54 -07:00
• 9d698c0887 fix context help position with narrow navbar Mario Vavti 2016-04-23 23:52:39 +02:00
• 1e27038b73 update jquery.textcomplete to version 1.3.4 and add minified version Mario Vavti 2016-04-23 21:42:10 +02:00