redmatrix
baa7020036
revert shutdown function
2016-05-09 22:28:54 -07:00
redmatrix
f658a3cae1
more work on diaspora relay
2016-05-09 20:17:59 -07:00
redmatrix
a674b05e96
register shutdown procedure
2016-05-09 19:13:27 -07:00
redmatrix
b7e7ef0bf3
Merge pull request #372 from anaqreon/plugin-repo
...
Manage addon git repositories via the admin plugins page
2016-05-10 12:12:20 +10:00
Andrew Manning
0b8a7f1bd0
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-09 22:00:21 -04:00
Andrew Manning
9c8cf7d433
Fixed some bugs with empty repo name and improved the interface a bit.
2016-05-09 21:59:27 -04:00
Andrew Manning
180731c162
copy-paste error
2016-05-09 21:17:47 -04:00
redmatrix
ea1173f8f6
Merge pull request #371 from Treer/permissions
...
minor cleanup. No functional changes
2016-05-10 06:13:05 +10:00
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10:00
Mario Vavti
61909d2480
if we do not have a layout $layout should be empty not default
2016-05-09 12:24:48 +02:00
Mario Vavti
7aeff7505b
remove unused code and whitespace
2016-05-09 12:09:04 +02:00
Mario Vavti
a3e94591bc
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 11:58:10 +02:00
Mario Vavti
24c1dc528d
make editwebpage use status_editor() and fix storing of layout on webpage creation
2016-05-09 11:56:42 +02:00
redmatrix
6f486a3393
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
2016-05-09 01:12:24 -07:00
Mario Vavti
c8f686b8a5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 09:26:38 +02:00
redmatrix
94accd8a4c
remove the old IE html5 hack.
2016-05-08 20:25:10 -07:00
redmatrix
b6e0d8dee0
clean up some cruft
2016-05-08 20:19:23 -07:00
redmatrix
2a14c71128
convert media embed functions that deal with rewriting specific corporate services to addon hooks
2016-05-08 19:12:52 -07:00
Andrew Manning
d714cd76dd
Addon repo is copied to /extend/addon/ when admin presses install. Addon repos can be removed via GUI.
2016-05-08 20:30:00 -04:00
redmatrix
5ac262bd61
Merge pull request #370 from Treer/permissions
...
ACL dialogs: Make the non-ACL-option description more accurate
2016-05-09 06:53:31 +10:00
Andrew Manning
174484a51c
Custom addon repo name option added.
2016-05-08 09:26:06 -04:00
Treer
09ef30feb0
Update some modules to use new ACL dialog feature
2016-05-08 21:27:52 +10:00
Treer
e7a65c1f8d
improve non-ACL option description in ACL dialog
2016-05-08 20:44:30 +10:00
Andrew Manning
f73a74967e
Existing addon repos are listed on plugin page with controls for updating, removing, and switching branches.
2016-05-07 22:12:12 -04:00
Andrew Manning
bbbae3f42d
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-07 18:39:34 -04:00
Andrew Manning
0746794e81
New plugin repo cloned using new GitRepo class. Readme and info displayed in wide modal dialog.
2016-05-07 18:39:19 -04:00
redmatrix
2b77c9a74b
SDAV is already absolute
2016-05-07 14:23:38 -07:00
Mario Vavti
75128e8f68
make editblock use status_editor()
2016-05-07 23:05:48 +02:00
Andrew Manning
284d86ad76
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-07 16:22:35 -04:00
Andrew Manning
852ff39856
Progress implementing GitRepo class in Zotlabs/Storage
2016-05-07 16:21:52 -04:00
git-marijus
7f974a543f
Merge pull request #369 from Treer/fontawesome
...
update two Font Awesome icons
2016-05-06 21:43:59 +02:00
Andrew Manning
6950100ff4
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo
2016-05-06 13:42:22 -04:00
Treer
e9e2159b3b
update 2 fontawesome icons
2016-05-06 23:37:12 +10:00
Mario Vavti
b08fc746d8
use section-content-info-wrapper class for info text
2016-05-06 10:55:11 +02:00
Mario Vavti
4a36834d3f
use darker background colour only for searchbar
2016-05-06 10:42:38 +02:00
redmatrix
5882714e23
missed one other place where we called comanche outside the page build
2016-05-06 00:43:37 -07:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -07:00
redmatrix
712b2b1bb2
comments
2016-05-05 22:02:46 -07:00
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
redmatrix
f38c8e5eca
Merge pull request #368 from Treer/permissions
...
Unify permissions dialog for network posts, channel posts, and remote posts
2016-05-06 08:54:55 +10: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
8ffdc4859b
replace app tagcloud with more traditional categories widget. One can always change this in the PDL
2016-05-05 00:45:38 -07: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
9eac9ef2b9
isolate all the tagadelic core code into a class and reuse it
2016-05-04 19:39:39 -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
