Mario Vavti
d1c84ad9f0
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-26 14:20:16 +02:00
zotlabs
7667c630a4
provide a broken feed for services which require a broken feed
2017-04-26 14:12:11 +02:00
zotlabs
b88be137ca
provide a broken feed for services which require a broken feed
2017-04-25 20:48:38 -07:00
Andrew Manning
8ad2b3e7a1
When template "none" is used in a webpage layout, then the contents of the page should be the sole output, with no other code before or after the page element content.
2017-04-23 21:22:40 -04:00
zotlabs
397fef519c
give the item_obscured flag a new lease on life by using it to designate third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends.
2017-04-18 21:18:49 -07:00
zotlabs
a037758245
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-18 18:18:53 -07:00
Mario Vavti
ab369ab91d
more lock carets
2017-04-18 14:29:56 +02:00
Mario Vavti
9ce5e25507
the caret beside the lock seems a little overkill
2017-04-18 14:15:38 +02:00
zotlabs
7a31c039fb
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-17 16:04:17 -07:00
Mario Vavti
7cca2b7fb0
missing clearfix
2017-04-16 12:09:09 +02:00
Mario Vavti
10e5cf01cc
css fixes
2017-04-16 10:59:26 +02:00
Klaus Weidenbach
b6459e6172
⬆️ Update SimplePie library.
...
As a follow up to issue #699 update SimplePie from 1.2.1-dev (around
6years old) to current git master (1.4.4-dev). We use the master branch
until the next release because it contains our patch for enclosure
titles already. The other patches in the library from us can be done by
configuring the SimplePie object in our code instead.
Used composer to manage this library and use class autoloading.
Add some unit tests for include/feedutils.php, but the interesting parts
are unfortunately not testable with the current code.
2017-04-15 00:41:42 +02:00
Mario Vavti
0f0fba0e9e
missing includes
2017-04-13 23:20:09 +02:00
Mario Vavti
54f25609c9
bs font set might work better for win and mac
2017-04-13 12:28:38 +02:00
git-marijus
1f951e2bd3
Merge pull request #714 from mjfriaza/dev
...
Updated the Spanish translation
2017-04-11 06:55:12 +02:00
Manuel Jiménez Friaza
10f9f9cc80
Updated the Spanish translation
2017-04-10 12:50:42 +02:00
zotlabs
e682b93883
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-07 15:00:31 -07:00
zotlabs
dbef80f7bd
fix from downstream
2017-04-07 13:37:18 -07:00
git-marijus
06b0c89aee
Merge pull request #712 from zotlabs/fr_update
...
Fr update (Monret)
2017-04-07 21:00:37 +02:00
Mario Vavti
df4e193990
the string was there but the template var was wrong
2017-04-07 13:35:17 +02:00
Mario Vavti
28207c3313
css fixes and missing string
2017-04-07 11:31:10 +02:00
zotlabs
8cb4a29a51
revert grid and bars icon size change
2017-04-05 19:21:27 -07:00
zotlabs
6710a77c26
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-05 17:14:11 -07:00
Mario Vavti
a4f6c24273
we should probably stick to 0.875rem font-size (this is equal to 14px with a default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size.
2017-04-05 21:34:36 +02:00
Mario Vavti
53853814ff
adjust font-size
2017-04-05 21:13:48 +02:00
Mario Vavti
fb31f629c6
update bd-dev and remove hotfix
2017-04-05 14:12:18 +02:00
zotlabs
d2bafdb2bf
fr strings update (Monret)
2017-04-03 15:56:47 -07:00
zotlabs
2d9ae8ff2c
Revert "fr strings update (Monret)"
...
This reverts commit 4e4d406d23
2017-04-03 15:55:03 -07:00
zotlabs
4e4d406d23
fr strings update (Monret)
2017-04-03 15:53:48 -07:00
zotlabs
7256579c16
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-31 17:27:18 -07:00
Mario Vavti
95f4f14dca
triple a is more sane
2017-03-31 19:14:24 +02:00
Mario Vavti
391854058e
minor css adjustments
2017-03-31 18:13:36 +02:00
Mario Vavti
1bcee2f11c
various form css fixes
2017-03-31 16:13:58 +02:00
Mario Vavti
572a04b40a
make btn-outline-secondary color slightly darker
2017-03-31 14:20:13 +02:00
Mario Vavti
d9ee8b2c32
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-03-31 13:59:43 +02:00
Mario Vavti
614366e499
css fixes
2017-03-31 13:59:28 +02:00
git-marijus
89e3f3210f
Merge pull request #710 from dawnbreak/importcsrf
...
🔒 Add CSRF protection for import and import_items.
2017-03-31 13:40:02 +02:00
Mario Vavti
dc55c710da
add max height to #navbar-collapse-2
2017-03-31 13:38:55 +02:00
zotlabs
c4f5d17db6
Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf
2017-03-30 21:05:31 -07:00
zotlabs
a9cceea850
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-30 16:10:59 -07:00
Klaus Weidenbach
81736a0129
🔒 Add CSRF protection for import and import_items.
2017-03-30 23:17:32 +02:00
Mario Vavti
5abe7d2dfb
more css fixes
2017-03-30 12:08:10 +02:00
Mario Vavti
4da65183e0
css fixes
2017-03-30 11:45:16 +02:00
zotlabs
2d4f84563b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-29 16:11:50 -07:00
Mario Vavti
e90e4e4a59
css fixes
2017-03-29 14:45:50 +02:00
zotlabs
a8a6d807ff
allow setting the system email name/address/reply
2017-03-29 14:14:40 +02:00
zotlabs
b03cd330e5
begin the process of using the relevant attach directory/path for photo albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact
2017-03-29 14:09:19 +02:00
zotlabs
542fa4a08c
more markdown purification
2017-03-29 14:05:12 +02:00
zotlabs
e97dd48b4c
even more fine tuning of the markdown purifier - especially when used with the wiki
2017-03-29 14:03:24 +02:00
zotlabs
d5525a38f1
various input filter fixes
2017-03-29 13:56:31 +02:00
zotlabs
ee46faff1a
dim class was un-themed
2017-03-29 13:42:17 +02:00
zotlabs
3ee4dd0d52
remove the unimplemented upload limit site settings
2017-03-29 13:33:15 +02:00
Mario Vavti
cd57483ed9
namespace error
2017-03-29 11:59:20 +02:00
zotlabs
ad3a327366
scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going with 0.9
2017-03-28 18:16:40 -07:00
zotlabs
d12b360e92
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-28 14:58:48 -07:00
Mario Vavti
5564b47dbc
minor bs4 fixes
2017-03-28 23:44:50 +02:00
Mario Vavti
28ad60f892
some fixes for latest bs-dev
2017-03-28 19:29:42 +02:00
Mario Vavti
171b6a222d
fixes for latest bootstrap
2017-03-28 15:41:12 +02:00
Mario Vavti
f05181322c
update to latest bs-dev
2017-03-28 13:29:59 +02:00
Mario Vavti
33d23a4a61
links in wall-item-title must have white colour if the background is bg-primary
2017-03-28 11:11:01 +02:00
zotlabs
8292553a20
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-27 14:11:25 -07:00
Mario Vavti
b6b62506c5
adjust comment box
2017-03-27 13:22:15 +02:00
Mario Vavti
f66aa336ac
fix app rendering
2017-03-27 12:55:11 +02:00
Mario Vavti
eab9040ee7
unify css classes
2017-03-27 11:20:59 +02:00
Mario Vavti
099b30afbf
css fixes
2017-03-27 10:29:26 +02:00
zotlabs
5cbf603203
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-26 14:40:20 -07:00
Mario Vavti
c327b00efa
fix app-icon color and use bs class for w100
2017-03-26 13:45:27 +02:00
Mario Vavti
7634d4ce69
fix nav menu caret
2017-03-26 13:27:46 +02:00
Mario Vavti
98c6548d64
fix and cleanup custom theme settings
2017-03-26 13:15:15 +02:00
Mario Vavti
d169ee658e
minor css cleanup
2017-03-26 11:16:16 +02:00
zotlabs
e5e0a6b31f
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-25 14:40:31 -07:00
Mario Vavti
2115eb26a7
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-03-25 09:41:51 +01:00
Mario Vavti
4f4c9bf5d6
fix full template nav
2017-03-25 09:41:35 +01:00
Mario Vavti
90ab050493
fix active state
2017-03-24 19:41:58 +01:00
Mario Vavti
28e0911f29
remove obsolete todo
2017-03-24 17:07:22 +01:00
Mario Vavti
fd23844c8d
remove redundant css
2017-03-24 16:50:59 +01:00
Mario Vavti
5dc457b16c
fix some active and hover colors
2017-03-24 16:10:37 +01:00
Mario Vavti
aadfb97d5a
missing badge-default class
2017-03-24 15:50:54 +01:00
Mario Vavti
83abceb8be
must be 1.35rem
2017-03-24 10:29:44 +01:00
Mario Vavti
727a2fe4ea
restrict height of images in #banner to 1.5 rem
2017-03-24 10:23:23 +01:00
Mario Vavti
cb6c21ce90
do not return false here. it can lead to unresponsive links under certain situations.
2017-03-24 10:09:02 +01:00
Mario Vavti
1171e1dd9c
fix viewconnections
2017-03-23 14:15:08 +01:00
Mario Vavti
fff7be2c0f
fix spinner position
2017-03-23 13:33:33 +01:00
Mario Vavti
43a794a905
bs4 fixes for events
2017-03-23 13:11:27 +01:00
Mario Vavti
4d50fe0928
bump versions
2017-03-23 09:35:59 +01:00
zotlabs
c3c1572683
allow setting the system email name/address/reply
2017-03-22 21:40:43 -07:00
Mario Vavti
3a7db8ec60
fix embed image modals
2017-03-22 13:15:53 +01:00
Mario Vavti
efdd95fe7f
css fixes
2017-03-22 11:52:22 +01:00
zotlabs
bedc393425
begin the process of using the relevant attach directory/path for photo albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact
2017-03-21 20:11:48 -07:00
Mario Vavti
a7d184ba54
add generic-icons-nav class
2017-03-21 13:59:44 +01:00
Mario Vavti
546867c102
add icon, name and thumb to profile tabs. remove login app - we have login in the panel now.
2017-03-21 13:38:44 +01:00
Mario Vavti
42fbc28b11
missing template
2017-03-21 12:00:19 +01:00
zotlabs
82631c3413
more markdown purification
2017-03-21 00:40:19 -07:00
zotlabs
35fc7328de
even more fine tuning of the markdown purifier - especially when used with the wiki
2017-03-20 19:41:03 -07:00
zotlabs
7a611c6d47
create channel_store_lowlevel() and remove more diaspora stuff from core.
2017-03-20 18:14:50 -07:00
Mario Vavti
7de5717418
superfluos ;
2017-03-20 23:21:02 +01:00
Mario Vavti
a6f232f2b0
really fix fullscreen and fix some issues in chat
2017-03-20 23:20:14 +01:00
Mario Vavti
cbcd195461
fix webpages widgets
2017-03-20 22:39:29 +01:00
Mario Vavti
837efcf5e7
fix fullscreen and bbco_autocomplete popup rendering
2017-03-20 20:59:46 +01:00
Mario Vavti
8b0bcdb2a5
minor fixes
2017-03-20 20:13:10 +01:00
Mario Vavti
37d350c3f5
update to latest bs4 from git and change hidden-* classes to d-*
2017-03-20 11:18:23 +01:00
Mario Vavti
2f3f95d3a9
change the btn-outline-secondary:hover color to soething sane
2017-03-19 19:59:45 +01:00
Mario Vavti
92d581a342
do not show the scrollbar before the animation has finished
2017-03-19 19:36:29 +01:00
Mario Vavti
8e11b2d6f0
fix some wrapping issues
2017-03-19 19:32:54 +01:00
Mario Vavti
79bd2ddd9c
reflect count in modal
2017-03-19 17:53:33 +01:00
Mario Vavti
949ca844c5
open like-modal directly if more than 10 likes
2017-03-19 17:49:07 +01:00
Mario Vavti
f31af3c7c0
typo
2017-03-19 17:09:21 +01:00
Mario Vavti
a0245f3e93
css fixes
2017-03-19 17:06:55 +01:00
Mario Vavti
c85f1a208d
a % example for font size
2017-03-19 14:29:09 +01:00
Mario Vavti
774923be1c
fix jgrowl position and remove some redundant css
2017-03-19 14:20:21 +01:00
Mario Vavti
d78b64d5b3
fix narrow navbar setting and contextual-help position
2017-03-19 14:00:59 +01:00
Mario Vavti
57584ea429
remove redundant css
2017-03-19 13:28:06 +01:00
Mario Vavti
49d84a364d
css fixes
2017-03-19 13:21:30 +01:00
Mario Vavti
89b5507354
fix custom fontsize for app
2017-03-19 12:10:16 +01:00
Mario Vavti
2a25ddff36
bs4 fixes
2017-03-19 10:51:58 +01:00
zotlabs
4afeefb5ce
various input filter fixes
2017-03-18 16:41:43 -07:00
Mario Vavti
b2ad4e8c2a
bs4 fixes
2017-03-18 23:45:55 +01:00
Mario Vavti
2bdf63d069
more abook_edit and some css
2017-03-18 22:01:46 +01:00
Mario Vavti
b897fd8315
more abook_edit
2017-03-18 20:02:13 +01:00
Mario Vavti
82b35e2762
fix abook_edit and private mail
2017-03-18 20:00:32 +01:00
Mario Vavti
2556d05602
bs4 fixes
2017-03-18 17:28:46 +01:00
Mario Vavti
9277806664
fix usermenu radius
2017-03-17 21:42:27 +01:00
Mario Vavti
828028259c
css fixes
2017-03-17 20:48:06 +01:00
Mario Vavti
d10525a375
fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes
2017-03-17 14:22:10 +01:00
Mario Vavti
a73ea134cd
re-add spaces between tags
2017-03-15 21:22:16 +01:00
Mario Vavti
e7a5aa7b9c
js fixes
2017-03-15 17:28:00 +01:00
Mario Vavti
aa33cacb62
style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes
2017-03-15 16:42:55 +01:00
Mario Vavti
0c973cc9fa
various fixes
2017-03-15 12:41:37 +01:00
zotlabs
32a9487ff9
use dim for the button border also
2017-03-14 18:46:50 -07:00
zotlabs
e891380ed5
dim class was un-themed
2017-03-14 18:42:51 -07:00
Mario Vavti
3b2398ed01
css fixes
2017-03-14 18:59:27 +01:00
Mario Vavti
a0a376e95e
hide nav search behind a button, css fixes and cleanup
2017-03-14 18:31:19 +01:00
Mario Vavti
7b9df1d401
css fixes
2017-03-14 14:12:44 +01:00
zotlabs
a153368814
make redbasic compatible with red 5.x
2017-03-13 18:58:23 -07:00
zotlabs
41fd729209
remove the unimplemented upload limit site settings
2017-03-13 18:40:07 -07:00
zotlabs
02b390d7b8
Merge branch 'dev' into red
2017-03-13 15:13:59 -07:00
Mario Vavti
700c05a55b
many class fixes and revive shiny class for item titles in a new way
2017-03-13 16:34:23 +01:00
Mario Vavti
188782c461
merge dev into bs4
2017-03-13 11:11:20 +01:00
git-marijus
bdfdd23b36
Merge pull request #697 from anaqreon/dev
...
Add id to app-menu for JS access
2017-03-13 11:00:19 +01:00
Mario Vavti
9f0c3b496b
we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
2017-03-13 10:30:41 +01:00
Mario Vavti
1ae715da21
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2017-03-13 10:29:48 +01:00
Mario Vavti
d5feb5135d
we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
2017-03-13 10:29:26 +01:00
zotlabs
6f3493bb3c
db issues
2017-03-12 15:50:47 -07:00
Mario Vavti
61257094b7
fix help menu
2017-03-12 22:21:49 +01:00
Mario Vavti
8aabc6bc3d
many dropdown and class fixes. still a long way to go...
2017-03-12 21:11:28 +01:00
Andrew Manning
f68148b7e0
Add id to app-menu for JS access
2017-03-12 13:57:45 -04:00
zotlabs
4c526c7d3d
Merge branch 'dev' into red
2017-03-11 18:02:59 -08:00
jeroenpraat
b8ad22f525
Login-box css-fix for Bluegrid scheme
2017-03-11 21:09:42 +01:00
Mario Vavti
83d07b9551
font size and post title adjust
2017-03-11 15:07:30 +01:00
Mario Vavti
0f9ddbf3b2
fixing classes
2017-03-10 17:02:55 +01:00
jeroenpraat
8c4b8e623f
Login-box css-fix for Bluegrid scheme
2017-03-10 16:58:32 +01:00
Mario Vavti
b1c97dfcfd
some sed magic on button class names
2017-03-10 10:47:30 +01:00
zotlabs
1a49f0d164
one role.
2017-03-09 18:54:10 -08:00
Mario Vavti
14d1912115
upgrade bs to latest git and some more progress
2017-03-09 22:04:17 +01:00
Mario Vavti
c42cbda904
remove navbar-toggler-left class
2017-03-09 10:45:55 +01:00
Mario Vavti
39d56fd08f
initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again
2017-03-09 10:17:57 +01:00
jeroenpraat
495da14e38
Update latest Spanish strings (were commited to dev instead of the RC)
2017-03-08 17:22:53 +01:00
Mario Vavti
bc2b948f1f
Merge branch 2.2RC
2017-03-08 09:39:46 +01:00
jeroenpraat
b5ddd08630
Big 2.2 string update Dutch
2017-03-07 12:08:16 +01:00
jeroenpraat
f783d594cc
Big 2.2 string update Dutch
2017-03-06 22:50:52 +01:00
Mario Vavti
4471c45fb7
do not collapse long nsfw content
2017-03-06 11:53:06 +01:00
Mario Vavti
99e681c09f
do not collapse long nsfw content
2017-03-06 11:52:07 +01:00
zotlabs
5d8b0acc16
Merge pull request #689 from mjfriaza/dev
...
Translated the last strings into Spanish version
2017-03-05 19:25:41 +11:00
Manuel Jiménez Friaza
3d23f4ec77
Translated the last strings into Spanish version
2017-03-05 08:50:53 +01:00
Mario Vavti
a894456550
fix badge position for narrow navbar
2017-03-03 10:04:57 +01:00
Mario Vavti
608e679d33
fix badge position for narrow navbar
2017-03-03 10:04:11 +01:00
zotlabs
7445f1881e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-02 17:36:14 -08:00
zotlabs
e58dc726c5
activity widget - like the forum widget but represents unseen activity by author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding.
2017-03-02 17:32:43 -08:00
Mario Vavti
1eba847e99
provide info if there are no sche,es available
2017-03-02 12:52:09 +01:00
Mario Vavti
6bf6462a37
provide info if there are no sche,es available
2017-03-02 12:51:31 +01:00
Mario Vavti
729d52f10a
reset schema value after we empty and repopulate it. second half of fix for #624
2017-03-02 11:39:14 +01:00
Mario Vavti
79e8e4599e
reset schema value after we empty and repopulate it. first half of fix for #624
2017-03-02 11:39:01 +01:00
Mario Vavti
ba5cfd8b25
setting top position of contextual-help in schemes does not work with narrow navbar setting. schema css is always called last.
2017-03-02 11:38:47 +01:00
Mario Vavti
dd8a3d845e
reset schema value after we empty and repopulate it. second half of fix for #624
2017-03-02 11:36:35 +01:00
Mario Vavti
66fc1dcf33
reset schema value after we empty and repopulate it. first half of fix for #624
2017-03-02 11:03:33 +01:00
Mario Vavti
816f4907e3
setting top position of contextual-help in schemes does not work with narrow navbar setting. schema css is always called last.
2017-03-02 10:12:00 +01:00
Mario Vavti
288905c361
add title to connect button
2017-03-01 11:39:51 +01:00
Mario Vavti
d4a957ca16
add title to connect button
2017-03-01 11:39:26 +01:00
Mario Vavti
3071f3b71c
minor template fixes
2017-03-01 11:37:40 +01:00
Mario Vavti
e08e6c182c
minor template fixes
2017-03-01 11:37:02 +01:00
Mario Vavti
07d443a159
missing css class
2017-02-28 13:24:09 +01:00
Mario Vavti
360397b2ed
missing css class
2017-02-28 13:23:42 +01:00
zotlabs
85082ea509
fetch profile vcard for connection
2017-02-27 21:14:09 -08:00
zotlabs
1325a81e9a
add file size notes to /cloud actions panel
2017-02-27 15:13:49 -08:00
Mario Vavti
69e145a630
fix js issue in markdown mimetype wikis if content contains quotes
2017-02-27 13:52:51 +01:00
Mario Vavti
a6d13f290b
fix js issue in markdown mimetype wikis if content contains quotes
2017-02-27 13:52:08 +01:00
Mario Vavti
1070f3ed6b
missing clear
2017-02-27 10:55:25 +01:00
Mario Vavti
a41603ed85
missing clear
2017-02-27 10:54:43 +01:00
Mario Vavti
f5a03102d8
lower version requirement to 2.2RC
2017-02-27 10:19:01 +01:00
Mario Vavti
b6c4e6a6d0
lower version requirement to 2.2RC
2017-02-27 10:18:05 +01:00
Mario Vavti
8e3e90ddd2
set minversion and maxversion for themes in view/theme/themename/php/theme.php instead of separate file.
2017-02-27 10:16:04 +01:00
Mario Vavti
e0e30ead58
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-02-27 10:13:29 +01:00
Mario Vavti
0f208fb36b
set minversion and maxversion for themes in view/theme/themename/php/theme.php instead of separate file.
2017-02-27 10:13:08 +01:00
zotlabs
94fdcabac9
Merge pull request #687 from mjfriaza/dev
...
Updated the Spanish translation
2017-02-27 13:36:09 +11:00
Mario Vavti
8a69a5c3c7
add a minversion to the theme and fallback to default if requirement is not met. mark incompatible themes in the theme selector
2017-02-26 21:22:19 +01:00
Mario Vavti
4f07abe655
add a minversion to the theme and fallback to default if requirement is not met. mark incompatible themes in the theme selector
2017-02-26 21:01:20 +01:00
Manuel Jiménez Friaza
bc01b6b4ad
Updated the Spanish translation
2017-02-26 08:02:17 +01:00
zotlabs
b1ff5367e7
more work on profile vcards - still a lot of work to go
2017-02-23 19:07:01 -08:00
Mario Vavti
9bab858fd1
move collapsed login and register buttons to the left
2017-02-23 12:32:27 +01:00
phellmes
175e222927
Update DE translation strings
2017-02-22 14:50:28 +01:00
Mario Vavti
55924f5c5b
apps improvements
2017-02-22 11:22:43 +01:00
zotlabs
956f0043fc
change text back to 'add apps'
2017-02-21 23:16:05 -08:00
Andrew Manning
3e144baacd
Change Add Apps to Manage Apps and support translation.
2017-02-21 20:32:13 -05:00
zotlabs
bbacfbdd6a
display page not updating after comment
2017-02-21 15:24:39 -08:00
zotlabs
1c1d1f1185
update fr translation
2017-02-20 18:46:51 -08:00
Mario Vavti
924b353e5a
width must be 100% here
2017-02-20 23:09:21 +01:00
Mario Vavti
d7ba2c7168
if we slide to left aside make the overlay darker and leave aside as is
2017-02-20 14:02:39 +01:00
zotlabs
573846707c
fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:
...
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.
Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
2017-02-19 16:50:41 -08:00
zotlabs
02e487f306
this icon also appears to require the fixed-width attribute
2017-02-19 14:14:58 -08:00
Mario Vavti
d4f8a8dedd
add the generic-icons-nav class
2017-02-17 18:32:18 +01:00
Mario Vavti
f23c380cae
add register button for collapsed state
2017-02-17 16:31:36 +01:00
Mario Vavti
7151467db7
fixed width icons for item dropdown
2017-02-17 16:08:18 +01:00
Mario Vavti
16a8416495
css fixes and rename link to full docs to help since its app is also called help
2017-02-17 15:07:20 +01:00
Manuel Jiménez Friaza
d7fcf31be5
Updated the Spanish translation
2017-02-13 13:56:17 +01:00
zotlabs
321241da02
add default permcat to channel settings form
2017-02-12 18:40:26 -08:00
Mario Vavti
f62b2fc114
css fix
2017-02-12 20:06:09 +01:00
Mario Vavti
bc3605a502
whitespace
2017-02-10 10:50:16 +01:00
Mario Vavti
ce4daad431
do not use modal-sm class
2017-02-10 10:02:48 +01:00
Mario Vavti
0360d42d30
add a login button for collapsed state and refine login modal
2017-02-10 10:01:43 +01:00
Mario Vavti
242eede258
wrap resizing in document ready function
2017-02-09 12:01:55 +01:00
zotlabs
8dc349caac
minor theming and whitespace
2017-02-08 19:47:34 -08:00
zotlabs
91819bfc2d
bringer - all basic functionality is implemented
2017-02-08 17:21:32 -08:00
Mario Vavti
ace0a1cb75
do not show feature button if the app is shared. css fixes
2017-02-08 10:56:03 +01:00
zotlabs
6ceaea8478
open permission tab by default - when you're creating permission categories
2017-02-07 21:03:14 -08:00
zotlabs
30659aef50
initial permcat creation ability, in /settings/permcats; functional permcat creation for testing but still needs a lot of UX work before promoting the ability
2017-02-07 20:29:03 -08:00
zotlabs
46d0e23e7b
atokens - we only need one permission column
2017-02-07 19:49:15 -08:00
zotlabs
723b51c931
provide a few system defined permcats; will require a permission editor page to define new (personal) ones.
2017-02-07 17:17:38 -08:00
zotlabs
b2bae867d0
more background work for permcat support
2017-02-07 16:08:27 -08:00
zotlabs
6a083e8452
bring back view links for all notification types (esp: network, channel) for easy access
2017-02-06 14:32:50 -08:00
Mario Vavti
c75357faa3
also take care of the collapsed state apps
2017-02-06 20:36:26 +01:00
zotlabs
00cfc4be44
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-02-06 11:14:59 -08:00
Mario Vavti
70edcabca1
move icon stuff back to app_render() and send navapps through app_render()
2017-02-06 20:10:10 +01:00
Mario Vavti
5aa1146fe9
minor fixes
2017-02-06 13:58:49 +01:00
Mario Vavti
8059260c18
import system apps on initial load
2017-02-06 13:45:46 +01:00
Mario Vavti
91bc8d473f
update templates
2017-02-06 13:30:56 +01:00
Mario Vavti
e70c87ed41
merge dev
2017-02-06 10:08:05 +01:00
zotlabs
56a08f0d17
make channel move an option (in addition to cloning)
2017-02-05 20:26:06 -08:00
zotlabs
eb3685f537
remove per-page login css (home, login); add support for alternative markdown mention format
2017-02-05 18:47:35 -08:00
zotlabs
201a6b8742
nav_login element width was page dependent. Put this in theme css
2017-02-05 14:55:46 -08:00
zotlabs
e2ee4ae024
better theming of rmagic page
2017-02-05 14:45:28 -08:00
zotlabs
73845e01ed
cleanup
2017-02-04 14:58:13 -08:00
Mario Vavti
178e3d5bc8
allow featuring of apps in /apps and update some more apd files
2017-02-04 18:36:50 +01:00
zotlabs
fc4083346e
more work on nav-modal
2017-02-03 15:31:01 -08:00
zotlabs
f79a11cbf7
trying nav-login as modal
2017-02-03 13:47:29 -08:00
Mario Vavti
edc0a7ef91
update some apps and refine navapps.tpl
2017-02-03 15:24:21 +01:00
Mario Vavti
dce9a70ff5
check for app-icons in app_list() instead of app_render()
2017-02-03 12:12:05 +01:00
Mario Vavti
631a8278d3
do not hide button - just gray it out
2017-02-03 11:21:06 +01:00
Mario Vavti
a5c1685ea0
hide notifications button if there are none
2017-02-03 11:00:35 +01:00
Mario Vavti
d0a0051d85
use openClose() for nav-login
2017-02-03 09:35:35 +01:00
Mario Vavti
8e4960f31d
use openClose() for nav-login
2017-02-03 09:33:09 +01:00
Mario Vavti
dd2a5e6b28
Merge branch 'dev' into wip-app-bin
2017-02-03 09:24:09 +01:00
zotlabs
c62df39ce3
move firefox social api configuration to plugin
2017-02-02 17:23:58 -08:00
zotlabs
a91e7cbe8d
move rsd service to twitter_api plugin
2017-02-02 15:25:35 -08:00
zotlabs
2daafe80a5
move opensearch to plugins
2017-02-02 14:49:51 -08:00
Mario Vavti
028b2a655d
whitespace cleanup
2017-02-02 20:39:06 +01:00
Mario Vavti
fd52cefe09
provide separate collased menus for apps and notifications
2017-02-02 20:10:35 +01:00
Mario Vavti
e2ee565f05
cherry-pick nav-login changes
2017-02-02 14:24:19 +01:00
Mario Vavti
63e06578c4
use bootstrap dropdown for login
2017-02-02 14:19:23 +01:00
Mario Vavti
a1f03015ec
move channel manager up in the menu
2017-02-02 11:35:42 +01:00
Mario Vavti
8220a6584c
remove apps from usermenu
2017-02-02 11:19:06 +01:00
Mario Vavti
d4b51c491f
do not use style in template
2017-02-02 10:59:20 +01:00
Mario Vavti
3f66d9f8cd
do not use data-toggle on the badge and use fixed with for icons
2017-02-02 10:54:44 +01:00
Mario Vavti
852073fc68
dropdown menus should be restricted in height in normal view but not in collapsed view
2017-02-02 10:33:23 +01:00
Mario Vavti
17082cda3c
remove badge hover effect
2017-02-02 10:15:05 +01:00
Mario Vavti
7ffa98118f
really fix badge positions
2017-02-02 10:12:56 +01:00
Mario Vavti
c3bada3c32
resolve merge conflict
2017-02-02 09:38:07 +01:00
zotlabs
db710cd2df
fix a few style issues with nav login panel
2017-02-01 14:45:52 -08:00
Mario Vavti
d476b7477b
fix notifications badge positioning and rendering of submenus in collapsed mode
2017-02-01 22:24:37 +01:00
Mario Vavti
1a56045b42
nav dropdown-menu overrides
2017-02-01 13:08:41 +01:00
Mario Vavti
bf820beb79
remove experimental_app_bin config conditional
2017-02-01 12:59:56 +01:00
Mario Vavti
cde7a3f66c
more work on app-bin
2017-02-01 12:52:19 +01:00
Mario Vavti
d0827dbb3c
provide a feature/unfeature app button
2017-01-30 15:17:46 +01:00
Mario Vavti
8b5793e629
more work on app-bin
2017-01-27 17:51:49 +01:00
Mario Vavti
606463114b
add icons and links to appman and apps edit to app-bin
2017-01-27 14:00:27 +01:00
Andrew Manning
d9a5b11c9a
Fixed numerous bugs with the addon repo management GUI. Only show Manage Repos button if webserver has write permission on extend/addon/.
2017-01-26 21:20:15 -05:00
Mario Vavti
b4aaa1953c
fix wiki list template
2017-01-26 11:24:15 +01:00
zotlabs
93057fae8c
missing quote in nav template
2017-01-25 21:43:55 -08:00
zotlabs
45dbd31d28
only allow wiki owner to delete pages
2017-01-25 12:21:52 -08:00
Mario Vavti
e26295b6fa
do not show location row on small viewports.
2017-01-24 10:26:50 +01:00
Mario Vavti
c8239c739d
do not show location row on small viewports.
2017-01-24 10:25:31 +01:00
zotlabs
6c4f7caba1
nav-login - basic, crude theming
2017-01-23 16:51:23 -08:00
zotlabs
cb47354a4f
put login form into the nav bar. Proof of concept - needs a bit of UI tweaks.
2017-01-23 16:31:40 -08:00
Mario Vavti
dfafa81bfe
give apps a bit more horizontal space
2017-01-23 17:10:52 +01:00
zotlabs
85766126e3
Merge pull request #650 from mjfriaza/dev
...
Translation of the new strings into the Spanish version
2017-01-23 12:07:16 +11:00
Hubzilla
3bafa05ad1
force app icons to fixed width
2017-01-22 16:09:55 -08:00
Hubzilla
1627297143
use icons for app photos.
2017-01-22 15:17:37 -08:00
Mario Vavti
951376852c
some work on app_bin - just to get it going
2017-01-22 13:45:34 +01:00
Manuel Jiménez Friaza
4d3647066f
Translation of the new strings into the Spanish version
2017-01-22 12:13:28 +01:00
Mario Vavti
8794106e85
add observer.language to autocomplete and return a default value for observer
2017-01-21 23:28:57 +01:00
Hubzilla
ece1dd1d7e
js errors with raw message-id, string update
2017-01-20 12:03:46 -08:00
Hubzilla
d4e58e94f6
native wiki updates
2017-01-18 18:18:37 -08:00
zotlabs
7f944515de
more work on native wiki - revert now works; still remaining: diff, delete-page, rename-page and export wiki.
2017-01-17 23:39:28 -08:00
zotlabs
e5662dc893
vcard export from profile
2017-01-15 21:23:43 -08:00
zotlabs
d7080defd3
Still trying to make the documentation link just a wee bit more obvious.
2017-01-15 16:08:51 -08:00
Andrew Manning
b1f3ccc6ee
pull in some CSS
2017-01-15 07:27:48 -05:00
zotlabs
e843d27f8c
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-01-13 13:23:21 -08:00
zotlabs
4f1e4ffa70
several minor app nits
2017-01-13 13:22:36 -08:00
Mario Vavti
8ea0b2051a
another try on preventing double scrollbars when a modal is larger than the viewport
2017-01-13 13:04:30 +01:00
Mario Vavti
c8678ba5a9
evert "prevent double scrollbar when we have a modal larger than the viewport"
...
This reverts commit 2ace4c57d0
2017-01-13 12:53:45 +01:00
Mario Vavti
2ace4c57d0
prevent double scrollbar when we have a modal larger than the viewport
2017-01-13 11:24:34 +01:00
Mario Vavti
91b81d6a2c
fullscreen in album-view is disfunctional atm
2017-01-12 15:29:49 +01:00
Mario Vavti
76daa03df0
comment out redundant querys
2017-01-11 22:16:02 +01:00
Mario Vavti
2fc47cc52b
fix embedimage if an albumname contains quotes
2017-01-11 10:59:46 +01:00
Mario Vavti
0f89db3b46
/connedit do not show vcard and section selector if not yet approved. whitespace cleanup
2017-01-10 10:15:48 +01:00
zotlabs
47bc573de5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-01-09 14:38:49 -08:00
zotlabs
a6272fcf76
channel move stuff (disabled currently because not yet complete)
2017-01-09 14:37:56 -08:00
Mario Vavti
b8f0e565f5
implement a menu to select a section to be open by default
2017-01-09 12:03:32 +01:00
zotlabs
83c9753507
Merge pull request #640 from mjfriaza/dev
...
Updated the Spanish translation
2017-01-09 08:37:20 +11:00
Manuel Jiménez Friaza
eca70d81c8
Updated the Spanish translation
2017-01-07 12:26:54 +01:00
Mario Vavti
be7e249630
fix main width if right aside is hidden
2017-01-07 10:07:50 +01:00
Mario Vavti
d1493e6b70
fix main width if right aside is hidden
2017-01-07 10:07:05 +01:00
Mario Vavti
3e0ea9727f
same fix for mobile view
2017-01-05 17:55:25 +01:00
Mario Vavti
e64378f94f
same fix for mobile view
2017-01-05 17:54:44 +01:00
Mario Vavti
9cf2f424ad
fix an issue with sticky_kit where input fields and textareas would blur on recalc. auto resize the notes textarea since if it sticks to the bottom it can not be properly resized
2017-01-05 17:42:30 +01:00
Mario Vavti
a1b35fb7d1
fix an issue with sticky_kit where input fields and textareas would blur on recalc. auto resize the notes textarea since if it sticks to the bottom it can not be properly resized
2017-01-05 17:40:45 +01:00
Mario Vavti
93ce2728b7
css fix
2017-01-04 16:40:11 +01:00
Mario Vavti
0364bf4913
css fix
2017-01-04 16:39:14 +01:00
Mario Vavti
a9a35ccb6b
trigger sticky_kit:recalc if the size of left_aside_wrapper changes
2017-01-04 15:50:17 +01:00
Mario Vavti
4d5c20ce17
fix expand-aside button hiding if aside is empty
2017-01-04 15:50:13 +01:00
jeroenpraat
6a0055f69f
Fixing some schemas
2017-01-03 21:07:49 +01:00
Mario Vavti
07b299abd2
trigger sticky_kit:recalc if the size of left_aside_wrapper changes
2017-01-03 17:56:40 +01:00
Andrew Manning
bc0d4f28ef
Merge remote-tracking branch 'upstream/dev' into dev
2017-01-02 07:56:23 -05:00
zotlabs
b88a735e54
feature: allow event creation in other timezones than your own.
2017-01-01 19:51:44 -08:00
zotlabs
dca4de80fd
Merge branch 'pcard' into dev
2017-01-01 14:16:15 -08:00
zotlabs
1436b075bf
issue #636 - some localised (e.g. Italian) strings have single quotes which throw JS errors when used in single quoted template constructs.
2017-01-01 13:46:20 -08:00
zotlabs
9831b358f8
profile vcard - preliminary work
2017-01-01 13:29:27 -08:00
Andrew Manning
dce5c7e249
Add guest access token section to member guide with screenshot of settings
2017-01-01 14:28:13 -05:00
Mario Vavti
9820baf82e
fix expand-aside button hiding if aside is empty
2016-12-31 12:55:10 +01:00
Mario Vavti
62a911a57e
prevent eventual double scrollbar
2016-12-31 09:44:16 +01:00
Mario Vavti
fcd34e41ca
css fixes and get rid of a javascript workaround
2016-12-31 09:44:09 +01:00
zotlabs
ba8a5ac82b
peoplefind widget should honour directory option settings (such as this site only).
2016-12-30 13:31:59 -08:00
zotlabs
e5a6c0a94d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-12-30 13:12:56 -08:00
zotlabs
a9c8d4a216
peoplefind widget should honour directory option settings (such as this site only).
2016-12-30 13:09:35 -08:00
Mario Vavti
6c7da13cd3
prevent eventual double scrollbar
2016-12-30 20:50:12 +01:00
Mario Vavti
8a074dedb6
css fixes and get rid of a javascript workaround
2016-12-30 13:35:43 +01:00
Andrew Manning
95683c6239
Add webpage doco to Member guide. Add nav menu highlighting when scrolling past content
2016-12-27 19:57:53 -05:00
Mario Vavti
3b9b03cf86
Merge branch '2.0RC'
2016-12-23 10:09:46 +01:00
Mario Vavti
4bcc1f5adb
move style info into css file
2016-12-22 15:20:31 +01:00
Mario Vavti
3629468d47
move style info into css file
2016-12-22 15:20:02 +01:00
Mario Vavti
d7f65ca125
another check
2016-12-22 15:01:57 +01:00
Mario Vavti
c5d6f58988
another check
2016-12-22 15:01:29 +01:00
Mario Vavti
a7a3ce7245
a cleaner way to work around browser bugs
2016-12-22 14:55:36 +01:00
Mario Vavti
6cb527a937
a cleaner way to work around browser bugs
2016-12-22 14:55:05 +01:00
Mario Vavti
007ba2bee4
more robust crossbrowser support
2016-12-22 11:54:39 +01:00
Mario Vavti
2ce6d47519
more robust crossbrowser support
2016-12-22 11:54:04 +01:00
zotlabs
bb85e139f1
more vcard work
2016-12-21 15:03:33 -08:00
Mario Vavti
e8be8139cb
css fixes
2016-12-21 12:56:23 +01:00
Mario Vavti
fcc92299eb
css fixes
2016-12-21 12:55:49 +01:00
Mario Vavti
0c23cd62db
fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there
2016-12-21 11:53:20 +01:00
Mario Vavti
04472bd730
fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there
2016-12-21 11:51:24 +01:00
zotlabs
3d811a17fe
provide call button on connections list if mobile|tablet and a phone number exists
2016-12-20 23:26:31 -08:00
zotlabs
f3ec818a66
abook_vcard cleanup
2016-12-20 20:37:06 -08:00
zotlabs
493aa9f20d
progress on abook_vcard
2016-12-20 18:43:20 -08:00
zotlabs
6ff462abf3
more abook_vcard
2016-12-20 17:19:53 -08:00
zotlabs
4103344e48
abook_vcard first commit
2016-12-20 16:45:12 -08:00
zotlabs
193705a08a
Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge
2016-12-20 15:12:22 -08:00
Manuel Jiménez Friaza
b59230067f
Translated new strings into Spanish version
2016-12-20 15:11:13 -08:00
Mario Vavti
7b7fa5f77b
turns out we do need this in certain situations
2016-12-20 14:53:58 +01:00
Mario Vavti
27b4c17f06
turns out we do need this in certain situations
2016-12-20 14:53:21 +01:00
Mario Vavti
6491e30a80
some changes to heading sizes to make some sense in the doco (this will undergo some refinement in the next release cycle when we possibly upgrade to bootstrap 4) and get rid of the accordion for now.
2016-12-20 11:38:39 +01:00
Mario Vavti
4d478a3306
some changes to heading sizes to make some sense in the doco (this will undergo some refinement in the next release cycle when we possibly upgrade to bootstrap 4) and get rid of the accordion for now.
2016-12-20 11:37:57 +01:00
Andrew Manning
c968d11943
Move headings down to start at H3 at Mario's direction
2016-12-19 19:35:19 -08:00
zotlabs
e0918816fb
Merge pull request #622 from mjfriaza/dev
...
Translated new strings into Spanish version
2016-12-20 14:32:01 +11:00
Andrew Manning
d4ab74b25e
Move headings down to start at H3 at Mario's direction
2016-12-19 22:12:08 -05:00
Mario Vavti
87248c9f47
fix contextualHelpFocus() to work wit sticky aside
2016-12-19 20:37:48 +01:00
Mario Vavti
3fe616b8fe
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-12-19 20:36:56 +01:00
Mario Vavti
a12b2c8d33
fix contextualHelpFocus() to work wit sticky aside
2016-12-19 20:36:40 +01:00
jeroenpraat
468fb3c77a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-12-19 16:52:17 +01:00
jeroenpraat
3a4bd27333
Update NL strings
2016-12-19 16:51:30 +01:00
jeroenpraat
ac9974fd64
Update NL strings
2016-12-19 16:50:52 +01:00
Mario Vavti
1e1b51bc1c
make sticky aside available for small screens. we had to get rid of the transition effect for this to work reliably
2016-12-19 12:47:55 +01:00
Mario Vavti
127772e1b4
this is not needed
2016-12-19 12:47:44 +01:00
Mario Vavti
3ad3d3037f
make sticky aside available for small screens. we had to get rid of the transition effect for this to work reliably
2016-12-19 12:46:36 +01:00
Mario Vavti
9c5f2de4ec
this is not needed
2016-12-19 09:48:01 +01:00
zotlabs
92f3d863fa
re-factor item_photo_menu - there is some room for future development, currently it was made compatible with minimal template changes
2016-12-18 16:26:00 -08:00
Manuel Jiménez Friaza
5970df0606
Translated new strings into Spanish version
2016-12-17 13:20:04 +01:00
zotlabs
e1819a874f
use darkorange.
2016-12-16 22:47:25 -08:00
zotlabs
0c665e11f1
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-12-16 19:57:49 -08:00
zotlabs
827d4c5fb0
use lock colour to indicate that permissions have been set by the software to something you might not expect rather than an exclamation mark. This may not be the best colour in this page context, but it serves the intended purpose. Perhaps orange might be less intrusive and still convey the desired information.
2016-12-16 19:54:07 -08:00
Mario Vavti
ae8129f1fd
display inline instead of floating
2016-12-16 22:56:11 +01:00
Mario Vavti
6eed7eb540
display inline instead of floating
2016-12-16 22:50:19 +01:00
Mario Vavti
7c86f11167
retrigger after fullscreen
2016-12-16 16:24:44 +01:00
Mario Vavti
dc34bf18bb
retrigger after fullscreen
2016-12-16 16:24:17 +01:00
Mario Vavti
6bde70d60a
move the sticky-kit^Cquery plugin to /lib and see if we want this for the whole app
2016-12-16 16:14:56 +01:00
Mario Vavti
b8370cffb9
move the sticky-kit^Cquery plugin to /lib and see if we want this for the whole app
2016-12-16 16:14:01 +01:00
Mario Vavti
e2f1ce7758
note widget: whitespace and resize the textarea to reveal full content
2016-12-15 14:50:26 +01:00
Mario Vavti
4744e50244
note widget: whitespace and resize the textarea to reveal full content
2016-12-15 14:49:14 +01:00
Mario Vavti
61f105da6f
reworked doco navigation
2016-12-15 12:26:35 +01:00
Mario Vavti
273ab304b9
reworked doco navigation
2016-12-15 12:25:59 +01:00
Mario Vavti
1d3af68f29
more wiki cleanup
2016-12-15 10:57:00 +01:00
Mario Vavti
2a2a4b96c7
more wiki cleanup
2016-12-15 10:56:16 +01:00
zotlabs
bae28965ab
issue #446 apps usability - disable app if attached to a plugin that is uninstalled, allow system apps to be soft deleted and undeleted from the edit pane.
2016-12-14 19:11:01 -08:00
Mario Vavti
f79c619065
wiki: do not show revert buttons if we do not have write perms and minor cleanup
2016-12-14 11:56:42 +01:00
Mario Vavti
028935a318
wiki: do not show revert buttons if we do not have write perms and minor cleanup
2016-12-14 11:55:52 +01:00
Mario Vavti
62353191e8
fix btn-group rendering
2016-12-14 09:57:22 +01:00
zotlabs
0394a3e939
tag and mention handling in private mail (which required refactoring the bbcode cleanup stuff in mod_item)
2016-12-13 20:01:38 -08:00
zotlabs
f111c5c325
mail preview (basic functionality)
2016-12-13 17:30:02 -08:00
jeroenpraat
2bcc41c851
update dutch strings
2016-12-13 23:45:01 +01:00
jeroenpraat
dce03a36d0
update dutch strings
2016-12-13 23:37:03 +01:00
Mario Vavti
b24b3d21e1
dropdown position fixes
2016-12-13 11:24:29 +01:00
Mario Vavti
556e507f68
dropdown position fixes
2016-12-13 11:24:03 +01:00
Mario Vavti
29bf6e5d32
bring lockview to wikilist
2016-12-13 11:15:05 +01:00
Mario Vavti
0927af40c3
bring lockview to wikilist
2016-12-13 11:14:22 +01:00
Mario Vavti
c434d98365
do not increase opacity to more than 1
2016-12-13 10:24:30 +01:00
Mario Vavti
0979f11cc3
do not increase opacity to more than 1
2016-12-13 10:23:56 +01:00
Mario Vavti
68bdd26426
simplify wikilist widget
2016-12-13 10:09:56 +01:00
Mario Vavti
342c4384e4
simplify wikilist widget
2016-12-13 10:09:26 +01:00
Mario Vavti
a2c5e30011
wiki: indicate saved state for bbcode type
2016-12-12 13:09:27 +01:00
zotlabs
e06647b54e
some preliminary work for email notification of likes - potentially destabilising so disabled until after next release
2016-12-11 17:54:03 -08:00
Mario Vavti
0a21ffbfec
show doc section heading in titlebar
2016-12-11 21:43:27 +01:00
Mario Vavti
65a26958f7
fix embed-image for fullscreen mode and some adjustments for /help
2016-12-10 21:33:29 +01:00
Mario Vavti
2dfb4d0c17
fix typo and do not do anything on resize if not fullscreen
2016-12-10 17:35:05 +01:00
Mario Vavti
368ad332a0
even more wiki fullscreen optimisation
2016-12-10 17:17:11 +01:00
Mario Vavti
bde32eb7df
more wiki fullscreen optimisation
2016-12-10 15:51:55 +01:00
Mario Vavti
dc64556902
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-12-10 15:08:54 +01:00
Mario Vavti
0315077daf
wiki fullscreen optimisation
2016-12-10 15:08:49 +01:00
git-marijus
7237bacec0
Merge pull request #617 from anaqreon/doco
...
Only display h1 headings in sticky side nav. Toggle display of detail…
2016-12-10 15:06:10 +01:00
phellmes
5fa6b07e1b
Update DE translation strings
2016-12-10 13:49:08 +01:00
Andrew Manning
6668fe02aa
Only display h1 headings in sticky side nav. Toggle display of detailed TOC at top of page. Introduce return to top button for small screens.
2016-12-09 22:18:23 -05:00
Andrew Manning
cafa5217ed
Condense sticky nav TOC to h1 only. Add deep TOC to top of each page. Adjust developer guide headings.
2016-12-08 21:41:04 -05:00
Andrew Manning
bc16a1bcc4
Merge remote-tracking branch 'upstream/dev' into doco
2016-12-08 21:16:49 -05:00
Andrew Manning
2865ad5281
Replace Hubzilla with $Projectname more. Revise code block side-scroll
2016-12-08 21:12:05 -05:00
zotlabs
33d75ad7b0
Report the WebDAV endpoint on the settings page (under the reddress) if the account techlevel suggests the viewer isn't going to run away screaming and have epileptic seizures when they see the term 'WebDAV'.
2016-12-08 18:06:31 -08:00
zotlabs
b90b9bb472
Merge pull request #614 from mjfriaza/dev
...
Translated new strings into es_ES
2016-12-08 06:06:20 +11:00
Manuel Jiménez Friaza
d019187895
Updated the Spanish translation
2016-12-07 10:08:02 +01:00
Mario Vavti
3f6fe4f2be
translateable string
2016-12-04 15:10:54 +01:00
Mario Vavti
bb7680dc51
implement content type in wiki list
2016-12-04 15:07:03 +01:00
Mario Vavti
b12d4c03cb
fixes for toc bbcode and bbcode wiki toc
2016-12-04 12:51:23 +01:00
zotlabs
3152d039a5
Merge pull request #609 from mjfriaza/dev
...
Updated the Spanish version
2016-12-04 07:46:48 +11:00
Manuel Jiménez Friaza
7347b72010
Updated the Spanish translation
2016-12-03 12:49:56 +01:00
Mario Vavti
ce0ba8edbd
fix embed image for text/bbcode
2016-12-02 12:27:59 +01:00
Mario Vavti
de503bf5c4
use highlight in ac-list for hl bbcode
2016-12-01 15:06:39 +01:00
Mario Vavti
523f7652f2
whitespace fixes
2016-12-01 14:38:04 +01:00
Mario Vavti
adb9f31803
more wiki cleanup
2016-12-01 11:38:49 +01:00
Mario Vavti
d7f655dfc5
wiki cleanup - wip. please watch out for eventual regressions
2016-12-01 11:24:35 +01:00
Andrew Manning
3f838e1dbc
Merge remote-tracking branch 'upstream/dev' into doco
2016-11-30 21:22:51 -05:00
Mario Vavti
afffbb6487
go live with wiki mimetypes - you can now choose if a wiki will contain markdown or bb-code markup
2016-11-30 13:30:50 +01:00
zotlabs
7b31e5918e
provide role on siteinfo page
2016-11-29 19:51:42 -08:00
Andrew Manning
50a8ba8c18
Merge remote-tracking branch 'upstream/dev' into doco
2016-11-29 22:13:24 -05:00
Andrew Manning
b32bce9be2
Major changes to accordion nav menu. Table of contents auto-generated below the loaded page. Removed manual TOCs from individual pages. TOC uses jQuery plugin Sticky to remain visible when it would scroll out of view.
2016-11-29 22:08:19 -05:00
zotlabs
8c87f32b38
This isn't the most elegant solution as it requires a bit of arcane knowledge, but provide a way to step through connections with a specific tab/panel open in the connection editor. It does not close the default panel, but merely opens the one specified by a §ion= URL parameter (closing the default panel would require a major refactoring of the default panel logic). Valid choices for section currently are affinity, filter, and perms. This tab/panel selection should persist across form posting and 'prev/next'.
2016-11-29 18:41:34 -08:00
zotlabs
d757dd4e17
provide a fresh new look and cleaner layout and more relevant information to siteinfo
2016-11-29 15:47:38 -08:00
zotlabs
175ae58563
highlight
2016-11-29 14:27:55 -08:00
Mario Vavti
f9b732482d
some basic work for implementing mimetypes for wikis
2016-11-28 15:24:49 +01:00
git-marijus
683a09781a
Merge pull request #602 from anaqreon/doco
...
Update context help content and context page element focus feature.
2016-11-28 13:44:41 +01:00
Mario Vavti
d8774cda8e
minor cleanup and remove more double encoding
2016-11-28 11:54:36 +01:00
Mario Vavti
1ce4eda0b9
wiki: move delete page functionality to the widget
2016-11-28 11:29:10 +01:00
Andrew Manning
5bcb373c00
Use the jquery.toc.js library to auto-generate a table of contents for the loaded page under the side nav menu
2016-11-27 21:25:38 -07:00
Andrew Manning
d96ab7c867
Update wiki context help. Modify context page element focus feature to do nothing if the target DOM element is not found.
2016-11-26 20:29:53 -07:00
Mario Vavti
68fd1c28b0
rearrange buttons
2016-11-25 11:47:39 +01:00
zotlabs
08a4bbb7d0
prev-next navigation for mod_connedit
2016-11-24 15:08:31 -08:00
Mario Vavti
1596391a2e
missing semicolon
2016-11-23 14:03:16 +01:00
Mario Vavti
0ff24b6f21
whitespace and minor fixes
2016-11-23 13:49:24 +01:00
Mario Vavti
6cf8ca5e43
whitespace and minor fixes
2016-11-23 13:38:27 +01:00
Andrew Manning
f14ef10e48
Toggle save button depending on editor changes and return to editor instead of history pane after saving
2016-11-23 06:22:50 -05:00
Mario Vavti
d1af4a5582
do not use nested section-content-wrapper class
2016-11-22 15:33:10 +01:00
Mario Vavti
060982adb4
display wiki list on wiki landing page.
2016-11-22 11:30:04 +01:00
zotlabs
69123590fb
Merge pull request #595 from git-marijus/dev
...
move the remote user homebutton to the user menu. this way everything…
2016-11-21 06:31:07 +11:00
git-marijus
66a35e973c
Merge pull request #593 from mjfriaza/dev
...
Updated ES-ES: better revision of some plugins
2016-11-20 15:42:07 +01:00
Mario Vavti
9d1443bbfe
move the remote user homebutton to the user menu. this way everything remote user related is in one place.
2016-11-20 15:38:36 +01:00
Manuel Jiménez Friaza
38543ad202
Updated ES-ES: better revision of some plugins
2016-11-20 10:21:47 +01:00
zotlabs
81e51dcafd
Merge pull request #592 from mjfriaza/dev
...
Updated the Spanish translation and fixed a grammatical concordance error at file connedit in Spanish contextual help
2016-11-19 22:48:14 +11:00
Manuel Jiménez Friaza
d9b46587fe
Updated the Spanish translation
2016-11-19 11:18:51 +01:00
Andrew Manning
16281c626b
Hide all content if no wiki is selected except for a message saying to choose one.
2016-11-18 22:10:55 -05:00
Andrew Manning
d24e867603
Move page list back out to the side menu, but with the new page form below the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case.
2016-11-18 21:55:29 -05:00
Andrew Manning
d5c14a513d
Wiki pages display in tab to the left of the edit pane tab. Home is always first in the list.
2016-11-18 21:25:40 -05:00
Andrew Manning
f9b836027d
Merge branch 'dev' into wiki-gui
2016-11-18 18:51:02 -05:00
Mario Vavti
3147b7c62b
revert simple checkbox
2016-11-18 14:15:01 +01:00
Mario Vavti
0ceb75ea09
add a simple checkbox template for use in widgets
2016-11-18 13:55:48 +01:00
Andrew Manning
3cb138ea41
move commit message and save button into edit pane. Change page list tab label to Pages and move current page name back to section header.
2016-11-18 06:04:00 -05:00
Andrew Manning
9016ba0d61
Remove page widget completely. Render the page list in a tab alongside History Edit and renamed View tabs. Move new page form below new page button within this page list tab.
2016-11-17 20:38:07 -05:00
Mario Vavti
0b0e0f8f43
wiki list fixes
2016-11-17 14:17:26 +01:00
Andrew Manning
20db8bbe2e
Highlight active wiki in list in preparation for removing active wiki name from content section header to make room for page list viewer
2016-11-17 05:58:26 -05:00
Andrew Manning
154923ca7d
Merge remote-tracking branch 'upstream/dev' into wiki-gui
2016-11-17 05:33:09 -05:00
Mario Vavti
a34d636366
remove redundant comma
2016-11-17 11:30:11 +01:00
Mario Vavti
89ad259050
configure ace with setOptions, get rid of redundant scrollbars
2016-11-17 11:11:11 +01:00
Andrew Manning
db1ae80877
Hide edit dialog if new wiki dialog opens
2016-11-16 20:46:30 -05:00
Andrew Manning
7aa712a481
Create wiki edit dialogs directly underneath the wiki name in the wiki list
2016-11-16 20:38:06 -05:00
Andrew Manning
748c894450
Move new wiki dialog directly underneath new wiki button in wiki list widget
2016-11-16 20:16:46 -05:00
Mario Vavti
de421d02ef
remove print margin and set wrap mode to free
2016-11-16 14:57:18 +01:00
Mario Vavti
da390ff573
remove redundant function call
2016-11-16 14:28:36 +01:00
Mario Vavti
14cfa90d63
use modal-lg instead of width 80%
2016-11-16 14:17:10 +01:00
Mario Vavti
90a97ae35f
minor wiki changes
2016-11-16 13:14:46 +01:00
zotlabs
0f5a166cce
still a bit of wiki permission weirdness, this should catch the major ones
2016-11-15 02:12:30 -08:00
zotlabs
d59f450819
use same icon with rest of app
2016-11-15 00:53:13 -08:00
zotlabs
e0a702df76
wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app.
2016-11-15 00:50:31 -08:00
Andrew Manning
1985502894
Merge remote-tracking branch 'upstream/dev' into wiki
2016-11-14 20:47:38 -05:00
Andrew Manning
c3e3c32bdc
Moved delete wiki button into new edit wiki form, opened by edit wiki icon in wiki list
2016-11-14 20:45:04 -05:00
Andrew Manning
f5ad1dfbc5
Moved new wiki and new page buttons to widgets
2016-11-14 19:58:43 -05:00
phellmes
4bf1d0373d
Update DE translation strings
2016-11-14 13:14:33 +01:00
Mario Vavti
192df273cc
show wiki controls only to owner and whitespace fixes
2016-11-14 12:01:16 +01:00
Andrew Manning
4b624ab5da
Bring Ace editor into focus when Edit tab is clicked to allow immediate text entry.
2016-11-12 19:34:42 -05:00
Andrew Manning
da5b9d5c74
Removed wiki list dropdown menus, moving the download and delete icons to beside the open wiki link.
2016-11-12 15:24:22 -05:00
Andrew Manning
af11525338
Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved page tools in there as well as new page and new wiki
2016-11-12 14:42:21 -05:00
Andrew Manning
98b71bc63a
Move save button to tab bar
2016-11-12 11:40:56 -05:00
Andrew Manning
271244bb36
Wiki control dropdown menu improvement
2016-11-12 08:06:18 -05:00
zotlabs
127ed1b188
typo when consolidating icons
2016-11-08 15:33:15 -08:00
zotlabs
f74f7d543e
use a single icon
2016-11-08 11:29:42 -08:00
zotlabs
72caf2ef9d
let's use the bar-chart icon for voting to make the look consistent with the event attendance button and hint at its function
2016-11-07 19:10:35 -08:00
zotlabs
5ef05d3a63
distinguish the buttons for voting and attendance by adding a calendar icon to the button used for attendance
2016-11-07 19:00:22 -08:00
zotlabs
c427fe94da
cleanup and re-organise the voting and attendance buttons
2016-11-07 18:29:38 -08:00
zotlabs
66c07a8b33
reorganise emoticons
2016-11-06 20:31:37 -08:00
Mario Vavti
471d88c1d2
some fixes for the recent changes in the personal menu dropdown
2016-11-04 21:29:23 +01:00
Andrew Manning
8ac32cf4d6
Collapse navbar-collapse-1 if avatar menu is clicked.
2016-11-03 21:01:18 -04:00
zotlabs
ae092efb49
provide merged usermenu div for all server roles
2016-11-02 20:22:48 -07:00
zotlabs
9e2ccbd2a7
convert manual page updates to a display setting instead of a feature
2016-11-02 18:40:50 -07:00
zotlabs
f91031bd65
allow your own likes/comments to be updated when in static update mode
2016-11-02 15:48:29 -07:00
git-marijus
5d3e04216d
Merge pull request #574 from zotlabs/static_update
...
feature: static page update as opposed to live update of conversation…
2016-11-02 16:12:05 +01:00
zotlabs
055d55b71b
retry liveupdate up to 10 times if we receive incomplete/truncated html data.
2016-11-01 21:39:49 -07:00
zotlabs
ca948d66a9
feature: static page update as opposed to live update of conversations on the page. Changes will be queued until the page is reloaded. There may or may not be notifications of pending activity updates depending on your notification preferences. Endless scrolling (append) is still performed either way. This only affects changed and new/unseen items being inserted into the page.
2016-11-01 20:21:39 -07:00
phellmes
01b8ed97ed
update DE translation strings
2016-11-01 16:38:16 +01:00
zotlabs
581ef6e18d
string update
2016-10-30 12:34:00 -07:00
Mario Vavti
6174aa01e0
add embed bbcode to the autocomplete list
2016-10-30 13:43:47 +01:00
Mario Vavti
fb7692cf9c
fix https://zothub.de/display/9d9078d212862c5f58
2016-10-30 13:36:34 +01:00
Mario Vavti
9279840860
fix https://zothub.de/display/9d9078d212862c5f58
2016-10-30 13:34:47 +01:00
zotlabs
d46fe20986
modernise chanview, which has a renewed purpose - to provide a connect link to foreign network members. The iframe no longer works due to content security policies, and people hated this with a passion anyway; so just provide a URL to visit.
2016-10-26 21:50:30 -07:00
zotlabs
0b5d550780
Merge pull request #565 from anaqreon/wiki-download
...
Add wiki download button to export the selected wiki repo to a zip file
2016-10-23 07:28:38 +11:00
Mario Vavti
5fb173149a
provide lockstate for events and remove obsolete code
2016-10-22 20:44:41 +02:00
Andrew Manning
02cf7274d2
Add wiki download button to export the selected wiki repo to a zip file
2016-10-22 08:52:26 -04:00
zotlabs
9fea44cbc3
better fix for navbar channel autocomplete, refrain from search until a minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results.
2016-10-21 18:15:44 -07:00
zotlabs
2a59f45a3b
Change the behaviour of 'use existing photo for profile'. For a channel with one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case.
2016-10-18 18:30:50 -07:00
zotlabs
2db7b2d948
change event behaviour - share by default.
2016-10-18 16:46:09 -07:00
zotlabs
a7fd4e96f1
issue #549 , ACL has 'public' selected even when restrictive ACL is being used.
2016-10-17 23:39:53 -07:00
zotlabs
f31ef3420d
issue #549 , ACL has 'public' selected even when restrictive ACL is being used.
2016-10-17 20:52:02 -07:00
Mario Vavti
cf547be1d6
Merge branch '1.14RC'
2016-10-12 12:13:44 +02:00
Mario Vavti
73d67bb16a
fix connected time not shown on ajax loaded connections
2016-10-12 11:00:33 +02:00
Mario Vavti
050c0752f9
fix connected time not shown on ajax loaded connections
2016-10-12 10:59:19 +02:00
zotlabs
50f579d301
Provide better explanation of server_roles in the config template
2016-10-09 21:01:41 -07:00
zotlabs
134b9fc466
don't show diaspora protocol info in the hcard if the diaspora protocol is not installed. This really needs to be moved to the plugin but this was a quick fix.
2016-10-08 15:30:06 -07:00
redmatrix
bf02e04283
merge usermenu and caret when using pro
2016-10-06 17:41:52 -07:00
jeroenpraat
411d7aa6c4
Updating strings for it, nl and es..
2016-10-05 22:29:57 +02:00
jeroenpraat
d0e9b4ce9f
Updating strings for it, nl and es.
2016-10-05 22:18:50 +02:00
redmatrix
cef1aa6d1b
add some more stuff to admin/account_edit (service class, language, and techlevel if appropriate). Fix en-au and en-gb so they are listed as languages, and move language selector stuff to include/language.php instead of include/text.php; new file Zotlabs/Lib/Techlevels.php so we only need to write the selection array once.
2016-10-03 17:16:24 -07:00
redmatrix
ad309f1036
provide ability for admin to change account password
2016-09-30 15:42:14 -07:00
Mario Vavti
5d2cf3d23c
omit autoscrolling to toplevel items
2016-09-29 11:55:41 +02:00
Mario Vavti
3c9809bfe6
highlight the displayed mid and css fixes
2016-09-29 11:28:27 +02:00
Mario Vavti
c530b4fb97
fixes for make scroll to mid work properly with collapsed threads: unhide the hidden items before scrolling to it, slideDown() is to slow - we must use show() here)
2016-09-29 11:07:53 +02:00
Mario Vavti
68cb4baeb3
do not scroll items behind the navbar
2016-09-27 14:11:55 +02:00
Mario Vavti
c28ba24525
remove logging
2016-09-27 14:00:49 +02:00
Mario Vavti
fc18bea4bd
catch js error if the notification mid is for e.g. a like and class .item_123def... does not exist
2016-09-27 14:00:04 +02:00
Mario Vavti
8bf03d21cd
catch js error if there are no collapsed comments
2016-09-26 11:26:13 +02:00
Mario Vavti
62229d0a49
use color #337AB7 instead aof bold and 120% for ivoted class
2016-09-26 10:48:42 +02:00
redmatrix
7e59c70a9f
autoscroll to target post/comment when in single-thread mode; don't interfere with other modes; replaces using a named anchor with a url fragment to reach a particular place in the conversation when content is loaded with ajax.
2016-09-25 23:09:08 -07:00
redmatrix
bba7fe24e9
subtle indicator of your own response verb activity
2016-09-25 20:34:36 -07:00
redmatrix
bfc2552841
more infrastructure for notification auto-scroll to comment
2016-09-24 20:10:20 -07:00
redmatrix
c04c57ea0f
the rest of the backend for supporting scroll-to-comment from notifications. We still need an ajax handler as fragments are evaluated before content is loaded.
2016-09-24 16:20:25 -07:00
git-marijus
4ffa408420
Merge pull request #529 from phellmes/dev
...
Update DE translation strings
2016-09-22 18:56:27 +02:00
Wave
c7ffe606a6
Merge pull request #530 from wave72/dev
...
Updated Italian strings
2016-09-22 17:24:42 +02:00
Wave72
26138ac46d
Updated Italian strings
2016-09-22 17:22:03 +02:00
phellmes
ed457ac694
Update DE translation strings
2016-09-22 13:45:49 +02:00
Mario Vavti
56aa568124
objects with id=share_container seem to be blacklisted in various security browser plugins. rename it to distr_container. also remove some superfluous js
2016-09-22 11:07:21 +02:00
Mario Vavti
3edbb564fc
fix #525
2016-09-22 09:43:11 +02:00
Mario Vavti
ab59479a0c
narrow navbar css fixes
2016-09-20 15:19:13 +02:00
Wave
661558dafc
Merge pull request #510 from wave72/dev
...
Updated Italian strings
2016-09-09 12:32:32 +02:00
Wave72
6467ce1a97
Updated Italian strings
2016-09-09 12:26:41 +02:00
Mario Vavti
04a76371fc
update justifiedGallery 3.6.1 -> 3.6.3
2016-09-09 09:58:18 +02:00
redmatrix
83b89b9576
pro: provide settings for techlevel and techlevel_lock on admin/site page
2016-09-08 00:50:53 -07:00
redmatrix
de03f7f9ce
photo move to another album - resurrected from a temporary branch where the work had gotten lost
2016-09-06 23:13:55 -07:00
redmatrix
1639f5b83d
add links to zcards #500 ; also provide drag/drop highlighting of comment regions when a link is being dragged over them
2016-09-05 17:08:48 -07:00
Mario Vavti
df91b489c4
revert moving home button to first position. instead move register and login buttons to the end of the list.
2016-09-03 09:15:55 +02:00
redmatrix
904881e207
pro: allow admin to set a site techlevel and optionally lock it.
2016-09-02 16:08:30 -07:00
Mario Vavti
b00d084243
show home icon in first position in nav, provide register link also if register policy is set to approve and whitespace cleanup
2016-09-02 15:05:19 +02:00
redmatrix
47dd1da6fb
put theme config into its own namespace
2016-09-01 22:20:08 -07:00
redmatrix
b3efdf2109
turn theme configuration into a class object
2016-09-01 22:10:56 -07:00
redmatrix
af87038150
separate the 'expert' feature into 'advanced_theming' and 'advanced_dirsearch'. Hide both features unless techlevel > 3.
2016-09-01 19:01:02 -07:00
redmatrix
720f1d7123
actively set all the theme options on the display settings page based on the current theme selection
2016-09-01 17:09:58 -07:00
redmatrix
678148b9aa
more work on theme select backend
2016-09-01 13:48:11 -07:00
redmatrix
2940f9591b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-01 12:45:13 -07:00
redmatrix
2ebb8851f6
theme preview - that was easy; plus a bit more tweaking of the saved search widget to try and get the sucker to auto submit
2016-09-01 12:42:47 -07:00
Mario Vavti
24192ff1ef
introduce checklist BBcode for checklists
2016-09-01 13:57:45 +02:00
redmatrix
6adb180911
even though there is now a sitesearch widget, remove it from the search page pdl since we can just use the navbar and it offers more modes.
2016-08-31 22:04:45 -07:00
redmatrix
fa8febbb31
some issues with saved search - tags and connection searches weren't being saved.
2016-08-31 21:57:08 -07:00
redmatrix
13c7fe46cd
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-31 17:51:23 -07:00
redmatrix
ea0be8ea1a
provide techlevels in the pro server role. Should have no visible effect on other roles.
2016-08-31 17:49:22 -07:00
jeroenpraat
38ea71c6c9
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-31 13:17:34 +02:00
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
git-marijus
1d455c21d4
Merge pull request #499 from mjfriaza/master
...
Add new page 'connedit' to Spanish context help & fixed a string in Spanish translation
2016-08-26 19:58:00 +02:00
Mario Vavti
8f631d0693
contact-block needs a class clear div at the end to not mess with following widgets and whitespace
2016-08-26 19:52:21 +02: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
Manuel Jiménez Friaza
0381102c27
Fixed a string in the Spanish translation
2016-08-25 12:20:53 +02:00
Manuel Jiménez Friaza
e81dccb14e
Fixed a string in the Spanish translation
2016-08-25 12:20:22 +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
jeroenpraat
f4507d878d
Spanish and Dutch strings
2016-08-22 19:45:46 +02: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
jeroenpraat
15d9bf4ebe
Updating Spanish and Dutch strings
2016-08-17 17:37:21 +02:00
phellmes
2b0c2891e3
Update DE translation strings
2016-08-17 10:39:21 +02: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
38de583db0
Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes.
2016-08-15 17:20:29 -07: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
Mario Vavti
6bb5ea7a81
Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC
2016-08-15 11:22:20 +02:00
Mario Vavti
057266653b
fix javascript error if not logged in
2016-08-15 11:20:51 +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
2755c74c29
btn/dropdown rendering issue
2016-08-14 11:31:44 +02:00
Mario Vavti
541d0dce90
btn/dropdown rendering issue
2016-08-14 11:31:00 +02:00
Mario Vavti
2c3843ee4c
remove js debugging
2016-08-13 22:28:40 +02:00
Mario Vavti
6f0ac133cc
remove js debugging
2016-08-13 22:27:53 +02:00
Mario Vavti
e5d1dd111e
fix #480 , enable bbcode autocomplete for photo comments and remove some redundant javascript
2016-08-13 22:20:54 +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
91b8c769bd
possible quickfix for multi-acl not honoring jotnets
2016-08-12 14:44:47 -07: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
jeroenpraat
24fa201218
Small, but important fix for Dutch
2016-03-08 01:47:01 +01:00
redmatrix
1a77fb4c1d
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-07 15:12:09 -08:00
redmatrix
d5db25808a
Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild.
2016-03-07 15:03:53 -08:00
Mario Vavti
6824fb9f93
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-07 21:48:12 +01:00
Mario Vavti
b2216f8203
prevent page jumping if the narrow navbar setting is used
2016-03-07 21:47:52 +01:00
jeroenpraat
0799a0a3be
Spanish and Dutch strings + fix es>es-es link
2016-03-07 20:29:14 +01:00
redmatrix
a2e0574fce
Merge pull request #312 from jeroenpraat/master
...
Redbasic: Fix the issue with derived themes and schemas
2016-03-08 06:03:55 +11:00
Jeroen van Riet Paap
68d7ab6b55
Merge pull request #308 from HaakonME/master
...
Updated Norwegian strings for Hubzilla.
@HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96
2016-03-07 19:53:58 +01:00
Jeroen van Riet Paap
4a2c805270
Merge pull request #310 from einervonvielen/updated_homeinstall_instructions
...
Updated readme.md for homeinstall script
2016-03-07 19:49:58 +01:00
Jeroen van Riet Paap
95f5f3d44d
Show only schema selector when Redbasic (so not a derived theme)
2016-03-07 17:06:10 +01:00
Jeroen van Riet Paap
7a5213cc8e
Set the schema to the default schema in derived themes.
...
See the documentation for creating derived themes how to override this.
2016-03-07 17:03:02 +01:00
Jeroen van Riet Paap
f1f19372ad
Update config.php
2016-03-07 17:01:12 +01:00
Tobias Luther
1c6faa3a00
Added Link to TOS to EMail templates targeting members
2016-03-06 18:45:43 +01:00
Haakon Meland Eriksen
a1e4940bea
Merge remote-tracking branch 'upstream/master'
2016-03-06 18:33:28 +01:00
root
287ffe93f6
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-06 17:24:15 +01:00
root
2407379623
Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://github.com/einervonvielen/hubzilla
2016-03-06 17:19:33 +01:00
jeroenpraat
7162403292
Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more
2016-03-06 17:02:58 +01:00
jeroenpraat
004468f231
Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it's not clear that you can click on it to show something (the channel in this case).
2016-03-06 16:21:26 +01:00
Haakon Meland Eriksen
2d7e307e74
Updated Norwegian strings for Hubzilla
2016-03-05 14:11:56 +01:00
Mario Vavti
25ebac8d0b
show cover-photo upload link only for the default profile
2016-03-04 16:07:41 +01:00
Mario Vavti
edf6da7189
add cover photo upload link to edit profile
2016-03-04 15:44:33 +01:00
Mario Vavti
d3491c9165
fix jot form
2016-03-03 13:46:08 +01:00
Mario Vavti
8ca877bdd3
slide up cover on click
2016-03-03 12:31:49 +01:00
Mario Vavti
b704f977da
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-03 12:08:21 +01:00
Mario Vavti
59e04aed1b
move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.
2016-03-03 12:07:58 +01:00
redmatrix
6f4c45a489
UI cleanup for admin profile field management page
2016-03-02 15:36:14 -08:00
Jeroen van Riet Paap
aa62bad07b
little nl string fix
2016-03-02 15:33:18 +01:00
Mario Vavti
d3f2d2a2db
small fix to simple cover-photo
2016-03-02 14:30:33 +01:00
Mario Vavti
c5d08fd5fd
add a fade in effect to main while scrolling up cover photo
2016-03-02 13:33:18 +01:00
Mario Vavti
22729da2a2
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-02 12:31:46 +01:00
Mario Vavti
c97cc1487c
a simple cover-photo implementation for redbasic default template
2016-03-02 12:31:25 +01:00
redmatrix
428b4dbad6
sort out the with and howlong dependencies
2016-03-01 22:47:07 -08:00
redmatrix
548bf884a4
profile field admin page (functional only: still needs a lot of HTML/CSS cleanup)
2016-03-01 21:06:27 -08:00
redmatrix
a0baa480e3
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-01 15:01:48 -08:00
redmatrix
765dd5569b
Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
2016-03-01 14:55:04 -08:00
Mario Vavti
966d1586c0
fix js error and add id to field input block
2016-03-01 20:40:11 +01:00
Mario Vavti
4df78b06cf
fix padding
2016-03-01 15:11:15 +01:00
Mario Vavti
492609d20b
do not show empty buttons if not logged in
2016-03-01 14:41:14 +01:00
Mario Vavti
0f76af261c
another resize issue
2016-03-01 14:11:42 +01:00
Mario Vavti
9d00db06b2
fix resize issue
2016-03-01 14:03:34 +01:00
Mario Vavti
141f3e21b2
move preview content outside of editor space
2016-03-01 13:40:19 +01:00
Mario Vavti
fe6cbb414c
adjust padding
2016-03-01 13:32:18 +01:00
Mario Vavti
e13d65eea3
set line-height to initial
2016-03-01 13:29:59 +01:00
Mario Vavti
4d6050f8e5
another css fix
2016-03-01 13:22:19 +01:00
Mario Vavti
0ebce75c7d
css fixes to make jot look better with background colors or images
2016-03-01 13:09:04 +01:00
Mario Vavti
2d45f9f385
provide footer bbcode
2016-02-29 23:58:32 +01:00
Mario Vavti
d27a627c4f
simplify profile edit button(s) and make it useful for multiple profiles
2016-02-29 22:01:13 +01:00
jeroenpraat
55ab5360d9
update es-es. tested it and it works now. Don't know what happened earlier.
2016-02-29 19:36:53 +01:00
jeroenpraat
60b818eb24
revert es-es update. something went wrong. later today I will examine what.
2016-02-29 09:07:29 +01:00
jeroenpraat
69c6d8b617
update es-es strings
2016-02-28 17:33:22 +01:00
redmatrix
44797fe988
Merge pull request #302 from phellmes/de20160227
...
Update DE translation strings
2016-02-28 09:57:04 +11:00
jeroenpraat
df69465357
update NL strings
2016-02-27 15:56:45 +01:00
phellmes
e4361cb202
Update DE translation strings
2016-02-27 14:28:06 +01:00
Mario Vavti
58cf9d832c
make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment.
2016-02-27 12:31:07 +01:00
Mario Vavti
df57c90d2d
several photo item template fixes
2016-02-26 14:25:18 +01:00
Mario Vavti
b2474334a7
provide an edit button for the profile page
2016-02-25 22:50:16 +01:00
Mario Vavti
be27fb5644
we have got a button for events in the nav. no need for it in the tabs if we are local.
2016-02-25 13:40:15 +01:00
redmatrix
43521bb10b
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-24 18:56:04 -08:00
redmatrix
c95d7c69eb
issue #216 - calendar sharing
2016-02-24 18:54:52 -08:00
jeroenpraat
f12b0fe316
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-02-25 02:05:16 +01:00
jeroenpraat
8944d7a7a2
another dutch update
2016-02-25 02:03:58 +01:00
redmatrix
6300f47cdc
schema change to support channel move (a completely different operation than channel clone)
2016-02-24 17:00:16 -08:00
redmatrix
2b95580cc0
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-24 16:41:46 -08:00
jeroenpraat
93b84f1262
interim dutch string update
2016-02-25 01:39:50 +01:00
Mario Vavti
9d3ce55978
fix boxy scheme
2016-02-25 00:24:58 +01:00
redmatrix
7e6febe2a6
add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled
2016-02-24 15:19:28 -08:00
Mario Vavti
e73df9ed1d
give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to much of the text in some situations
2016-02-24 23:16:42 +01:00
Wave
f15a06c0c2
Merge pull request #296 from wave72/master
...
Updated Italian strings
2016-02-23 11:55:23 +01:00
Paolo Tacconi
ab89eb050a
Updated Italian strings
2016-02-23 11:52:45 +01:00
Mario Vavti
dd6e3d873d
some work on mod/register
2016-02-22 13:04:48 +01:00
redmatrix
2c3bec3d7c
Merge pull request #291 from phellmes/de201602201300
...
Update DE strings
2016-02-22 12:43:15 +11:00
jeroenpraat
1fcc863298
There was nothing wrong with my pimped pubsites (was another problem). Took the opportunity to update schemas. Plus updated spanish and dutch strings.
2016-02-21 23:00:12 +01:00
jeroenpraat
0c5a2925ad
Pimped the pubsites page. I tried to get this into a .tpl-file, but it was to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page.
2016-02-21 19:31:11 +01:00
Mario Vavti
22f172d697
grid->network, whitespace and bootstrapify create button
2016-02-20 14:01:20 +01:00
phellmes
fe9abcfaae
Update DE strings
2016-02-20 13:47:25 +01:00
Mario Vavti
fbc6c60805
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-02-19 22:28:57 +01:00
Mario Vavti
02e82e496e
pimp up mod new_channel
2016-02-19 22:28:21 +01:00
redmatrix
8e586008dd
issue #287 require old password to change password
2016-02-19 13:18:51 -08:00
jeroenpraat
33c34984e6
h1>h2 (thanks to Mario) and help text below label on register page (like on new channel).
2016-02-18 19:48:11 +01:00
jeroenpraat
fe392a3144
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
2016-02-18 16:53:04 +01:00
Wave
eeed7077ca
Merge pull request #286 from wave72/master
...
updated Italian strings
2016-02-18 15:06:19 +01:00
Paolo Tacconi
dba1854837
updated Italian strings
2016-02-18 15:01:53 +01:00
Mario Vavti
ddbe3c7426
make always preload images before rendering the page a display setting
2016-02-17 12:32:12 +01:00
Mario Vavti
b8c7b2f81d
more refinement on collapsing
2016-02-17 11:07:47 +01:00
jeroenpraat
f738902107
@hubdomain also for auto-create-channel + adding css wrapper (ongoing work)
2016-02-16 21:46:24 +01:00
Mario Vavti
364972a292
Thats probably better but there are still edge cases...
2016-02-16 21:29:09 +01:00
Mario Vavti
0eb0256502
typo
2016-02-16 21:02:28 +01:00
Mario Vavti
679fb7d0d2
content -> viewport
2016-02-16 20:58:10 +01:00
Mario Vavti
45247d1595
only prefetch images on update_mode update
2016-02-16 20:53:38 +01:00
Mario Vavti
3be6ef6bfc
since we preload images now we also can collapse and calculate posts above the viewport
2016-02-16 14:42:13 +01:00
redmatrix
c5827c8b4f
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-15 20:33:10 -08:00
redmatrix
bb381daae3
update fr strings from transifex
2016-02-15 20:32:42 -08:00
Mario Vavti
afb86aa908
clean up some unused stuff and start loading content a bit earlier
2016-02-15 22:20:55 +01:00
redmatrix
d3c779f635
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-14 16:17:15 -08:00
redmatrix
4f285911f0
form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl
2016-02-14 16:15:55 -08:00
jeroenpraat
8ccddfefd9
Spanish and Dutch string update
2016-02-14 16:18:03 +01:00
Mario Vavti
0b487122f6
tryout: introduce loading of images before rendering content and provide some detailed logging in js-console
2016-02-12 11:00:50 +01:00
jeroenpraat
bcb94f8238
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-02-09 16:15:49 +01:00
jeroenpraat
1d2260b44e
Castellano and Nederlands string updates
2016-02-09 16:15:20 +01:00
phellmes
97be144913
[invite module] update UI template
2016-02-09 14:07:54 +01:00
redmatrix
f984502499
need to re-arrange a few things for a short vcard
2016-02-08 19:33:25 -08:00
redmatrix
315ce6d880
lots more zcard tweaks
2016-02-08 18:16:42 -08:00
redmatrix
3da8f9b13c
duplicated lines in en config file
2016-02-08 14:51:03 -08:00
redmatrix
a14b87baf2
make yet another recommended security header optional - this time because of piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
2016-02-08 14:48:11 -08:00
Mario Vavti
48963f62f9
avoid collapsing only above the viewport
2016-02-08 22:19:38 +01:00
redmatrix
00ae6bdac6
a few tweaks to uno settings page to allow a default ACL to be created
2016-02-07 21:06:17 -08:00
redmatrix
ec950de205
block public was still referenced in admin/site template
2016-02-07 15:44:42 -08:00
redmatrix
62e7fa6a23
update UI template for 'mood' module
2016-02-07 15:38:54 -08:00
redmatrix
a5c111ef4f
uno stuff
2016-02-05 23:13:33 -08:00
redmatrix
9cf105f8ea
initial uno config
2016-02-04 23:58:31 -08:00
redmatrix
bfeb89075f
comment buttons hook
2016-02-04 19:06:11 -08:00
redmatrix
d586f64e40
update the poke page layout and UI
2016-02-04 18:35:40 -08:00
redmatrix
c75f76f740
heavy lifting on admin security page
2016-02-03 20:24:46 -08:00
redmatrix
28386d7471
admin security page for configuring white and black lists and other security options.
2016-02-03 15:23:24 -08:00
redmatrix
06dcaaa821
some zcard cleanup - still eneds a lot more work
2016-02-02 17:14:07 -08:00
Wave
88669fa033
Merge pull request #271 from wave72/master
...
Updated Italian strings
2016-02-02 16:59:03 +01:00
Paolo Tacconi
225aa28a1b
Updated Italian strings
2016-02-02 16:52:25 +01:00
Mario Vavti
f1245206ce
change aside width to reflect recent widget style changes
2016-02-02 12:40:40 +01:00
redmatrix
7f453949a1
minor tweaks
2016-02-01 23:09:45 -08:00
redmatrix
5f5342c0d3
adjust for folks that still have 175px profile photos
2016-02-01 21:21:22 -08:00
redmatrix
15e003f030
missing template
2016-02-01 21:14:36 -08:00
redmatrix
723a49ccee
add photos to the profile "likes this" dropdowns
2016-02-01 17:42:53 -08:00
jeroenpraat
1f87fef968
es-es+nl strings and fixing css maintained schemas
2016-01-30 23:44:45 +01:00
Mario Vavti
c8d0a2b4bb
one more css fix
2016-01-30 14:40:45 +01:00
Mario Vavti
385709853b
css fixes
2016-01-30 14:26:38 +01:00
Mario Vavti
0405a49df1
fix a slight regression
2016-01-30 13:47:58 +01:00
Mario Vavti
b6543beca2
do not make a difference if there are images or not for now
2016-01-30 01:34:27 +01:00
Mario Vavti
da198fdda5
more on collapsing
2016-01-30 01:28:01 +01:00
Mario Vavti
d7abacb7b2
it is not perfect but it still may ease the collapsing of items above the viewport a little...
2016-01-30 00:30:49 +01:00
Jeroen van Riet Paap
9a4cbc05a6
no trailing slash
2016-01-27 23:48:14 +01:00
Mario Vavti
722d7ff38d
lower caution level from danger to warning for ignore button
2016-01-27 09:46:18 +01:00
redmatrix
5d6657f77a
provide an icon to make 'add privacy group' stand out from the list of groups. Please revert if you think it's too messy.
2016-01-27 00:11:15 -08:00
redmatrix
9b08051703
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
2016-01-26 16:57:36 -08:00
jeroenpraat
68030d12cf
Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
2016-01-27 00:24:05 +01:00
redmatrix
9081ddb455
don't provide notification icons on manage page for delegated channels
2016-01-24 18:36:38 -08:00
jeroenpraat
845945e70a
es-es+nl string update
2016-01-24 15:31:08 +01:00
redmatrix
2be515e7bb
set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed.
2016-01-21 14:32:41 -08:00
jeroenpraat
55e9bd3660
A few minor tweaks in schemas + link to login form in lostpass
2016-01-21 22:02:31 +01:00
Mario Vavti
b711c050db
make contact block look widget alike
2016-01-21 11:48:10 +01:00
Mario Vavti
928f1bfa7b
css cleanup
2016-01-21 10:58:38 +01:00
Mario Vavti
97ebf9021c
bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image
2016-01-21 10:42:20 +01:00
redmatrix
b380b618bc
db_type not present in international config file templates issue #259
2016-01-18 14:42:03 -08:00
redmatrix
3b18c82c88
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-17 16:51:06 -08:00
redmatrix
be83855acf
generalise the site icon
2016-01-17 16:50:37 -08:00
jeroenpraat
819a331c4a
update es-es and nl strings. adjusted a few matrix to grid strings
2016-01-17 20:03:26 +01:00
Mario Vavti
0d5daea93d
move dir total ratings button to the left to prevent the connect button beeing shifted on channels with ratings
2016-01-16 21:30:57 +01:00
Mario Vavti
2498df68c7
change button order for consistency
2016-01-15 13:20:45 +01:00
Mario Vavti
d36aa4fc89
provide a recent activity link in /connections
2016-01-15 12:08:04 +01:00
Mario Vavti
f4e1b2123a
add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...
2016-01-15 11:28:05 +01:00
Mario Vavti
63ee0daac5
provide more contact infos and update some protocol type definitions
2016-01-15 10:42:44 +01:00
Mario Vavti
614dcb8bce
since the perms will be reset on approval better do not provide the perms tool before we approved a connection
2016-01-14 23:38:00 +01:00
Mario Vavti
588d022fbb
provide some info about our contacts - status (archived, hidden, etc.), public forum (like in directory) and show since when we are connected
2016-01-14 23:23:12 +01:00
Mario Vavti
9f9fdc1434
bring back opacity for archived contacts
2016-01-14 14:00:02 +01:00
Mario Vavti
e2b79c34bc
some work on connections
2016-01-14 13:50:47 +01:00
Mario Vavti
69573c6afe
some template work on follow widget
2016-01-14 10:36:45 +01:00
redmatrix
e500a08f15
more progress on cover photo cropping and storage
2016-01-13 20:26:27 -08:00
redmatrix
9584ca080c
some initial work on uploading and cropping cover photos
2016-01-13 17:32:09 -08:00
Einer von Vielen
f510cd3111
.
2016-01-13 23:46:31 +01:00
redmatrix
86b550e43e
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-13 01:36:08 -08:00
redmatrix
3bf9dc9f18
more work on auto channel creation during register
2016-01-13 01:17:02 -08:00
Mario Vavti
0ca7aa8c09
20em is to big for mobile use
2016-01-13 09:39:46 +01:00
redmatrix
bff33a98ce
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-11 16:37:29 -08:00
redmatrix
66c8658898
plugin version compatibility checking. To use, set MinVersion, MaxVersion or MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way.
2016-01-11 16:34:12 -08:00
Wave
42b35c5ac9
Merge pull request #253 from wave72/master
...
Italian strings updated
2016-01-11 11:02:09 +01:00
Paolo Tacconi
04180985cb
Italian strings updated
2016-01-11 10:55:51 +01:00
redmatrix
f4d47f825d
revert lost link
2016-01-10 20:38:47 -08:00
redmatrix
44137be88d
Merge pull request #252 from einervonvielen/homeinstall
...
installation script for debian next to a router at home
2016-01-11 15:38:07 +11:00
jeroenpraat
e51035ba9a
String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html
2016-01-10 20:45:39 +01:00
Einer von Vielen
51f34b6b07
indexed
2016-01-10 18:24:15 +01:00
redmatrix
93565ea768
features management page for hubmins
2016-01-06 13:01:28 -08:00
Wave
c3e2505b66
Merge pull request #248 from wave72/master
...
Updated Italian strings
2016-01-04 14:26:09 +01:00
Paolo Tacconi
c7cc595906
Updated Italian strings
2016-01-04 14:18:52 +01:00
jeroenpraat
9e6f43e3ff
added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file
2016-01-03 21:56:39 +01:00
redmatrix
5b0a17359d
Provide the ability for a hub admin to specify a default permissions role for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired.
2016-01-02 23:39:57 -08:00
jeroenpraat
1ad90b8662
Update es+nl strings and added title on hover for items (needed to view titles that are cut-off)
2016-01-02 15:14:30 +01:00
redmatrix
c38edfcb32
issue #241 (redmatrix issue 405)
2016-01-01 16:12:43 -08:00
jeroenpraat
405725875d
nl+es-es string update
2015-12-29 22:09:47 +01:00
Andrew Manning
3d6359f2e7
Removed defunct URL from old auto-update idea
2015-12-26 16:20:56 -05:00
redmatrix
31fbd19c86
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-25 14:32:16 -08:00
redmatrix
a085f4df7f
regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.
2015-12-25 14:25:58 -08:00
jeroenpraat
cd2c6779b7
update es-es strings
2015-12-25 17:37:05 +01:00
redmatrix
d39cd088a1
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-24 14:41:47 -08:00
jeroenpraat
7d5e066056
After reading and talking with experts I came to the conclusion that es-es and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960
2015-12-24 15:29:52 +01:00
jeroenpraat
ba920260b8
reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958 .
2015-12-23 19:18:46 +01:00
jeroenpraat
2988d96cf0
Spanish language codes. See issue #234
2015-12-23 16:41:22 +01:00
redmatrix
36717e5f32
start on refactor of plugin/theme/widget info block parsing
2015-12-22 19:53:00 -08:00
jeroenpraat
4dff54bcb8
update es+nl strings
2015-12-22 19:29:52 +01:00
redmatrix
f23e8f8d41
merge hell
2015-12-20 14:55:43 -08:00
Haakon Meland Eriksen
6409237b29
Updated Norwegian strings for Hubzilla
2015-12-20 14:42:14 +01:00
Haakon Meland Eriksen
1cfb83f003
Merge remote-tracking branch 'upstream/master'
2015-12-20 14:09:30 +01:00
Wave
e2692a4baa
Merge pull request #230 from wave72/master
...
Updated Italian strings
2015-12-20 10:17:55 +01:00
wave72
474a1267d7
Updated Italian strings
2015-12-20 10:08:43 +01:00
Haakon Meland Eriksen
628e565a6c
Merge remote-tracking branch 'upstream/master'
2015-12-18 16:04:07 +01:00
Mario Vavti
f78e9001f3
fix search item attachment rendering
2015-12-17 19:39:26 +01:00
zottel
020fea3031
update to German strings
2015-12-16 14:00:23 +01:00
Wave
871ee0f571
Merge pull request #222 from wave72/master
...
Updated Italian strings
2015-12-16 09:13:40 +01:00
Paolo Tacconi
933e105f32
Updated Italian strings
2015-12-16 09:00:27 +01:00
jeroenpraat
5a59cd9b8c
Invitation only added to the admin site page. Plus css wrapper class to docu search.
2015-12-15 21:00:40 +01:00
Haakon Meland Eriksen
3b1ab5e79c
Merge remote-tracking branch 'upstream/master'
2015-12-14 18:55:43 +01:00
jeroenpraat
04d3ac9aaf
es+nl strings update
2015-12-12 17:01:43 +01:00
Haakon Meland Eriksen
565126a888
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-12 10:00:15 +01:00
Haakon Meland Eriksen
e7d9863432
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-11 19:40:09 +01:00
Haakon Meland Eriksen
b9af0645c2
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-11 19:34:29 +01:00
redmatrix
f73c82632f
some minor cleanup - change the default of the discover tab (public stream access)
2015-12-10 19:18:55 -08:00
Haakon Meland Eriksen
d86bc0b6cf
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-10 20:43:32 +01:00
Haakon Meland Eriksen
e01d4f289b
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-10 07:27:42 +01:00
jeroenpraat
47f7165b07
Some work on the login, register and default home page. Mostly neatly centering things on different viewport widths. Bluegrid schema updated.
2015-12-09 23:41:37 +01:00
jeroenpraat
2e73e6bfb6
Fix #109 .
2015-12-09 14:37:14 +01:00
Haakon Meland Eriksen
6a3995014e
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-09 07:38:58 +01:00
Haakon Meland Eriksen
534a537319
Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version
2015-12-09 07:31:18 +01:00
Haakon Meland Eriksen
10eefc4eed
Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version
2015-12-09 07:28:55 +01:00
Haakon Meland Eriksen
3d4b3b6a92
Hubzilla textbox - promoting Hubzilla features in jot.tpl
2015-12-09 07:19:31 +01:00
redmatrix
29ac533cc9
remove some unused stuff
2015-12-08 16:32:06 -08:00
redmatrix
b9f5076cfc
move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time)
2015-12-07 19:17:40 -08:00
jeroenpraat
96d94551f9
update es+nl
2015-12-07 21:10:36 +01:00
Mario Vavti
68cbebe1a5
mod_mitem.js is obsolete
2015-12-07 20:28:17 +01:00
Mario Vavti
293df6308c
some style.css janitor work
2015-12-07 18:57:03 +01:00
Mario Vavti
af29822f04
override bs default margin
2015-12-07 15:45:21 +01:00
Mario Vavti
69c9f4588c
make justify gallery work with more than one albums per page (eg album widget)
2015-12-07 12:13:51 +01:00
Mario Vavti
c8c9916b59
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-12-07 00:01:03 +01:00
Mario Vavti
5490919557
css fixes for blockquote and code (use same padding)
2015-12-07 00:00:47 +01:00
redmatrix
a88ec1b1af
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-06 14:22:55 -08:00
Mario Vavti
78a70fed2f
fix css issue in directory
2015-12-06 16:37:57 +01:00
redmatrix
9dfe5dee64
change text "Red developers" in update failed email
2015-12-05 13:56:32 -08:00
Haakon Meland Eriksen
7119976199
Merge remote-tracking branch 'upstream/master'
2015-12-05 11:26:07 +01:00
Haakon Meland Eriksen
dd7edc8ced
Updated Norwegian translation
2015-12-05 11:25:36 +01:00
Andrew Manning
0bb7589418
Enlarge the default mail composition text area.
2015-12-04 15:29:57 -05:00
jeroenpraat
bc0e415926
es+nl and bluegrid update
2015-12-03 00:01:51 +01:00
Mario Vavti
c48965ea2f
fix nav search popup active background color
2015-12-02 22:58:38 +01:00
Mario Vavti
593423434c
fix attachment rendering for mail
2015-12-02 09:44:25 +01:00
Mario Vavti
78e18fcdcf
fix badge padding in narrow navbar
2015-12-01 13:28:50 +01:00
Mario Vavti
706598313e
make narrow navbar setting work again
2015-12-01 13:18:08 +01:00
Wave
de1abf9981
Merge pull request #201 from wave72/master
...
Updated Italian strings
2015-11-30 16:29:16 +01:00
Paolo Tacconi
c69f6ca1f4
Updated Italian strings
2015-11-30 16:25:24 +01:00
Mario Vavti
7db86a4e05
css fixes
2015-11-28 14:47:17 +01:00
Mario Vavti
122d7281f7
fix tpl if clause
2015-11-28 11:04:33 +01:00
Mario Vavti
fce1dc083b
add templates
2015-11-27 22:53:36 +01:00
Mario Vavti
bcfa72ed31
move events tools to aside widget
2015-11-27 22:45:28 +01:00
Mario Vavti
b92cc852d1
css fixes
2015-11-27 21:44:02 +01:00
Mario Vavti
e569f5d6eb
unset does not work in webkit browsers
2015-11-27 14:00:37 +01:00
Mario Vavti
ee153f64d4
add spinner to events
2015-11-27 13:32:20 +01:00
Mario Vavti
a73c385831
lost calendar icon
2015-11-26 23:29:49 +01:00
Mario Vavti
91b35c5349
various css fixes
2015-11-26 23:19:06 +01:00
Mario Vavti
056db37c66
beautify event item code
2015-11-26 22:14:20 +01:00
Mario Vavti
5cb71fa5da
default timepicker to 15 min steps. abbr -> span
2015-11-26 21:00:04 +01:00
Mario Vavti
8a269823d2
improve event rendering
2015-11-26 20:53:42 +01:00
Mario Vavti
c407e72dcc
add location
2015-11-26 16:40:40 +01:00
Mario Vavti
8e3b796a2f
fix event rendering
2015-11-26 16:38:14 +01:00
Mario Vavti
17e7b276f6
we also need nofinish in the object. css fices
2015-11-26 14:45:22 +01:00
Mario Vavti
306ce3819e
css fixes
2015-11-26 14:16:35 +01:00
Mario Vavti
c7cbd41c16
first iteration on the event item
2015-11-26 12:26:27 +01:00
redmatrix
41542e6886
document that you probably shouldn't set a primary directory server in somebody else's realm.
2015-11-25 17:34:03 -08:00
redmatrix
192e85ffa4
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-25 15:14:20 -08:00
redmatrix
b334201797
removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable
2015-11-25 15:12:54 -08:00
Mario Vavti
3ea84d7eab
some basic event styling
2015-11-25 22:55:07 +01:00
Mario Vavti
a80c45940e
add a if clause for the case we do not have a finish date
2015-11-25 19:02:48 +01:00
Mario Vavti
ab71e33d83
note to self: do not make things more complicated than they need to be.
2015-11-25 17:28:26 +01:00
Mario Vavti
fe57e7059b
events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted
2015-11-25 15:05:21 +01:00
Mario Vavti
74a40adece
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-24 19:18:52 +01:00
Mario Vavti
1767a07f4d
efent form template fixes
2015-11-24 19:18:26 +01:00
Wave
af7549d2f6
Merge pull request #187 from wave72/master
...
Updated Italian strings
2015-11-24 17:02:58 +01:00
Paolo Tacconi
e785b723aa
Updated Italian strings
2015-11-24 16:50:12 +01:00
Mario Vavti
f520cd92d0
open form on dbl-click
2015-11-24 14:33:23 +01:00
Mario Vavti
987619130b
some event heavy lifting - please test and report issues
2015-11-24 14:15:28 +01:00
redmatrix
8c5203f7e1
issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time.
2015-11-23 17:47:18 -08:00
redmatrix
34b804e9dc
Merge pull request #182 from anaqreon/url-selected
...
Place link around selected text
2015-11-24 09:41:55 +11:00
redmatrix
a7e4553ea7
delivery report tweaks
2015-11-22 17:12:30 -08:00
Mario Vavti
d726c921eb
make calendar week start (sun or mon) configurable
2015-11-21 15:33:57 +01:00
Andrew Manning
fee8503093
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
2015-11-20 21:57:10 -05:00
Andrew Manning
6083cd2559
If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs.
2015-11-20 21:55:13 -05:00
Mario Vavti
7399f7a087
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-20 16:40:13 +01:00
Mario Vavti
a3e47d26f6
make calendar language aware
2015-11-20 16:39:55 +01:00
jeroenpraat
d3bef2adc3
update es+nl
2015-11-20 15:18:51 +01:00
jeroenpraat
c7652fc29c
Had to switch these 2. Sorry.
2015-11-20 00:50:54 +01:00
jeroenpraat
a890ee6864
Some bits
2015-11-20 00:39:47 +01:00
Mario Vavti
ba52af786e
move today button from aside to section title
2015-11-19 11:38:34 +01:00
Mario Vavti
929f524e77
css fixes
2015-11-19 11:17:24 +01:00
Mario Vavti
b23284cba2
move moment.min.js and remove unneeded files
2015-11-18 23:56:25 +01:00
Mario Vavti
e4145deeb7
some events refacturing
2015-11-18 23:50:42 +01:00
redmatrix
68da4d90dc
fix admin plugin hooks
2015-11-17 20:44:57 -08:00
redmatrix
a089064588
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-17 15:04:04 -08:00
redmatrix
a06f7fbe2e
photo album widget permissions issue
2015-11-17 15:03:27 -08:00
Mario Vavti
6fa0807550
more css fixes
2015-11-17 23:01:24 +01:00
Mario Vavti
9e3d130ad9
css fixes
2015-11-17 11:32:37 +01:00
Mario Vavti
b531486dab
show jotnets toggle button only if there are jotnets and whitespace fixes
2015-11-17 10:46:38 +01:00
redmatrix
6df98f080b
fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML
2015-11-16 19:17:39 -08:00
jeroenpraat
def5edf93c
nl+es and some other bits
2015-11-14 20:43:34 +01:00
redmatrix
93e5449c08
really basic photo album widget for content regions
2015-11-12 20:22:36 -08:00
jeroenpraat
5afe8e5aa1
Small update to Bluegrid and generic-content-wrapper-styled to dreport
2015-11-12 22:10:20 +01:00
redmatrix
fba2603304
add avatars to likes/dislikes/etc.
2015-11-09 15:58:19 -08:00
redmatrix
7d5acef20a
remove list bullets from extended like list
2015-11-09 15:18:26 -08:00
jeroenpraat
b99b6b5ae9
This is better
2015-11-09 16:37:22 +01:00
jeroenpraat
cda81e35db
Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed.
2015-11-09 15:08:50 +01:00
Wave
115a53225e
Merge pull request #137 from wave72/master
...
Updated Italian strings
2015-11-09 08:58:58 +01:00
Paolo Tacconi
36c196e18c
Updated Italian strings
2015-11-09 08:54:18 +01:00
redmatrix
5e1b61eb02
some more db doco
2015-11-08 20:02:35 -08:00
redmatrix
4e1c308162
make jotnets modal
2015-11-08 17:48:43 -08:00
Tobias Luther
8639eda70f
Quick fix: Moved Twitter select box to the top of ACL selector
2015-11-08 12:20:58 +01:00
jeroenpraat
2b0b03eebc
Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es
2015-11-08 00:04:02 +01:00
jeroenpraat
0db5a8673d
Firefox share (that seems now the official name) button added to misc. settings.
2015-11-05 16:20:56 +01:00
jeroenpraat
1c0fe89368
Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.
2015-11-04 22:52:40 +01:00
Wave
9398e49eb7
Merge pull request #125 from wave72/master
...
Updated Italian strings
2015-11-04 15:04:20 +01:00
Paolo Tacconi
50cf095c00
Updated Italian strings
2015-11-04 14:58:52 +01:00
redmatrix
c57926d799
Merge pull request #119 from sasiflo/master
...
Some small rebranding for Hubzilla transition from Red Matrix
2015-11-04 16:00:32 +11:00
redmatrix
77a03e376c
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/photo/photo_driver.php
include/text.php
mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix
e09b49288f
provide admin setting to change directory server
2015-11-03 18:34:16 -08:00
redmatrix
c1cfcc78fe
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-03 14:59:43 -08:00
redmatrix
2c299a9f37
implement unfollow thread
2015-11-03 14:59:14 -08:00
jeroenpraat
d1aa672388
small update Ducth strings + fix dark schema
2015-11-03 21:19:23 +01:00
sasiflo
b21f6fd619
Merge branch 'rebranding'
2015-11-03 11:35:44 +01:00
sasiflo
39245238fd
Some small rebranding for Hubzilla transition from Red Matrix
2015-11-03 11:31:19 +01:00
Mario Vavti
43d8090182
timeago() works best with iso format. fix #118
2015-11-03 11:19:22 +01:00
redmatrix
d3183467e0
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4
improve /locs page with some field notes and the ability to do a forced sync
2015-11-01 15:51:45 -08:00
jeroenpraat
618155e6ab
More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file.
2015-11-01 22:59:32 +01:00
Mario Vavti
0353b0e04f
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-01 11:17:04 +01:00
jeroenpraat
3262d819de
update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.
2015-10-31 22:34:59 +01:00
jeroenpraat
52120b367a
Update nl+es
2015-10-31 21:07:57 +01:00
Mario Vavti
5920a96da7
make attachments appear in a dropdown in wall-item-tools-left
2015-10-31 00:38:01 +01:00
Mario Vavti
f8b767ed32
fix photo item for search_item.tpl and a minor css fix
2015-10-30 18:46:16 +01:00
redmatrix
96402a2354
This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.
2015-10-29 01:23:56 -07:00
jeroenpraat
605381f83d
More fine tuning bluegrid schema. Extra generic-wrapper-styled.
2015-10-27 22:52:54 +01:00
Mario Vavti
71f70b4377
css fixes
2015-10-27 12:52:21 +01:00
jeroenpraat
02527552fd
Better -styled.
2015-10-27 01:23:30 +01:00
jeroenpraat
ac5b9f2382
Another .generic-content-wrapper
2015-10-27 01:20:48 +01:00
jeroenpraat
fc65496d1d
NEW: Redbasic schema, based on the Hubzilla project page layout.
2015-10-27 01:11:50 +01:00
jeroenpraat
35857931ef
2 more tpl files with generic-content-wrapper-styled
2015-10-26 22:47:47 +01:00
jeroenpraat
6cb7afcbc0
es+nl strings
2015-10-26 16:35:44 +01:00
jeroenpraat
32a0f5b04a
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-26 15:28:11 +01:00
jeroenpraat
3bc6190bdd
Update Dark schema
2015-10-26 15:27:47 +01:00
Mario Vavti
4fb9571136
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-26 14:20:06 +01:00
Mario Vavti
e70bb371d9
bring back item transparency
2015-10-26 14:19:46 +01:00
jeroenpraat
2099ac0615
Revert this one. This was hub specific.
2015-10-26 14:16:05 +01:00
jeroenpraat
5e28b1216e
Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that.
2015-10-26 14:05:45 +01:00
jeroenpraat
e858ee811b
Fixed connection page. Page was overcrowded on systems with larger fonts.
2015-10-26 13:57:12 +01:00
redmatrix
a498fc8e72
looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings.
2015-10-25 21:17:02 -07:00
redmatrix
917d0ced4a
new feature: delayed posting
2015-10-25 16:54:18 -07:00
Mario Vavti
fd1e163bf4
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-24 21:44:45 +02:00
Mario Vavti
ab8b4d5c36
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
2015-10-24 21:44:25 +02:00
Wave
4a044351a9
Merge pull request #97 from wave72/master
...
Italian strings updated
2015-10-24 12:15:15 +02:00
wave72
e0a2268b0e
Italian strings updated
2015-10-24 12:13:17 +02:00
Mario Vavti
9ae215291f
fix app.tpl missing </div> tag if not authenticated
2015-10-23 10:20:01 +02:00
mcnesium
379fd33484
fix placeholder font-family
...
[Imgur](http://i.imgur.com/Cegabd5.png )
2015-10-22 13:44:33 +02:00
Mario Vavti
ed6629002f
photo object fixes
2015-10-22 13:01:33 +02:00
Mario Vavti
bcb4ac7aae
experiment: put the photo-item photo on top of the post
2015-10-22 12:58:11 +02:00
Mario Vavti
6f8d29ad80
move photo object stuff from itemObject to prepare_body() so we can do more stuff with it
2015-10-22 10:52:10 +02:00
Mario Vavti
232742a5e6
warn if quota exceeds 90% of storage limit
2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b
move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation
2015-10-21 12:40:09 +02:00
redmatrix
38816d7e41
move quota display to where it's visible on a tablet
2015-10-20 18:48:14 -07:00
Mario Vavti
13d0db5f9a
css cleanup
2015-10-20 09:47:30 +02:00
Mario Vavti
f7601756e9
create photo object if feature large photos is enabled and display those slightly different
2015-10-20 09:36:15 +02:00
redmatrix
ea37882b95
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
2015-10-19 16:18:04 -07:00
Paolo Tacconi
8da8e02dc8
Replaced some old redmatrix branding
2015-10-19 10:51:33 +02:00
jeroenpraat
6eaf35a142
Update es+nl
2015-10-18 19:09:38 +02:00
jeroenpraat
52f3d6722d
Update nl+es
2015-10-18 16:45:11 +02:00
Mario Vavti
126628546b
tweak justify gallery options to not load to large previews
2015-10-18 14:21:42 +02:00
redmatrix
be701677d6
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-10-17 16:38:57 -07:00
redmatrix
1d2797dc1f
bring back chat expiration setting and adjust chat size for our now smaller content region
2015-10-17 14:54:27 -07:00
Mario Vavti
b7408fa39e
we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size
2015-10-16 16:27:51 +02:00
jeroenpraat
7ca5b5c928
Update Dutch strings
2015-10-16 15:31:11 +02:00
Mario Vavti
73082a338b
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
2015-10-15 12:56:22 +02:00
