Commit graph

16658 commits

Author SHA1 Message Date
redmatrix
bd2f11ed8b db schema change to add tags to content sources 2016-05-01 21:00:02 -07:00
redmatrix
5e458491f1 sort addons based on the internal display name instead of the filename 2016-05-01 20:43:57 -07:00
Andrew Manning
4ed5d6573c Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-01 22:31:02 -04:00
Andrew Manning
c2d15e6c3b New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis 2016-05-01 22:29:51 -04:00
redmatrix
f284558007 use only the std_version 2016-05-01 19:29:30 -07:00
redmatrix
23bb4e8e15 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-05-01 19:20:09 -07:00
redmatrix
cd518625bf some much needed work on oembed security 2016-05-01 19:19:17 -07:00
Andrew Manning
b1ae4d776c fixed tpl 2016-05-01 21:25:15 -04:00
Andrew Manning
95b9669213 Create form on admin/plugins page to add plugin git repo using PHPGit 2016-05-01 21:20:49 -04:00
Mario Vavti
b4bf71dd06 fix mime-type icons in /cloud 2016-05-01 16:34:55 +02:00
Mario Vavti
b35e69273d tweak dl bbcode in expanded autocomplete a bit more 2016-05-01 16:17:34 +02:00
git-marijus
4560298b98 Merge pull request #363 from Treer/bbcode
tweak dl bbcode in expanded autocomplete
2016-05-01 15:50:11 +02:00
Mario Vavti
d892a47ac9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-05-01 15:45:57 +02:00
Mario Vavti
fa80a5c113 make weblink and attach button hideable and some minor fixes 2016-05-01 15:45:42 +02:00
Mario Vavti
7fac859fbd css fix 2016-05-01 12:16:42 +02:00
Treer
02d8363019 tweak dl bbcode in expanded autocomplete 2016-05-01 16:03:36 +10:00
redmatrix
84d93cca6e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-30 15:02:45 -07:00
redmatrix
9446d0cbb4 Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
2016-05-01 08:02:03 +10:00
Mario Vavti
8a41e2a011 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-04-30 23:38:40 +02:00
Mario Vavti
36fe2ac87e css fix 2016-04-30 23:38:25 +02:00
Treer
3fe8fc0aa8 update icon names in library 2016-05-01 06:48:18 +10:00
jeroenpraat
3d9fcee075 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-04-30 22:30:37 +02:00
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
redmatrix
bb96f44861 allow engineering units (e.g. 400M, 1G) as service class limits 2016-04-28 21:02:27 -07:00