Mario Vavti
|
82e867a9a8
|
implement acl for folder creation
|
2016-08-10 16:17:09 +02:00 |
|
redmatrix
|
7a557d31e0
|
open editor or comment window when linkdropping to a closed window. We probably also need this for filedropping.
|
2016-08-10 01:35:58 -07:00 |
|
redmatrix
|
de12503fad
|
allow dropping links on comments as well as posts
|
2016-08-09 22:52:14 -07:00 |
|
redmatrix
|
12162f53b4
|
You can drag links to the editor (which will be parsed and inserted); as well as files (which will be uploaded)
|
2016-08-09 18:13:54 -07:00 |
|
redmatrix
|
3338f3c5b2
|
diaspora vcard updates
|
2016-08-07 20:16:14 -07:00 |
|
redmatrix
|
5243dd153b
|
use config system.server_role and deprecate 'UNO'
|
2016-08-07 17:29:35 -07:00 |
|
Mario Vavti
|
4f0b138692
|
bring back acl for cloud file uploads
|
2016-08-06 12:46:10 +02:00 |
|
Mario Vavti
|
531baa8fc4
|
Revert "Revert "remove some logging""
This reverts commit e67f5bc6bb .
|
2016-08-05 16:05:21 +02:00 |
|
Mario Vavti
|
e67f5bc6bb
|
Revert "remove some logging"
This reverts commit 316b090433 .
|
2016-08-05 15:19:17 +02:00 |
|
Mario Vavti
|
316b090433
|
remove some logging
|
2016-08-05 14:53:46 +02:00 |
|
Mario Vavti
|
b2298d44a4
|
multi acl: port /settings
|
2016-08-05 14:45:06 +02:00 |
|
Mario Vavti
|
e7e73e6fd1
|
multi acl: port /thing
|
2016-08-05 13:37:47 +02:00 |
|
Mario Vavti
|
bed0a5773f
|
multi acl: port /rpost
|
2016-08-05 13:20:03 +02:00 |
|
Mario Vavti
|
7e5428c697
|
multi acl: provide a acl-form-trigger class which comes handy in certain situations
|
2016-08-04 21:26:30 +02:00 |
|
Mario Vavti
|
036b72757c
|
multi acl: port /wiki
|
2016-08-04 12:09:06 +02:00 |
|
Mario Vavti
|
120e9a1e4c
|
multi acl: port /webpages and /mitem
|
2016-08-04 11:23:43 +02:00 |
|
Mario Vavti
|
b49cfb2efd
|
multi acl: port /chat
|
2016-08-04 10:46:50 +02:00 |
|
Mario Vavti
|
0340160ba7
|
multi acl: port /cloud and /filestorage
|
2016-08-04 10:36:45 +02:00 |
|
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
|
df27a48e72
|
multiple acl: store new data in update_view()
|
2016-08-03 22:50:37 +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 |
|
jeroenpraat
|
416adeb169
|
belongs to previous commit
|
2016-08-03 16:41:36 +02:00 |
|
jeroenpraat
|
61f591cc88
|
Improved a few schemas - context help fix - dark schemas now have dark text areas (et al.)
|
2016-08-03 16:33:12 +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 |
|
jeroenpraat
|
d858bd9265
|
Updating es-es strings
|
2016-07-29 14:31:53 +02: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
|
b15a53b672
|
missing space
|
2016-07-28 22:59:01 +02:00 |
|
Mario Vavti
|
ed7e4df014
|
missing semicolon
|
2016-07-28 22:57:07 +02:00 |
|
Mario Vavti
|
3bf2935ee3
|
add more info on what is happening after we are at 100% and minor fixes
|
2016-07-28 22:32:58 +02:00 |
|
Mario Vavti
|
500ee4c1bf
|
re-implement progress-bar to work with all browsers
|
2016-07-28 16:35:27 +02: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
|
e65949f594
|
make progressbar slightly more transparent and give it a default width of 3px to indicate which files are to be uploaded
|
2016-07-28 11:54:42 +02:00 |
|
Mario Vavti
|
b05c1a9829
|
use single quote for js and double quote for html with proper escapes and implement a simple progressbar
|
2016-07-28 11:45:57 +02:00 |
|
Mario Vavti
|
9fa3956aa8
|
translate mime types to icons, update some icons, move file preview (upload progress) below table header
|
2016-07-28 10:28:48 +02:00 |
|
redmatrix
|
02fc082e45
|
github didn't accept the last push. Touching the files to force a git revision
|
2016-07-27 22:40:33 -07:00 |
|
redmatrix
|
be1ffca6f4
|
fix italian strings (messed up by rtl variable); and finish removing openid from core
|
2016-07-27 22:28:30 -07:00 |
|
Andrew Manning
|
932aeebcf1
|
Enhanced visual feedback for file drag hover
|
2016-07-27 21:03:41 -04: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
|
7126fd4b31
|
fix drag and drop
|
2016-07-26 15:57:47 +02:00 |
|
Mario Vavti
|
560af7a5b8
|
allow multiple-file cloud upload
|
2016-07-26 13:17:46 +02:00 |
|
Wave
|
e38880a686
|
Merge pull request #462 from wave72/dev
Updated Italian strings
|
2016-07-26 09:51:54 +02:00 |
|
Wave72
|
29dd4ad39b
|
Updated Italian strings
|
2016-07-26 09:51:06 +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
|
01338a7610
|
make drag/drop work with acl, which bypassed the form
|
2016-07-24 22:58:26 -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 |
|
Mario Vavti
|
38e46fff54
|
upgrade readmore.js and improve collapsing a little
|
2016-07-22 14:03:14 +02:00 |
|
Andrew Manning
|
e0d9d30bcf
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-07-20 05:39:08 -04:00 |
|
Andrew Manning
|
99f7dd0fd4
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-20 05:38:19 -04:00 |
|
Andrew Manning
|
0c7ad924a8
|
Starting to make the import selection page after element scan.
|
2016-07-20 05:33:40 -04:00 |
|
redmatrix
|
c3617f5d1e
|
jquery update issue prevents comments from reloading and resetting watch cursor
|
2016-07-17 18:32:38 -07: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 |
|
Mario Vavti
|
f396b1bf73
|
check for variables after schema files have been added
|
2016-07-16 16:18:36 +02:00 |
|
Mario Vavti
|
e237dfc660
|
check for variables in schemes
|
2016-07-16 12:32:22 +02:00 |
|
Mario Vavti
|
641029ab18
|
hide/show mixup
|
2016-07-16 10:56:46 +02:00 |
|
Mario Vavti
|
065ef29de2
|
only use visibility for tabs
|
2016-07-16 10:52:06 +02:00 |
|
redmatrix
|
f3aff45042
|
provide examples for using access tokens in urls
|
2016-07-15 16:31:21 -07:00 |
|
Mario Vavti
|
9048f8cffe
|
bump minor version because of jquery update
|
2016-07-15 14:53:15 +02: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
|
c2779b6f33
|
add jquery migrate for version 3
|
2016-07-15 13:20:55 +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
|
0edf248cd1
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-14 22:25:30 -04:00 |
|
redmatrix
|
f60a0c5ce0
|
document mod_acl a bit better and try to remove some redundancies and consolidate the various options
|
2016-07-13 17:51:19 -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
|
50e581d88a
|
Set max-width for embedded images
|
2016-07-09 20:24:16 -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 |
|
Mario Vavti
|
0a11991340
|
use visibility instead of display to hide elements
|
2016-07-01 12:58:15 +02: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
|
feaad50b6c
|
Merge branch 'dev' into sabre32
|
2016-06-28 13:45:00 +02:00 |
|
Mario Vavti
|
7b2d54dffa
|
fix month view in fullscreen mode
|
2016-06-28 13:44:32 +02:00 |
|
Mario Vavti
|
e170217c33
|
erge branch 'dev' into sabre32
|
2016-06-28 11:57:03 +02:00 |
|
Mario Vavti
|
aff58934c0
|
update fullcalendar to version 2.8.0
|
2016-06-28 11:56:28 +02:00 |
|
Mario Vavti
|
9f576369a9
|
Merge branch 'dev' into sabre32
|
2016-06-28 11:09:22 +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 |
|
Mario Vavti
|
27ee95106d
|
Merge branch 'dev' into sabre32
|
2016-06-26 08:59:58 +02: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 |
|
Mario Vavti
|
c8ae04a96a
|
Merge branch 'dev' into sabre32
|
2016-06-24 11:25:20 +02: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 |
|
Mario Vavti
|
39b14b6b81
|
Merge branch 'dev' into sabre32
|
2016-06-23 10:14:13 +02: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 |
|
Mario Vavti
|
5536df51f5
|
erge branch 'dev' into sabre32
|
2016-06-22 09:58:55 +02:00 |
|
redmatrix
|
2a840460dd
|
vcard spec changes
|
2016-06-21 19:25:14 -07:00 |
|
Mario Vavti
|
ecae0b3d97
|
Merge branch 'dev' into sabre32
|
2016-06-21 10:08:49 +02:00 |
|
hubzilla
|
670d12219b
|
Merge pull request #429 from anaqreon/wiki
Wiki page revision comparison viewer
|
2016-06-21 06:23:58 +10:00 |
|
Mario Vavti
|
545219b839
|
Merge branch 'dev' into sabre32
|
2016-06-20 21:47:49 +02:00 |
|
Mario Vavti
|
985fb44424
|
Merge branch 'master' into dev
|
2016-06-20 21:46:33 +02: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 |
|
Mario Vavti
|
e40112b40d
|
Merge branch 'dev' into sabre32
|
2016-06-20 09:31:27 +02:00 |
|
redmatrix
|
905374c86e
|
experimental rtl support; this will probably require a fair bit of work.
|
2016-06-19 21:10:57 -07:00 |
|
Mario Vavti
|
7a4efcf67f
|
return something so we can make a conclusion
|
2016-06-19 20:34:38 +02:00 |
|
Mario Vavti
|
6e0eb532a5
|
Merge branch 'dev' into sabre32
|
2016-06-19 11:04:02 +02:00 |
|
redmatrix
|
4578649f75
|
hebrew hstrings.php was empty
|
2016-06-18 20:26:36 -07:00 |
|
redmatrix
|
b6324246ff
|
hebrew hstrings.php was empty
|
2016-06-18 20:25:31 -07:00 |
|
redmatrix
|
53e4713932
|
hebrew update
|
2016-06-18 20:09:52 -07:00 |
|
root
|
76e11b46b7
|
hebrew translation
|
2016-06-18 20:03:38 -07:00 |
|
Mario Vavti
|
178b440f05
|
Merge branch 'dev' into sabre32
|
2016-06-18 11:10:40 +02: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
|
9749bbcedc
|
Merge branch 'dev' into sabre32
|
2016-06-17 11:58:14 +02:00 |
|
Mario Vavti
|
aa5ac9dc3f
|
only use height: auto for week and day view
|
2016-06-17 11:57:36 +02:00 |
|
Mario Vavti
|
5b479d63d6
|
Merge branch 'dev' into sabre32
|
2016-06-16 12:22:32 +02:00 |
|
Mario Vavti
|
8924f94d05
|
show month view in full height in fullscreen view
|
2016-06-16 12:21:59 +02:00 |
|
Mario Vavti
|
a873b7b6e8
|
mrge branch 'dev' into sabre32
|
2016-06-16 11:37:16 +02:00 |
|
Mario Vavti
|
7baa20d559
|
fix scrollbars
|
2016-06-16 11:36:51 +02:00 |
|
Mario Vavti
|
28a7458e48
|
Merge branch 'dev' into sabre32
|
2016-06-16 10:26:47 +02:00 |
|
hubzilla
|
e0b705fd54
|
Merge pull request #422 from anaqreon/wiki
Wiki rename page feature added. Bug fixes related to git commits.
|
2016-06-16 13:01:49 +10:00 |
|
redmatrix
|
fa48de33c2
|
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
|
2016-06-15 19:44:15 -07:00 |
|
jeroenpraat
|
b0476be36f
|
All languages up to date as far as they are updated. Added Hebrew (I saw no RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)).
|
2016-06-15 17:26:44 +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 |
|
phellmes
|
a16dcc877c
|
Update DE translation strings
|
2016-06-15 12:12:18 +02:00 |
|
Mario Vavti
|
24569a18db
|
css fix
|
2016-06-14 23:21:26 +02:00 |
|
Mario Vavti
|
b6d425838f
|
css fixes
|
2016-06-13 17:19:49 +02:00 |
|
Mario Vavti
|
e963714ad6
|
Merge branch 'dev' into sabre32
|
2016-06-13 09:18:39 +02: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 |
|
Mario Vavti
|
ef95c68b4f
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:33:03 +02:00 |
|
Mario Vavti
|
0cada39c8a
|
css fixes
|
2016-06-11 20:31:37 +02:00 |
|
jeroenpraat
|
a1241daa41
|
es_ES and NL string for 1.8RC. Hopefully I'm doing it right.
|
2016-06-11 17:58:37 +02:00 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
Mario Vavti
|
9d5d3a9468
|
Merge branch 'dev' into sabre32
|
2016-06-10 10:45:09 +02:00 |
|
Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
redmatrix
|
ee5372784e
|
remove the automatic ajax page load on pgdn key; it can load content much faster than you can page and potentially lead to memory exhaustion.
|
2016-06-09 16:45:53 -07:00 |
|
Mario Vavti
|
85e82e919e
|
more style work
|
2016-06-09 22:05:52 +02: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 |
|
redmatrix
|
c0d80a5828
|
adjust the autocomplete regex slightly to account for emoji names
|
2016-06-05 22:38:44 -07:00 |
|
Andrew Manning
|
2af8105b46
|
Hide page history viewer when viewing sandbox
|
2016-06-05 21:14:30 -04:00 |
|
Andrew Manning
|
d2a7f83bb5
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 20:31:34 -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 |
|
jeroenpraat
|
e2245446a3
|
Updating NL + es_ES strings
|
2016-06-06 01:18:18 +02:00 |
|
Andrew Manning
|
08a9553ccc
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 16:52:02 -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 |
|
redmatrix
|
dd6718c2cd
|
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
|
2016-06-04 18:10:42 -07: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 |
|
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 |
|