Mario Vavti
|
4ede3fd771
|
multi acl: port photos
|
2016-08-04 09:10:21 +02:00 |
|
Mario Vavti
|
3783c1af3e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-04 08:10:13 +02:00 |
|
redmatrix
|
92862f93f3
|
issue #474
|
2016-08-03 21:42:41 -07:00 |
|
Mario Vavti
|
908e15bc90
|
multi acl: port events
|
2016-08-03 23:57:41 +02:00 |
|
Mario Vavti
|
b959641ca8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-08-03 21:17:08 +02:00 |
|
Mario Vavti
|
c50bfa07ca
|
multiple acl work
|
2016-08-03 21:16:57 +02:00 |
|
redmatrix
|
3d0c90cbc5
|
allow individual permissions on atokens
|
2016-07-31 23:17:07 -07:00 |
|
Andrew Manning
|
1e3a645abe
|
Remove scanned element column for existing element information which we are not yet populating.
|
2016-07-31 07:37:33 -04:00 |
|
Andrew Manning
|
7c47557554
|
Improved UI. Removed logger statements.
|
2016-07-31 07:30:25 -04:00 |
|
Andrew Manning
|
32366284a8
|
Import element selection page added to allow selective importing.
|
2016-07-30 09:56:47 -04:00 |
|
Andrew Manning
|
f17f51a9c1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-30 06:30:46 -04:00 |
|
Mario Vavti
|
5e5ec5a66a
|
catch all input fields (in preparation for acl in this place) and display the files to upload in the right order
|
2016-07-29 11:30:33 +02:00 |
|
Andrew Manning
|
8925e0c6c9
|
Fixed bug where multiple post attachements by drag-and-drop were not being added to the post content.
|
2016-07-28 19:21:33 -04:00 |
|
Mario Vavti
|
fc105cf141
|
reusing the original form did not work so well via xhr upload - let us create a new form for this action. revert progressbar- only works nice in firefox
|
2016-07-28 15:35:45 +02:00 |
|
Mario Vavti
|
f808f1601b
|
rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism
|
2016-07-27 16:49:55 +02:00 |
|
Mario Vavti
|
560af7a5b8
|
allow multiple-file cloud upload
|
2016-07-26 13:17:46 +02:00 |
|
Mario Vavti
|
da512cef64
|
revert multiple test
|
2016-07-25 11:43:01 +02:00 |
|
Mario Vavti
|
f41b037fbe
|
css fixes
|
2016-07-25 11:41:27 +02:00 |
|
redmatrix
|
0f5f1c98ca
|
revert cloud acl selector (branched so as to continue development)
|
2016-07-25 01:46:40 -07:00 |
|
redmatrix
|
271f85be3b
|
add acl selection to files upload via /cloud (still missing from directory creation)
|
2016-07-24 20:27:59 -07:00 |
|
redmatrix
|
9967f2ab28
|
call wall_attach rather than wall_upload for drag/drop; which means you can drag/drop any file and not just photos.
|
2016-07-24 16:09:33 -07:00 |
|
Andrew Manning
|
1b1170bcf6
|
Drag and drop one image file at a time into the post editor will upload it.
|
2016-07-24 17:33:34 -04:00 |
|
Andrew Manning
|
6998bb1f23
|
Multiple file upload by drag and drop with progress indicators and auto page reload
|
2016-07-24 07:41:53 -04:00 |
|
Andrew Manning
|
3a60bef2b6
|
Include credentials for session cookie in xhr
|
2016-07-23 08:39:23 -04:00 |
|
Andrew Manning
|
eb1eb38c01
|
AJAX single upload might be working, but permissions problems seem to cause failure.
|
2016-07-23 07:59:28 -04:00 |
|
Andrew Manning
|
3c5598407e
|
Drag and drop file information display in cloud files upload form. No actual upload implemented yet.
|
2016-07-22 21:27:32 -04:00 |
|
Andrew Manning
|
e0d9d30bcf
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-20 05:39:08 -04:00 |
|
Andrew Manning
|
0c7ad924a8
|
Starting to make the import selection page after element scan.
|
2016-07-20 05:33:40 -04:00 |
|
Andrew Manning
|
75fb065526
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-17 11:54:36 -04:00 |
|
Mario Vavti
|
2b674d4cd9
|
hide fullscreen button in embedphotos modal album view
|
2016-07-17 12:54:10 +02:00 |
|
redmatrix
|
5d0ddb3123
|
booboo
|
2016-07-17 02:49:41 -07:00 |
|
Mario Vavti
|
f39d20ac97
|
some work on guest access token ui
|
2016-07-17 11:29:37 +02:00 |
|
Andrew Manning
|
99354ac576
|
Merge remote-tracking branch 'upstream/dev' into website-import-remote
|
2016-07-16 21:04:04 -04:00 |
|
Andrew Manning
|
e7b8531751
|
Stash changes to merge from dev
|
2016-07-16 21:02:13 -04:00 |
|
Andrew Manning
|
ff2f599142
|
Postpone remote folder import until filesystem mirroring matures.
|
2016-07-16 19:25:44 -04:00 |
|
redmatrix
|
f3aff45042
|
provide examples for using access tokens in urls
|
2016-07-15 16:31:21 -07:00 |
|
Mario Vavti
|
4a2fb8336e
|
round up height
|
2016-07-15 14:23:10 +02:00 |
|
Mario Vavti
|
34a16e0ab9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-15 13:21:07 +02:00 |
|
Mario Vavti
|
2e32b5f467
|
upgrade to jquery-3.1 and minor fixes
|
2016-07-15 13:20:00 +02:00 |
|
redmatrix
|
d54f5a3831
|
more cleanup of atoken UI
|
2016-07-15 01:43:09 -07:00 |
|
redmatrix
|
5e475acb85
|
cleanup and debug of atoken feature
|
2016-07-15 01:33:28 -07:00 |
|
redmatrix
|
7ee7f00bf3
|
Here's the basic UI for the Zot Access Tokens, requires some minor cleanup
|
2016-07-14 22:41:53 -07:00 |
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -04:00 |
|
Andrew Manning
|
1e4ef81244
|
Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2
|
2016-07-12 21:41:37 -04:00 |
|
Mario Vavti
|
d5afd0d7c2
|
do not use visibility for fullscreen button and move fullscreen button to the right
|
2016-07-11 12:49:53 +02:00 |
|
Andrew Manning
|
c5e534c0cb
|
Clearer import control interface
|
2016-07-10 07:21:52 -04:00 |
|
Andrew Manning
|
a338a97d5b
|
First draft of website import tools
|
2016-07-10 06:58:20 -04:00 |
|
Andrew Manning
|
47d7fc70e8
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-09 20:17:20 -04:00 |
|
redmatrix
|
233cfc29d6
|
hide the redeliver option one level down since it should rarely be needed by folks outside of shared hosting.
|
2016-07-07 17:23:52 -07:00 |
|
Treer
|
5c062aaec4
|
force immediate avatar update
|
2016-07-03 22:38:05 +10:00 |
|
Andrew Manning
|
0630609d6e
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-01 06:36:25 -04:00 |
|
Andrew Manning
|
205924ff29
|
JavaScript popup for page delete confirmation
|
2016-07-01 06:35:49 -04:00 |
|
Mario Vavti
|
7371e08625
|
ditch the change_view widget and make header fixed in fullscreen mode
|
2016-07-01 12:21:19 +02:00 |
|
Andrew Manning
|
0fd8eeec23
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-30 21:51:33 -04:00 |
|
Andrew Manning
|
7124c0aee5
|
Replace homemade table of content generator with existing jQuery plugin. Now toc is linked to document headings.
|
2016-06-30 21:50:38 -04:00 |
|
redmatrix
|
bfe84a9ff7
|
templatise the Dreport page and add a redeliver option for when things stuff up badly.
|
2016-06-29 22:46:47 -07:00 |
|
redmatrix
|
df4ff26845
|
only request geolocation permission if we're creating a post.
|
2016-06-29 17:53:59 -07:00 |
|
Mario Vavti
|
7b2d54dffa
|
fix month view in fullscreen mode
|
2016-06-28 13:44:32 +02:00 |
|
redmatrix
|
b155e93ab1
|
add letsencrypt x3 intermediate cert and new cert file, improve UX of new registrations
|
2016-06-27 19:04:00 -07:00 |
|
hubzilla
|
8c4481733f
|
Merge pull request #438 from anaqreon/wiki
Wiki post generation option and image embed tool
|
2016-06-26 08:25:31 +10:00 |
|
Andrew Manning
|
0df3978cc5
|
A page name wrapped in double brackets is converted into a link to another page in the current wiki
|
2016-06-25 14:29:52 -05:00 |
|
Treer
|
bd4a88cd3e
|
fix help link
|
2016-06-26 03:17:10 +10:00 |
|
Andrew Manning
|
241b257556
|
Insert image links wherever cursor is in the editor
|
2016-06-25 06:50:24 -05:00 |
|
Andrew Manning
|
83a42afddf
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-25 06:30:15 -05:00 |
|
Andrew Manning
|
780f83a118
|
Post generation about new wiki is optional, default is NOT to post. Fixed bug in wiki creation. Added embed image dialog and album browser.
|
2016-06-25 06:27:14 -05:00 |
|
Ben Roberts
|
812dc9e898
|
add url permalink mf2 markup
|
2016-06-24 00:45:39 -04:00 |
|
Ben Roberts
|
5162c55e5d
|
p-author missing from embedded h-card in items
|
2016-06-23 23:46:02 -04:00 |
|
redmatrix
|
096619dbbe
|
make dropdown-caret invoke the dropdown
|
2016-06-23 20:13:20 -07:00 |
|
redmatrix
|
2a32713dfc
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-23 01:18:17 -07:00 |
|
redmatrix
|
acf26d5c63
|
code cleanup for profile_photos
|
2016-06-23 01:17:44 -07:00 |
|
Ben Roberts
|
ab628eb2a3
|
microformats 2 for posts
|
2016-06-22 23:59:27 -04:00 |
|
redmatrix
|
ec8091a102
|
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
|
2016-06-22 18:00:18 -07:00 |
|
redmatrix
|
2a840460dd
|
vcard spec changes
|
2016-06-21 19:25:14 -07:00 |
|
Andrew Manning
|
8cd9a1e4fc
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-20 13:07:29 -04:00 |
|
Andrew Manning
|
20b4fc9198
|
Do not change active page commit until user reverts the page
|
2016-06-20 13:05:18 -04:00 |
|
redmatrix
|
2e7606f569
|
the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
|
2016-06-17 21:44:08 -07:00 |
|
Andrew Manning
|
80d3a831f3
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-17 06:36:09 -04:00 |
|
Andrew Manning
|
961539258b
|
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
|
2016-06-17 06:33:39 -04:00 |
|
Mario Vavti
|
aa5ac9dc3f
|
only use height: auto for week and day view
|
2016-06-17 11:57:36 +02:00 |
|
Andrew Manning
|
688171d016
|
Rename page feature added. Fixed bug in git commit function and other minor fixes.
|
2016-06-15 06:25:31 -04:00 |
|
Andrew Manning
|
71d4f65cb2
|
Move javascript functions back to jot-header.tpl
|
2016-06-12 20:10:37 -04:00 |
|
Andrew Manning
|
b5933e9d44
|
Photo embed button with album browser works in new post editor.
|
2016-06-12 19:41:37 -04:00 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
Andrew Manning
|
e86e666c22
|
Javascript only allows saving a page if the content has changed.
|
2016-06-07 20:58:14 -04:00 |
|
Andrew Manning
|
cf180f6142
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-07 20:43:49 -04:00 |
|
redmatrix
|
037cd74e8e
|
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
|
2016-06-06 19:44:22 -07:00 |
|
Andrew Manning
|
2af8105b46
|
Hide page history viewer when viewing sandbox
|
2016-06-05 21:14:30 -04:00 |
|
Andrew Manning
|
b8b50bdb5a
|
Custom commit message available. Improved history viewer and feedback from revert buttons.
|
2016-06-05 20:30:45 -04:00 |
|
Andrew Manning
|
0a3fbdd128
|
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
|
2016-06-05 16:32:03 -04:00 |
|
Andrew Manning
|
4bc4fd5b7e
|
Page deletion implemented. Hide the delete button and disallow for Home page.
|
2016-06-04 18:00:32 -04:00 |
|
Andrew Manning
|
344c293424
|
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
|
2016-06-04 15:12:04 -04:00 |
|
Andrew Manning
|
c08f428b5e
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-04 05:45:53 -04:00 |
|
redmatrix
|
a7e5e3d574
|
allow any (current) emoji to be displayed on any site, and provide a default list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
|
2016-06-03 18:13:21 -07:00 |
|
redmatrix
|
e81ac9e063
|
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
|
2016-06-03 16:04:54 -07:00 |
|
Mario Vavti
|
29a0a11b7e
|
some theming for emoji button
|
2016-06-03 11:03:01 +02:00 |
|
redmatrix
|
f8949ed5d1
|
restrict emoji reactions to the top level for now.
|
2016-06-02 22:12:56 -07:00 |
|
redmatrix
|
7ae376b6cd
|
menu entries for basic emoji support. I could use a bit of help theming this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions.
|
2016-06-02 22:06:19 -07:00 |
|
Andrew Manning
|
b93e398674
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-02 22:32:50 -04:00 |
|
Andrew Manning
|
b70c680964
|
Major corrections to access control and page construction.
|
2016-06-02 22:27:26 -04:00 |
|
redmatrix
|
b1259876bf
|
more db column renames
|
2016-05-31 21:45:33 -07:00 |
|
redmatrix
|
dfb6255f59
|
more removal of reserved words from DB schemas
|
2016-05-31 17:50:47 -07:00 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
36fe2ac87e
|
css fix
|
2016-04-30 23:38:25 +02:00 |
|
Treer
|
17dba9542a
|
update icon names in view/
|
2016-05-01 05:59:02 +10:00 |
|
Treer
|
8f16e9ad33
|
update icon names in include/
|
2016-05-01 04:39:57 +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
|
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
|
a6baa5a6da
|
some refinements on jot
|
2016-04-27 11:36:02 +02:00 |
|
Mario Vavti
|
f34dcffbd9
|
hopefully fix jot dropdown visibility issue
|
2016-04-26 13:45:39 +02:00 |
|
Mario Vavti
|
a9d926886e
|
make it more obvious what is behind the dropdowns
|
2016-04-25 10:00:50 +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 |
|
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
|
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 |
|