Andrew Manning
|
75fb065526
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-17 11:54:36 -04: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 |
|
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
|
34a16e0ab9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-07-15 13:21:07 +02:00 |
|
Mario Vavti
|
2e32b5f467
|
upgrade to jquery-3.1 and minor fixes
|
2016-07-15 13:20:00 +02:00 |
|
redmatrix
|
d54f5a3831
|
more cleanup of atoken UI
|
2016-07-15 01:43:09 -07:00 |
|
redmatrix
|
5e475acb85
|
cleanup and debug of atoken feature
|
2016-07-15 01:33:28 -07:00 |
|
Andrew Manning
|
5131759823
|
Merge remote-tracking branch 'upstream/dev' into website-import
|
2016-07-12 21:43:05 -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
|
50e581d88a
|
Set max-width for embedded images
|
2016-07-09 20:24:16 -04:00 |
|
Mario Vavti
|
0a11991340
|
use visibility instead of display to hide elements
|
2016-07-01 12:58:15 +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
|
b5933e9d44
|
Photo embed button with album browser works in new post editor.
|
2016-06-12 19:41:37 -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 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
Mario Vavti
|
85e82e919e
|
more style work
|
2016-06-09 22:05:52 +02:00 |
|
Andrew Manning
|
b93e398674
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-02 22:32:50 -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
|
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 |
|
Mario Vavti
|
9480e9b68b
|
possible fix for #385
|
2016-05-21 14:34:01 +02:00 |
|
jeroenpraat
|
9f77180af8
|
Dutch and Spanish Spanish strings, and some schema-bits
|
2016-05-16 16:43:14 +02:00 |
|
Treer
|
e7a65c1f8d
|
improve non-ACL option description in ACL dialog
|
2016-05-08 20:44:30 +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 |
|
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 |
|
Mario Vavti
|
7fac859fbd
|
css fix
|
2016-05-01 12:16:42 +02:00 |
|
redmatrix
|
9446d0cbb4
|
Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
|
2016-05-01 08:02:03 +10:00 |
|
Mario Vavti
|
36fe2ac87e
|
css fix
|
2016-04-30 23:38:25 +02:00 |
|
Treer
|
17dba9542a
|
update icon names in view/
|
2016-05-01 05:59:02 +10:00 |
|
Treer
|
9d079e5d2b
|
Add definition lists to bbcode
|
2016-04-30 01:13:34 +10: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
|
607125e795
|
only padding-top needs adjustment
|
2016-04-26 16:15:29 +02:00 |
|
Mario Vavti
|
5553df862a
|
fix top padding for narrow navbar
|
2016-04-26 09:49:54 +02:00 |
|
redmatrix
|
6bf7716518
|
Revert "Revert "revert inline-block for blockquote""
This reverts commit ae02624793.
|
2016-04-25 20:11:36 -07:00 |
|
redmatrix
|
ae02624793
|
Revert "revert inline-block for blockquote"
This reverts commit 15cfd6fda7.
|
2016-04-25 20:10:16 -07: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
|
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
|
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 |
|