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 |
|
Mario Vavti
|
d1efb59fcd
|
render code bbcode inline if there are no linebreaks in the text.
|
2016-05-30 16:12:48 +02: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
|
00d32f6b94
|
Only show wiki delete control if channel owner
|
2016-05-29 20:39:19 -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
|
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
|
97e6b7c4ba
|
Wiki deletion works
|
2016-05-27 20:20:33 -04:00 |
|
Andrew Manning
|
d554681174
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-27 06:35:15 -04:00 |
|
redmatrix
|
096fdfc61b
|
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
|
2016-05-26 16:33:01 -07: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 |
|
redmatrix
|
66b6f8c0ff
|
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
|
2016-05-25 17:30:15 -07:00 |
|
Mario Vavti
|
9908a7193a
|
remove the add others button for now - after some research it turned out not beeing so useful
|
2016-05-25 14:31:58 +02:00 |
|
redmatrix
|
80f2ba640e
|
code cleanup
|
2016-05-24 20:49:23 -07:00 |
|
Andrew Manning
|
e00b8a7082
|
Delete wiki (in progress)
|
2016-05-24 06:15:42 -04:00 |
|
jeroenpraat
|
b4e5d303b5
|
Update NL + ES_ES
|
2016-05-22 23:17:06 +02:00 |
|
Andrew Manning
|
a36bef7979
|
List of wikis populates with links according to observer permissions.
|
2016-05-21 21:55:09 -04:00 |
|
Andrew Manning
|
049147a9d7
|
Successful new wiki git repo and item table record
|
2016-05-21 19:02:23 -04:00 |
|
Andrew Manning
|
5f2baa59f5
|
Forgot some templates
|
2016-05-21 15:07:27 -04:00 |
|
Andrew Manning
|
c6aa42773a
|
Trying to fix wiki branch starting fresh from dev
|
2016-05-21 14:56:42 -04:00 |
|
phellmes
|
ef9b42aeb3
|
Update DE translation strings
|
2016-05-21 16:20:19 +02:00 |
|
Mario Vavti
|
9480e9b68b
|
possible fix for #385
|
2016-05-21 14:34:01 +02:00 |
|
Mario Vavti
|
c7cad6ab60
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-19 23:35:48 +02:00 |
|
Mario Vavti
|
0f5eb65210
|
provide an acl select option for only me
|
2016-05-19 23:35:19 +02:00 |
|
Andrew Manning
|
d5ca889cf5
|
Replace text strings for translation support
|
2016-05-19 07:09:13 -04:00 |
|
Andrew Manning
|
b55e2776cc
|
Improved plugin repo management UI in admin/plugins
|
2016-05-19 07:03:42 -04:00 |
|
hubzilla
|
de1527eba8
|
Merge pull request #388 from phellmes/de20160516
Update DE translation strings
|
2016-05-17 10:29:53 +10:00 |
|
jeroenpraat
|
9f77180af8
|
Dutch and Spanish Spanish strings, and some schema-bits
|
2016-05-16 16:43:14 +02:00 |
|
phellmes
|
0bd4939695
|
Update DE translations strings
|
2016-05-16 15:11:53 +02:00 |
|
Andrew Manning
|
0baab50191
|
Enable options for chat notifications, with optional audio. Notify for member entering room and incoming messages.
|
2016-05-13 21:47:37 -04:00 |
|
Mario Vavti
|
1e00fa79b3
|
change wording restricted -> custom selection and add a label to the select
|
2016-05-13 17:38:50 +02:00 |
|
Mario Vavti
|
573dea42d0
|
instead of radio buttons use select to choose between public and restricted acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible.
|
2016-05-13 16:22:43 +02:00 |
|
Andrew Manning
|
913d07a4a7
|
Merge remote-tracking branch 'upstream/dev' into chat-notify
|
2016-05-11 20:08:54 -04:00 |
|
Andrew Manning
|
b40d8070f3
|
Browser notification issued when member enters chat room
|
2016-05-11 20:02:19 -04:00 |
|
redmatrix
|
1fb21b781f
|
Merge pull request #376 from anaqreon/plugin-repo
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-12 08:57:22 +10:00 |
|
Mario Vavti
|
25df2080ea
|
more whitespace
|
2016-05-11 22:31:05 +02:00 |
|
Mario Vavti
|
5632022d79
|
whitespace
|
2016-05-11 22:23:13 +02: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 |
|
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 |
|
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 |
|
Mario Vavti
|
7aeff7505b
|
remove unused code and whitespace
|
2016-05-09 12:09:04 +02:00 |
|
redmatrix
|
94accd8a4c
|
remove the old IE html5 hack.
|
2016-05-08 20:25:10 -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 |
|
Andrew Manning
|
174484a51c
|
Custom addon repo name option added.
|
2016-05-08 09:26:06 -04: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
|
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 |
|
Andrew Manning
|
284d86ad76
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-07 16:22:35 -04: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 |
|
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
|
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 |
|
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 |
|
Mario Vavti
|
5553df862a
|
fix top padding for narrow navbar
|
2016-04-26 09:49:54 +02:00 |
|
jeroenpraat
|
975140634c
|
+es-es strings update
|
2016-04-25 15:15:24 +02:00 |
|
Mario Vavti
|
a9d926886e
|
make it more obvious what is behind the dropdowns
|
2016-04-25 10:00:50 +02:00 |
|
Mario Vavti
|
15cfd6fda7
|
revert inline-block for blockquote
|
2016-04-24 12:45:38 +02:00 |
|
Mario Vavti
|
9d698c0887
|
fix context help position with narrow navbar
|
2016-04-23 23:52:39 +02:00 |
|
Mario Vavti
|
1e27038b73
|
update jquery.textcomplete to version 1.3.4 and add minified version
|
2016-04-23 21:42:10 +02:00 |
|
Mario Vavti
|
78bf4564f2
|
make the link to /help in dropdown conditional to the use of context help
|
2016-04-23 17:22:39 +02:00 |
|
Mario Vavti
|
57110cbe76
|
pull-right is not needed here
|
2016-04-23 16:52:02 +02:00 |
|
Mario Vavti
|
b0a2e5d3f7
|
simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
|
2016-04-23 16:39:56 +02:00 |
|
Mario Vavti
|
0463df62f0
|
only display help button in collapsed panel if context help is enabled
|
2016-04-23 13:21:25 +02:00 |
|
redmatrix
|
a8823ae7d8
|
Merge branch 'master' into dev
|
2016-04-23 00:06:30 -07:00 |
|
phellmes
|
61e695e143
|
Update DE translation strings
|
2016-04-22 20:00:14 +02:00 |
|
Mario Vavti
|
d66f6c8e8c
|
make it icon-question-sign for contextual and icon-question for normal help instead of adding a caret-down
|
2016-04-22 09:16:17 +02: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 |
|
Mario Vavti
|
cb8c83a42b
|
remove obsolete class
|
2016-04-21 23:56:53 +02:00 |
|
Mario Vavti
|
bd11b1d61a
|
indicate if we will be displayed contextual help or default help
|
2016-04-21 23:55:38 +02:00 |
|
Mario Vavti
|
96d19c09f3
|
fix help button for collapsed state
|
2016-04-21 23:19:17 +02:00 |
|
Mario Vavti
|
d7f4bfedd5
|
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
|
2016-04-21 23:03:09 +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 |
|
Andrew Manning
|
b96eb1c823
|
Merge branch 'dev' into toggle-context-help
|
2016-04-20 21:05:01 -04:00 |
|
redmatrix
|
635580091a
|
Merge branch 'master' into dev
|
2016-04-20 17:43:20 -07:00 |
|
Mario Vavti
|
59799ba2b4
|
some crossbrowser rendering work on the comment box
|
2016-04-20 21:59:29 +02:00 |
|
Mario Vavti
|
8147e6203f
|
Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners (e.g. chat).
|
2016-04-20 14:13:09 +02:00 |
|
Andrew Manning
|
7594796ee1
|
Try toggling context help using onclick attribute
|
2016-04-19 05:52:16 -04:00 |
|
redmatrix
|
2a4e8972e0
|
module updates
|
2016-04-18 20:38:38 -07:00 |
|
redmatrix
|
a9f68e4d2a
|
Merge branch 'master' into dev
|
2016-04-18 01:02:44 -07:00 |
|
jeroenpraat
|
7229cd56ed
|
Making sure the great new context help works with all thmes and schema's (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things.
|
2016-04-18 01:57:54 +02:00 |
|
jeroenpraat
|
c8dec1fae5
|
Spanish and Dutch strings update
|
2016-04-17 19:27:40 +02:00 |
|
Andrew Manning
|
d7fe48d1b6
|
New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing.
|
2016-04-17 07:09:42 -04:00 |
|
Mario Vavti
|
2cb04ccb8f
|
nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup
|
2016-04-15 12:39:22 +02:00 |
|
Mario Vavti
|
ce34c4086d
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-04-15 09:53:34 +02:00 |
|
Mario Vavti
|
fe9df64fc2
|
fix some slight crossbrowser rendering issues with jot
|
2016-04-15 09:52:40 +02:00 |
|
Paolo Tacconi
|
45a854762b
|
Resolved conflict in view/it/hstrings.php
|
2016-04-15 09:20:58 +02:00 |
|
Paolo Tacconi
|
1806da0851
|
Updated Italian strings
|
2016-04-15 09:09:59 +02:00 |
|
redmatrix
|
9a0b61e4af
|
refactor the js detection into a checkjs class which is only enabled on demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page.
|
2016-04-13 16:31:06 -07:00 |
|
redmatrix
|
91cc365143
|
reverse the logic of the jsenabled setting so that sessions without js are performance penalised instead of regular sessions.
|
2016-04-12 22:55:26 -07:00 |
|