Commit Graph

24488 Commits

Author SHA1 Message Date
jeroenpraat 917bcb55fd Small fix of Dutch strings 2016-04-30 22:29:59 +02:00
Mario Vavti 026787fc73 whitespace 2016-04-30 22:26:45 +02:00
Mario Vavti d43c7603bf more work on layout editors 2016-04-30 22:21:00 +02:00
Treer 17dba9542a update icon names in view/ 2016-05-01 05:59:02 +10:00
Mario Vavti c96b20c559 make mod editlayout use status_editor() 2016-04-30 21:56:52 +02:00
Mario Vavti 8189a7c693 add dl bbcode to the expanded autocomplete 2016-04-30 21:19:43 +02:00
Treer 2f74f9eb40 update icon names in view/js 2016-05-01 04:51:01 +10:00
Mario Vavti ab17b2e0d6 minor cleanup 2016-04-30 20:47:52 +02:00
Treer 8f16e9ad33 update icon names in include/ 2016-05-01 04:39:57 +10:00
Treer 7d380570df update icon names in Zotlabs/ 2016-05-01 04:13:30 +10:00
git-marijus 80c9a8b8f6 Merge pull request #361 from Treer/bbcode
Add definition lists to bbcode
2016-04-30 19:24:43 +02:00
jeroenpraat 8544819be1 Update NL+ES-ES 2016-04-30 14:13:16 +02:00
Treer 45654ffc5c update font-awesome library to 4.6.1
Perhaps this should be done as a submodule instead?
2016-04-30 21:36:19 +10:00
redmatrix 45512e6aba Merge branch 'master' into dev 2016-04-29 23:50:05 -07:00
redmatrix d7a64845fe version+strings 2016-04-29 23:48:36 -07:00
redmatrix 4c47d22f4b trim engr_units string slight improvement to avoid subtle bugs 2016-04-29 23:47:13 -07:00
Mario Vavti 931a4fafe3 get rid of the unused ispublic variable 2016-04-29 21:38:36 +02:00
Mario Vavti 83a0e82d5c css fix 2016-04-29 20:01:54 +02:00
Treer e7fbf1b017 clean up some doc/ formatting 2016-04-30 02:42:28 +10:00
Treer b5b21ecad7 improve whitespace control around definition list ([dl]) bbcode 2016-04-30 02:03:38 +10:00
Treer 9d079e5d2b Add definition lists to bbcode 2016-04-30 01:13:34 +10:00
git-marijus 18f505608b Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp
context help: added german translation
2016-04-29 14:32:50 +02:00
Mario Vavti b797528b78 some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit 2016-04-29 13:18:42 +02:00
sasiflo d8aa0ac36c Merge branch 'dev' into dev_sasiflo_contexthelp 2016-04-29 11:40:38 +02:00
sasiflo 49b957f7ea Added german translation to context help. 2016-04-29 11:39:00 +02:00
Mario Vavti e01b90c4c6 css fixes 2016-04-29 10:26:41 +02:00
Mario Vavti 1fdac57d61 jot: cleanup unused variables 2016-04-29 09:58:44 +02:00
zottel 0788d37c60 Merge remote-tracking branch 'upstream/dev' into dev 2016-04-29 08:37:51 +02:00
zottel 776b7074ea Merge remote-tracking branch 'upstream/master' into dev 2016-04-29 08:34:14 +02:00
redmatrix bb96f44861 allow engineering units (e.g. 400M, 1G) as service class limits 2016-04-28 21:02:27 -07:00
redmatrix 30a6ae3daa This setting isn't implemented so remove the UI until it is. 2016-04-28 20:17:05 -07:00
redmatrix 37a852d2d1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-28 18:29:37 -07:00
redmatrix 59777333dd Merge branch 'master' into dev 2016-04-28 18:29:27 -07:00
redmatrix eb85f8572f revup 2016-04-28 18:27:58 -07:00
Mario Vavti b664af748e provide help button in context help popup 2016-04-28 13:08:41 +02:00
Mario Vavti f108838ca9 css fix 2016-04-28 11:42:37 +02:00
redmatrix 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. 2016-04-27 22:44:06 -07:00
redmatrix bdef71bda0 provide courtesy function for syncing one item. We'll probably be doing this a lot. 2016-04-27 21:26:52 -07:00
redmatrix d4eb5e7c6d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-27 13:27:19 -07:00
redmatrix 8e8df26066 Use / for album name in photo activities if no album present. 2016-04-27 13:25:58 -07:00
redmatrix c91e43af34 Merge pull request #359 from anaqreon/help-content
Help content
2016-04-28 06:18:11 +10:00
Andrew Manning b13c21f872 Added context help content 2016-04-27 06:23:05 -04:00
Andrew Manning f975d9dfe4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content 2016-04-27 05:56:19 -04:00
Mario Vavti a6baa5a6da some refinements on jot 2016-04-27 11:36:02 +02:00
redmatrix 26131ffc91 Merge branch 'master' into dev 2016-04-27 00:53:05 -07:00
redmatrix aeda293bd0 revup 2016-04-27 00:52:00 -07:00
redmatrix a67fa2651d implement the singleton delivery stuff 2016-04-26 17:38:44 -07:00
redmatrix 509f25e46a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-26 16:14:10 -07:00
redmatrix 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 2016-04-26 16:12:31 -07:00
Mario Vavti 607125e795 only padding-top needs adjustment 2016-04-26 16:15:29 +02:00