Andrew Manning
8d284bab47
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
2016-05-30 20:59:54 -04:00
Andrew Manning
82ec40dd80
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-30 15:00:50 -04:00
Andrew Manning
a52cdcb241
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
2016-05-30 14:59:33 -04:00
redmatrix
f2ebe41a50
undefined function
2016-05-29 20:18:28 -07:00
Andrew Manning
8f0c3f0e9b
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-29 21:45:54 -04:00
redmatrix
3b2679db29
fix remote_channel(), update php minversion requirement
2016-05-29 18:38:24 -07:00
Andrew Manning
4b350b9090
Fixed bug in access control. Hide new wiki/page buttons if not channel owner.
2016-05-29 21:23:56 -04:00
Andrew Manning
a3dfdd9d38
Remove Parsedown library files and remove references.
2016-05-29 20:44:28 -04:00
Andrew Manning
00d32f6b94
Only show wiki delete control if channel owner
2016-05-29 20:39:19 -04:00
Andrew Manning
fad27fc1e7
Hide page controls when not owner. Fixed some serious access control issues.
2016-05-29 20:16:17 -04:00
Andrew Manning
3e6af5c876
Hacked Parsedown and Markdown to add class inline-code to <code> blocks for proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
2016-05-29 17:06:45 -04:00
Andrew Manning
df7772e301
Home page create with new wiki. URL redirects here when no page given. Fixed bug with author in wiki item table record.
2016-05-29 13:33:52 -04:00
Andrew Manning
63a97ff6fc
Git commit made for the page edits when the page is saved.
2016-05-29 10:18:26 -04:00
Andrew Manning
ab54bf5149
Wiki pages can be saved.
2016-05-28 15:11:19 -04:00
Andrew Manning
819683a073
Show page content by default. Hide page controls where appropriate. Fix sandbox text format.
2016-05-28 14:11:36 -04:00
Andrew Manning
7393dccde8
Page content is loaded from the file on disk
2016-05-28 12:33:07 -04:00
Andrew Manning
ae94e8a855
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
2016-05-28 07:42:18 -04:00
Andrew Manning
f884fa6678
Wiki page list is fetched and the page widget is updated
2016-05-28 07:17:42 -04:00
Andrew Manning
4691c3ec01
Add new page to wiki and redirect to editor page.
2016-05-27 22:19:05 -04:00
Andrew Manning
ca78ebce6d
Check if wiki exists and redirect if it does not
2016-05-27 20:37:37 -04:00
Andrew Manning
d554681174
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-27 06:35:15 -04:00
redmatrix
551cf8ee94
link to hubchart site for site detail on pubsites page
2016-05-26 19:40:16 -07:00
Mario Vavti
24360fd191
check if $addonDir is a dir to silence warning if it does not exist
2016-05-26 14:33:10 +02:00
Mario Vavti
9017dcd0fd
typo
2016-05-26 14:23:17 +02:00
hubzilla
2a9c1db0c9
Merge pull request #402 from git-marijus/dev
...
another try on #385 - replace sabres restrictive CSP with what we do in boot.php
2016-05-26 14:25:48 +10:00
redmatrix
2f64684299
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
2016-05-25 20:06:21 -07:00
Mario Vavti
929d33fb22
another try on #385 - replace sabres restrictive CSP with what we do in boot.php
2016-05-25 14:18:41 +02:00
redmatrix
516c43ba15
more work associated with DBA and index.php shuffle
2016-05-24 17:54:45 -07:00
redmatrix
84ba6393ad
relocate index and db
2016-05-24 16:36:55 -07:00
Andrew Manning
e00b8a7082
Delete wiki (in progress)
2016-05-24 06:15:42 -04:00
redmatrix
29ba891809
moved enotify
2016-05-24 01:25:13 -07:00
redmatrix
80b422bdbe
typo
2016-05-23 13:49:54 -07:00
redmatrix
a1aa3d9061
Can't use "use x as y" aliases in callback function declarations
2016-05-22 22:08:01 -07:00
redmatrix
1aa3051e97
move chatroom stuff to zlib
2016-05-22 20:54:52 -07:00
redmatrix
2d06663490
move apps to zlib
2016-05-22 19:25:27 -07:00
redmatrix
5e0698ba87
turn the oft-repeated block_public ... check into a function observer_prohibited()
2016-05-22 17:52:30 -07:00
redmatrix
de006771c7
renamed include files identity.php (channel.php) and Contact.php (connections.php)
2016-05-22 16:54:30 -07:00
Andrew Manning
a36bef7979
List of wikis populates with links according to observer permissions.
2016-05-21 21:55:09 -04:00
redmatrix
2fdd148598
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-21 18:21:35 -07:00
redmatrix
1cb311cef9
finish updating zot_finger instances
2016-05-21 18:18:33 -07:00
redmatrix
ed56b6e67b
first cut at zot-finger request signatures
2016-05-21 18:02:14 -07:00
Andrew Manning
049147a9d7
Successful new wiki git repo and item table record
2016-05-21 19:02:23 -04:00
Andrew Manning
c6aa42773a
Trying to fix wiki branch starting fresh from dev
2016-05-21 14:56:42 -04:00
Andrew Manning
7a526fa8a9
Temp repo folder error message correction
2016-05-21 12:58:05 -04:00
Andrew Manning
598baa1b32
Moved git repository storage to store/[data]/git to avoid collision with a channel named git. Fixed bug where temp repo folder was never created.
2016-05-21 12:55:17 -04:00
Mario Vavti
4979a45120
revert fix for #385
2016-05-21 15:14:33 +02:00
Mario Vavti
b66bacff9f
possible better fix for #385
2016-05-21 14:52:07 +02:00
redmatrix
d8ace38041
rework the conversation object stuff at a high level - still needs a bit of refactoring
2016-05-20 22:52:47 -07:00
redmatrix
bc20cf9fa3
remove redundant include
2016-05-20 22:16:57 -07:00
redmatrix
019250eff8
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
2016-05-20 22:13:20 -07:00
redmatrix
a2cec8899a
daemon conversion continued...
2016-05-19 22:26:37 -07:00
Andrew Manning
d5ca889cf5
Replace text strings for translation support
2016-05-19 07:09:13 -04:00
redmatrix
50d1d06b03
issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes
2016-05-19 00:56:51 -07:00
redmatrix
93a7df5a1b
one more text clarification
2016-05-18 22:57:23 -07:00
redmatrix
905432c7ae
text clarifications
2016-05-18 22:53:43 -07:00
Andrew Manning
77eb9bcfa0
Link new plugins when updating repos via admin/plugins
2016-05-18 21:32:23 -04:00
redmatrix
166d63ff60
missing close tag
2016-05-18 16:31:12 -07:00
redmatrix
d38851023e
provide server role on pubsites page
2016-05-18 16:28:51 -07:00
Andrew Manning
70d413ab04
Create store/git/sys/extend/addon directory and link if it does not exist in all plugin repo GUI POST actions
2016-05-12 06:49:24 -04:00
Andrew Manning
d968fc51ea
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-11 05:54:20 -04:00
Andrew Manning
c7698e4dc3
Check if target directories are writable when adding, updating, or removing plugin repos
2016-05-11 05:53:23 -04:00
redmatrix
4dd3839c41
provide repository versions on admin summary page and an upgrade message if you're behind master
2016-05-10 21:46:04 -07:00
redmatrix
9caaa9397e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-10 19:42:37 -07:00
redmatrix
915bd2ec77
sabre upgrade
2016-05-10 19:40:15 -07:00
Andrew Manning
40e3d37a72
Remove debugging lines
2016-05-10 21:01:47 -04:00
Andrew Manning
2882eef42f
Link plugins in the newly installed addon repo to /addon so they are accessible
2016-05-10 21:00:10 -04:00
redmatrix
0b02a6d123
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
2016-05-10 17:26:44 -07:00
Andrew Manning
78b40e6363
Delete existing repo if the new one has a different URL. Fixed bug that could cause repeated installation.
2016-05-10 06:28:00 -04:00
Mario Vavti
45c19e365d
another public -> pubstream
2016-05-10 10:40:36 +02:00
redmatrix
2469853175
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-10 01:31:15 -07:00
redmatrix
0c5434d5e3
try again with shutdown handler, fix issue #373 (live-pubstream div wasn't present
2016-05-10 01:30:22 -07:00
Mario Vavti
8ab7707898
allow delayed publishing of webpages
2016-05-10 10:02:27 +02:00
redmatrix
baa7020036
revert shutdown function
2016-05-09 22:28:54 -07: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
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10: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
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
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
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
6950100ff4
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo
2016-05-06 13:42:22 -04:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -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
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
redmatrix
9040ee53e4
missing class instance pointer in Pconfig module upgrade
2016-04-19 19:09:35 -07:00
redmatrix
974390d5d2
remove test files which were committed by accident
2016-04-19 19:02:48 -07:00
Andrew Manning
7594796ee1
Try toggling context help using onclick attribute
2016-04-19 05:52:16 -04:00
redmatrix
f53478f142
a bit more namespace wrangling
2016-04-18 20:47:11 -07:00
redmatrix
2a4e8972e0
module updates
2016-04-18 20:38:38 -07:00
redmatrix
1698732cff
convert all the _well_known service controllers which are a bit touchy when it comes to the router
2016-04-18 01:35:09 -07:00
redmatrix
966773cdbb
pull in the new object router and a few selected samples for the new controller layout
2016-04-17 19:55:36 -07:00
redmatrix
0865d0ef51
Convert Channel to new module
2016-04-15 22:36:07 -07:00
