Andrew Manning
3011d3768c
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-05 21:49:24 -04:00
redmatrix
5508feb6ce
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-05 18:19:20 -07:00
redmatrix
2e3da0cbbb
- Setup: check php version (5.4 required)
...
- Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings
and supports the following forms:
[if $config.system.foo]
[widget=widget1][/widget]
[else]
[widget=widget2][/widget]
[/if]
[if $config.system.foo]
[widget=widget1][/widget]
[/if]
2016-05-05 18:15:07 -07:00
Treer
2174cdcd0e
Unify permissions dialog for network posts, channel posts, and remote posts
...
* changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button.
* hyperlinks the "cannot be changed" part of the warning to the help file
* adds some more content to the help file
2016-05-06 01:44:46 +10:00
Andrew Manning
6ce939491b
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-05 05:35:00 -04:00
redmatrix
9b19a51fc6
Allow follow to work with a pasted webbie from the profile page (where we've replaced the '@' sign with a UTF-8 look-alike)
2016-05-04 20:24:47 -07:00
redmatrix
566667a263
provide a tag cloud for app categories and allow filtering apps from this
2016-05-04 18:27:46 -07:00
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
Mario Vavti
9fe33bb67d
whitespace
2016-05-04 11:53:38 +02:00
Mario Vavti
0db8d3f6c6
whitespace
2016-05-04 11:49:29 +02: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
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
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
559ed3f0a8
sort out the rest of the source categories
2016-05-02 01:18:18 -07:00
redmatrix
a10fe5f13e
a couple of bugfixes from earlier checkins and implementation of source tags
2016-05-01 22:45:38 -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
fa80a5c113
make weblink and attach button hideable and some minor fixes
2016-05-01 15:45:42 +02: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
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
Mario Vavti
c96b20c559
make mod editlayout use status_editor()
2016-04-30 21:56:52 +02:00
Mario Vavti
ab17b2e0d6
minor cleanup
2016-04-30 20:47:52 +02:00
Treer
7d380570df
update icon names in Zotlabs/
2016-05-01 04:13:30 +10:00
Mario Vavti
931a4fafe3
get rid of the unused ispublic variable
2016-04-29 21:38:36 +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
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
Mario Vavti
a6baa5a6da
some refinements on jot
2016-04-27 11:36:02 +02:00
Mario Vavti
a9d926886e
make it more obvious what is behind the dropdowns
2016-04-25 10:00:50 +02:00
redmatrix
a3ce194bf5
Some issues discovered with linkinfo module, and update the doco about using object modules in addons; as there were a couple of surprises.
2016-04-21 22:16:57 -07:00
redmatrix
5a427dcee3
No idea how long RSD (Really Simple Discovery) has been broken. I had no idea it was even here.
2016-04-21 20:14:55 -07:00
git-marijus
391ed8655e
Merge pull request #351 from anaqreon/toggle-context-help
...
Toggle context help
2016-04-21 18:44:50 +02:00
Andrew Manning
82de68c3d3
Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored.
2016-04-21 06:41:55 -04:00
redmatrix
2b0a04ea9e
revert the reversal of checkjs logic, but still restrict the behaviour scope to just those urls that require it
2016-04-20 22:10:00 -07:00
redmatrix
dff9e18c1e
We no longer require the diaspora_meta service locally.
2016-04-20 19:54:26 -07:00
Andrew Manning
b96eb1c823
Merge branch 'dev' into toggle-context-help
2016-04-20 21:05:01 -04:00
