jeroenpraat
37ad734cea
Dutch and Spanish string update
2016-08-31 13:17:23 +02:00
Mario Vavti
e9462ba145
resolve merge conflict
2016-08-31 09:41:07 +02:00
Mario Vavti
2b9322fc7d
provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox
2016-08-31 09:38:47 +02:00
redmatrix
b775a1aa0e
The 'save to folder' modal dialog looked like crap. Now it only looks like dung.
2016-08-30 21:43:33 -07:00
Andrew Manning
ad5c93d673
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-30 06:14:22 -04:00
Wave
202b757bc4
Merge pull request #505 from wave72/dev
...
Updated Italian strings
2016-08-30 10:32:52 +02:00
Wave72
603e64154d
Updated Italian strings
2016-08-30 10:29:59 +02:00
Mario Vavti
4050ff7c1f
make lock switching actually work with multiple acl forms
2016-08-29 12:48:16 +02:00
redmatrix
689f232243
move allowed email domains to admin->security page
2016-08-28 19:36:14 -07:00
Andrew Manning
ddfc5209d3
Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.
2016-08-27 06:52:01 -04:00
Mario Vavti
002c203913
contact-block needs a class clear div at the end to not mess with following widgets and whitespace
2016-08-26 19:51:39 +02:00
redmatrix
a81da0ec34
off by one pixel
2016-08-24 20:06:44 -07:00
Mario Vavti
5c32f42fe9
do not return false since it could prevent clicking also when not appropriate.
2016-08-24 22:58:02 +02:00
Mario Vavti
a780252552
remove the onclick action
2016-08-24 22:47:33 +02:00
Mario Vavti
798b80e486
do not remove cover photo after scrolling it up. mimik an scroll edge if scrolling up again before scrolling into the cover photo again.
2016-08-24 22:40:15 +02:00
Mario Vavti
aa0384bcec
Revert "revert cover photo changes"
...
This reverts commit 4c840d70a4
.
2016-08-24 22:39:30 +02:00
redmatrix
4c840d70a4
revert cover photo changes
2016-08-24 12:56:45 -07:00
redmatrix
238621ee92
allow changing the server role - as well as configuring any of the three options during installation
2016-08-23 23:00:24 -07:00
redmatrix
206054678b
cover photo: adjustments to display the entire photo on manual scrollback (padding added for nav height)
2016-08-23 20:10:56 -07:00
redmatrix
a5035dee74
several cover photo widget enhancements:
...
- allow a click anywhere on the page to cause the photo to autoscroll
- provide a logic flag to autoscroll only once
- allow manual scroll back to see the cover photo afterward (tricky to handle the nav menu here)
- on scroll back, the nav remains fixed at the top and the top pixels of the cover photo are covered (this was an acceptable tradeoff to gain the ability to see the photo again without causing unpredictable behaviour of the nav)
- some positioning details in small screen width mode caused jot to be off screen due to insufficient top padding; a manual padding was also added as something still wasn't right even after adding the nav height
- very minor nit: if screen size is reduced below 755 and then upsized again, the cover photo will not be redisplayed
2016-08-23 19:13:46 -07:00
Andrew Manning
420aa4bc44
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-23 06:57:10 -04:00
Andrew Manning
305e0538d2
Website export to cloud files works. Created new recursive copy function in attach.php.
2016-08-23 06:55:26 -04:00
redmatrix
38ca3bac40
optional server role compatibility checks for plugins
2016-08-22 17:41:41 -07:00
redmatrix
a3e0e67953
remove references to tinymce which were causing console errors
2016-08-21 19:40:11 -07:00
Mario Vavti
4f62d7a78f
move jotnets to jot and some cleanup (mostly whitespace)
2016-08-21 15:43:03 +02:00
Andrew Manning
d39cf23b2f
Visual improvements to the export element table
2016-08-21 06:53:19 -04:00
Andrew Manning
1c61e316b4
Block export and re-import works. Fixed bug where layout content was not being imported properly.
2016-08-20 21:08:15 -04:00
Andrew Manning
2d42d58738
Layouts list and are selectable for export to the zip file
2016-08-20 16:05:27 -04:00
Andrew Manning
80ed05d45d
Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages.
2016-08-20 15:22:30 -04:00
Andrew Manning
cf93d9c3b4
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-19 19:34:04 -04:00
Andrew Manning
40a7d38210
Pages populate the available-to-export list. New checkbox class for smaller boxes.
2016-08-19 19:32:52 -04:00
Andrew Manning
f2e87a204d
Progress implementing zip file export
2016-08-17 21:25:50 -04:00
Andrew Manning
c98b91f514
Stash changes for merge with dev
2016-08-17 18:19:36 -04:00
Wave72
99c4d932bf
Updated Italian strings
2016-08-17 10:25:42 +02:00
Mario Vavti
9fc4246e1d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-16 08:05:53 +02:00
Mario Vavti
291b0edbe0
rename limited -> custom
2016-08-16 08:05:46 +02:00
Mario Vavti
452c4d13b0
remove unneeded function
2016-08-16 07:54:24 +02:00
redmatrix
70150718c5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-15 22:46:06 -07:00
redmatrix
8a89cfb158
move schema settings into the display settings main so we can set theme:schema theme selectors in settings
2016-08-15 22:45:07 -07:00
Mario Vavti
86d2daf473
only check settings-form for dirty state and remove redundant javascript
2016-08-16 07:41:06 +02:00
redmatrix
7fc254a81c
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
2016-08-15 17:18:42 -07:00
Mario Vavti
4b101c2240
provide group options serverside and minor cleanup
2016-08-15 22:54:07 +02:00
Mario Vavti
dd8d20f089
implement groups in the acl select. please notice that selecting *custom selection* now sets an empty (public) acl. it was set to self before...
2016-08-15 18:52:27 +02:00
hubzilla
d1cb925b59
Merge pull request #482 from anaqreon/nocomment
...
Added an optional post editor button to toggle comments
2016-08-14 21:24:24 +10:00
Andrew Manning
229cc2ac43
Change text for submenu on small screens to be static toggle statement
2016-08-14 06:55:02 -04:00
Andrew Manning
cb9ac6dd34
Replace hardcoded button title in javascript to translatable text
2016-08-14 06:46:48 -04:00
Andrew Manning
2e7f4c1870
Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button
2016-08-14 06:41:12 -04:00
Mario Vavti
993b182f81
fix javascript error if not logged in
2016-08-14 12:12:37 +02:00
Mario Vavti
541d0dce90
btn/dropdown rendering issue
2016-08-14 11:31:00 +02:00
Mario Vavti
6f0ac133cc
remove js debugging
2016-08-13 22:27:53 +02:00
Mario Vavti
1b90e851f9
fix #480 , enable bbcode autocomplete for photo comments and remove some redundant javascript
2016-08-13 22:17:47 +02:00
Mario Vavti
87a74a44d3
possible quickfix for multi-acl not honoring jotnets
2016-08-12 17:40:22 +02:00
redmatrix
6c672d2575
initialise jot editor if it is used as a file drop target and isn't yet opened.
2016-08-10 19:38:20 -07:00
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
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
Mario Vavti
571c72f853
improve bbco autocomplete to not execute listNewLineAutocomplete() many times after many ajax page reloads
2016-04-12 11:55:50 +02:00
redmatrix
b788b38edf
remove obsolete jotVideoURL() and jotAudioURL()
2016-04-11 21:40:03 -07:00
redmatrix
326f3cfc85
Merge branch 'master' into dev
2016-04-11 00:52:34 -07:00
redmatrix
0269825bc0
localise the opensearch link
2016-04-10 21:56:16 -07:00
redmatrix
5cb3143c04
issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks.
2016-04-10 21:30:35 -07:00
redmatrix
e9f1bac062
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-10 17:03:30 -07:00
jeroenpraat
f437705007
Update Dutch and Spanish
2016-04-10 20:58:00 +02:00
Mario Vavti
e2b4d33627
some work on comanche autocomplete
2016-04-09 12:16:42 +02:00
Mario Vavti
7690dca67b
enable bbcode autocomplete for other places
2016-04-09 09:24:14 +02:00
redmatrix
c0bdcfedeb
log if the session handler fails and surface the ssl_cookie config setting
2016-04-08 05:10:36 -07:00
Mario Vavti
cf84ff3344
translate the most common bbcodes to their *real name*. finally we should probably use an array for each bbcode containing the bbcode the real name and possibly a template for use as a peview in the dropdown
2016-04-07 23:03:55 +02:00
Mario Vavti
e419b2c18c
some more autocompletion for bbcode tables - leave it open if we wanna use th or td though
2016-04-07 11:34:38 +02:00
Mario Vavti
58324473a9
move li back in the list since it will be used far less than list
2016-04-07 11:16:30 +02:00
Mario Vavti
e41082dccc
automate bbcode list creation even further
2016-04-07 00:46:45 +02:00
Mario Vavti
97ccbf1bfb
adjust the regex to also work with asteriks and use the simpler syntax for lists
2016-04-06 22:18:59 +02:00
Andrew Manning
1eb6067c31
Improve (un)ordered list autocompletion for list construction
2016-04-05 14:46:16 -04:00
Mario Vavti
bd29551f9a
fix contextual help
2016-04-05 16:59:32 +02:00
Mario Vavti
32ccdd1f57
use min version of justifiedGallery
2016-04-05 15:28:39 +02:00
Mario Vavti
deaf0e99fd
expand list of bbcode in autocomplete
2016-04-05 15:27:45 +02:00
Mario Vavti
d99a1d8de0
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-04-05 15:24:42 +02:00
Mario Vavti
0012030826
update upstream lib jusutifiedGallery
2016-04-05 15:24:05 +02:00
redmatrix
ec41170121
Merge pull request #338 from anaqreon/contextual-help
...
Contextual help
2016-04-05 22:43:15 +10:00
Mario Vavti
1c9f773900
Merge branch 'master' into dev
2016-04-04 17:13:10 +02:00
Mario Vavti
ec651f219e
a simple autocomplete for bbcode or comanche - partly implemented
2016-04-04 17:12:23 +02:00
Mario Vavti
ee8a9384d5
Merge branch 'master' into dev
2016-04-04 10:37:20 +02:00
Mario Vavti
bba34a7a8e
do not use dropdown class if there is nothing to dropdown
2016-04-04 10:37:07 +02:00
Mario Vavti
dfa12b2919
Merge branch 'master' into dev
2016-04-04 10:13:30 +02:00
Mario Vavti
9b9f29a0b2
whitespace
2016-04-04 10:10:19 +02:00
Mario Vavti
4a9aad2a33
whitespace
2016-04-04 10:09:46 +02:00
Mario Vavti
69617b5c34
fullscreen mode for photo albums view
2016-04-04 10:09:13 +02:00
Andrew Manning
0523b4b2f1
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
2016-04-03 21:36:29 -04:00
redmatrix
a703835b5c
Bug: "remember me" doesn't
2016-04-03 17:38:17 -07:00
Mario Vavti
f13096a6f3
various fixes
2016-04-03 18:00:03 +02:00
Mario Vavti
53311a30ad
reduce chat-item-title fontsize to match wall-item-ago
2016-04-03 15:27:10 +02:00
Mario Vavti
db4e9aeaad
fullscreen mode for events
2016-04-03 12:19:49 +02:00
Mario Vavti
b8d8be7013
show chat expiration time in overview and minor fixes
2016-04-03 11:34:07 +02:00
Mario Vavti
3edd4ce78f
ease transition between fullscreen and inline view for small screens
2016-04-03 00:04:05 +02:00
jeroenpraat
72d995d35f
Update nl and es-es strings
2016-04-01 23:24:13 +02:00
Mario Vavti
5b55726a93
on update only jump to bottom if we actually got a new message
2016-04-01 11:13:04 +02:00
Mario Vavti
bbe93d0e1d
scroll chat to bottom on fullscreen toggle
2016-04-01 10:29:58 +02:00
Mario Vavti
a564f495a7
improve scroll to bottom in chat
2016-04-01 10:20:10 +02:00
Mario Vavti
60bb8f25f7
move fullscreen js code to redbasic.js where it belongs to
2016-04-01 08:56:51 +02:00
Mario Vavti
c6d9100649
missing template
2016-04-01 08:36:02 +02:00
redmatrix
c0b3d7e1b4
Merge branch 'static'
2016-03-31 17:32:51 -07:00
redmatrix
9abd95fad3
static App
2016-03-31 16:06:03 -07:00
Mario Vavti
50d9b29347
slightly change the way fullscreen works and bring it to mod mail
2016-04-01 00:16:39 +02:00
Mario Vavti
90a5ba01a3
make fullscreen mode available for other modules and some cleanup
2016-03-31 23:13:40 +02:00
Mario Vavti
6c2673ae2a
various fixes regarding mod chat
2016-03-31 22:42:28 +02:00
Mario Vavti
3fdd110e07
mod chat rework continued
2016-03-31 13:21:48 +02:00
redmatrix
1cd3b41825
deprecate $a->get_baseurl()
2016-03-30 22:13:24 -07:00
Mario Vavti
df891f4ad2
more work on mod chat
2016-03-31 00:37:40 +02:00
Mario Vavti
08461c7049
more on mod chat
2016-03-30 14:44:03 +02:00
Mario Vavti
5462453bf2
some work on mod chat
2016-03-30 14:31:55 +02:00
Mario Vavti
ba0812c447
highlight table row on hover
2016-03-27 22:37:07 +02:00
jeroenpraat
dbde9a0940
Update es_es+n. Switch the feeds as requested by Mike.
2016-03-27 14:03:02 +02:00
Mario Vavti
97eef2b88c
removed link to connected apps by accident
2016-03-26 19:34:38 +01:00
Andrew Manning
661b0084f3
Added help for post permissions
2016-03-26 14:17:53 -04:00
Mario Vavti
f714e97d63
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-26 18:46:07 +01:00
Mario Vavti
a507063174
move link to /locs to settings menu if we have more than one location and some template work on locs
2016-03-26 18:43:38 +01:00
phellmes
9b06d952a2
Update DE translation strings
2016-03-24 09:08:12 +01:00
Andrew Manning
59827b6dfd
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
2016-03-23 21:17:23 -04:00
redmatrix
a8ac0ed549
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-22 19:59:47 -07:00
redmatrix
6f2ba0c619
rewrite the webfinger discovery logic
2016-03-22 19:58:59 -07:00
Wave
0a14ac1f60
Merge pull request #332 from wave72/master
...
Updated Italian strings
2016-03-22 11:53:57 +01:00
Paolo Tacconi
02140b2f76
Updated Italian strings
2016-03-22 11:49:03 +01:00
Mario Vavti
c6b89b99b9
Add a link to /locs to channel manager
2016-03-22 10:29:17 +01:00
Mario Vavti
97e1a6dfde
whip mod manage into shape
2016-03-22 02:06:19 +01:00
Andrew Manning
56c86b6567
Override navbar help button to open contextual help panel. Contextual help for mail written.
2016-03-21 06:33:02 -04:00
redmatrix
d3e7ef70e8
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-20 19:56:36 -07:00
redmatrix
fea532af4d
rework salmon - important, update addons also if you have enabled gnusoc addon
2016-03-20 19:55:53 -07:00
Mario Vavti
1ddb43b0d3
an attempt to visualize the supremacy of dont show over show in the acl selector
2016-03-20 23:07:39 +01:00
jeroenpraat
23419e4c26
Update NL + es_ES strings.
2016-03-20 14:39:22 +01:00
Mario Vavti
f7ff48f806
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-20 01:46:13 +01:00
Mario Vavti
30cf56bdb5
make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected
2016-03-20 01:45:56 +01:00
redmatrix
77094f8d2b
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
2016-03-19 16:17:19 -07:00
Mario Vavti
51cd4e8519
missing return false for map link
2016-03-19 02:20:59 +01:00
Mario Vavti
bd249b276d
add use as cover photo link to photos view
2016-03-18 17:49:31 +01:00
Mario Vavti
40162cd6b7
some work on profile listing
2016-03-17 12:56:55 +01:00
Mario Vavti
a41a05e6c0
bring more structure to profiles edit
2016-03-17 11:50:53 +01:00
Mario Vavti
2165733ddc
move buttons to dropdown menu and some cleanup
2016-03-16 23:07:29 +01:00
Mario Vavti
d22b21c56f
still more janitor work on profiles
2016-03-16 13:45:24 +01:00
Mario Vavti
d98d7003ed
even more janitor work on profiles
2016-03-15 21:38:03 +01:00
redmatrix
01a28ddf8d
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-15 01:32:41 -07:00
redmatrix
e8d19659c0
some heavy lifting porting the old salmon code
2016-03-15 00:50:03 -07:00
jeroenpraat
b8e8517725
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-14 15:46:57 +01:00
jeroenpraat
def0454952
update nl + es-es strings
2016-03-14 15:43:51 +01:00
redmatrix
fbfa391965
Merge pull request #323 from phellmes/de20160313
...
Update DE translation strings
2016-03-14 10:45:54 +11:00
Mario Vavti
38beabb508
fix spacing
2016-03-13 21:27:29 +01:00
Mario Vavti
370a007ee2
more janitor work on profiles
2016-03-13 21:19:15 +01:00
phellmes
a752d44313
Update DE translation strings
2016-03-13 13:29:14 +01:00
Mario Vavti
2d8deb6082
some janitor work on profiles
2016-03-12 22:13:46 +01:00
redmatrix
7bb461380e
issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel
2016-03-09 14:15:50 -08:00
redmatrix
cf4dc2caa8
move "generator" to HttpMeta
2016-03-08 16:21:35 -08:00
Wave
8f4fe106ef
Merge pull request #314 from wave72/master
...
Updated Italian strings
2016-03-08 15:54:54 +01:00
Paolo Tacconi
d74274c7e4
Updated Italian strings
2016-03-08 15:51:21 +01:00
Mario Vavti
d59268a5d8
removed id by mistake - add it again
2016-03-08 11:47:17 +01:00
Mario Vavti
f364343b55
add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl
2016-03-08 11:43:21 +01:00
redmatrix
32e903e956
a bit of page cleanup for edit profiles
2016-03-07 18:49:17 -08:00