harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,777 Commits 6 Branches 36 Tags
f8949ed5d1f277a3246fecf04d3ee4619ba10b51
Commit Graph

5268 Commits

Author SHA1 Message Date
Andrew Manning
8cb06e7af8 Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-04 21:26:52 -04:00
redmatrix
1b6bc5394b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-05-04 17:36:13 -07:00
redmatrix
50fb525b28 add categories to apps (wip) 2016-05-04 17:35:27 -07:00
Treer
e1e56936c9 add help to some permissions dialogs 2016-05-05 02:09:47 +10:00
Treer
33a8d845c1 Refine permissions dialog UI 2016-05-04 23:55:32 +10:00
redmatrix
1685548a4c ensure that important system fields are passed through the appman editor 2016-05-03 21:59:26 -07:00
redmatrix
191298ec93 more background work for app management - give every member a copy of all the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again. 2016-05-03 20:37:05 -07:00
Andrew Manning
e4a2aacd1d Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-03 21:50:34 -04:00
Andrew Manning
5686ee13b4 Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md and render on plugins page. 2016-05-03 21:49:52 -04:00
git-marijus
7fe697d896 Merge pull request #365 from Treer/fontawesome 
another font-awesome icon
 2016-05-03 20:51:16 +02:00
Treer
0bdcaff00f another font-awesome icon 2016-05-04 00:32:08 +10:00
Andrew Manning
2db86b950e Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-03 06:33:11 -04:00
Andrew Manning
9619d02be9 AJAX and spinner for add repo form submission. Repo info will be displayed below the form. 2016-05-03 06:30:46 -04:00
redmatrix
b371c028ad more security stuff 2016-05-02 22:28:27 -07:00
redmatrix
a10fe5f13e a couple of bugfixes from earlier checkins and implementation of source tags 2016-05-01 22:45:38 -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
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
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
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
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
Treer
17dba9542a update icon names in view/ 2016-05-01 05:59:02 +10: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
Treer
8f16e9ad33 update icon names in include/ 2016-05-01 04:39:57 +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
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
9d079e5d2b Add definition lists to bbcode 2016-04-30 01:13:34 +10: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
Mario Vavti
e01b90c4c6 css fixes 2016-04-29 10:26:41 +02:00
redmatrix
30a6ae3daa This setting isn't implemented so remove the UI until it is. 2016-04-28 20:17:05 -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
Mario Vavti
a6baa5a6da some refinements on jot 2016-04-27 11:36:02 +02:00
Mario Vavti
607125e795 only padding-top needs adjustment 2016-04-26 16:15:29 +02:00
Mario Vavti
f34dcffbd9 hopefully fix jot dropdown visibility issue 2016-04-26 13:45:39 +02:00
Mario Vavti
3446e68ac2 move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete 2016-04-26 11:41:08 +02:00