 Mario Vavti
|
f34dcffbd9
|
hopefully fix jot dropdown visibility issue
|
2016-04-26 13:45:39 +02:00 |
|
|
Mario Vavti
|
ce50a429fa
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-26 11:41:23 +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 |
|
 redmatrix
|
e508ad37c1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-26 01:07:52 -07:00 |
|
|
redmatrix
|
f55d9e8c62
|
Merge branch 'master' into dev
|
2016-04-26 01:07:40 -07:00 |
|
|
redmatrix
|
563e82feff
|
revup
|
2016-04-26 01:06:25 -07:00 |
|
|
Mario Vavti
|
5553df862a
|
fix top padding for narrow navbar
|
2016-04-26 09:49:54 +02:00 |
|
|
redmatrix
|
2e7028c976
|
some cleanup on the mysqli driver
|
2016-04-25 22:03:02 -07:00 |
|
|
redmatrix
|
78e4b64c8b
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-25 20:14:07 -07:00 |
|
|
redmatrix
|
d62f490814
|
Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date
Revert "remove global db variable"
This reverts commit c3b0c0f32a.
|
2016-04-25 20:12:36 -07: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 |
|
|
redmatrix
|
c3b0c0f32a
|
remove global db variable
|
2016-04-25 16:55:33 -07:00 |
|
|
redmatrix
|
6aef5593d5
|
Merge pull request #356 from Treer/CUI
extends util/config and util/pconfig
|
2016-04-26 06:19:41 +10:00 |
|
 jeroenpraat
|
975140634c
|
+es-es strings update
|
2016-04-25 15:15:24 +02:00 |
|
 Treer
|
f336f38ad5
|
improve error message in config and pconfig
|
2016-04-25 22:09:15 +10:00 |
|
 Andrew Manning
|
f027bf81cd
|
Merge remote-tracking branch 'upstream/dev' into help-content
|
2016-04-25 06:17:39 -04:00 |
|
|
Treer
|
d67d8b6d6e
|
util/pconfig can list channel IDs
|
2016-04-25 19:46:04 +10:00 |
|
|
Treer
|
02ee7f17e8
|
add commandline help to util/pconfig
|
2016-04-25 19:30:37 +10:00 |
|
|
Treer
|
78320ee3a6
|
add commandline help to util/config
|
2016-04-25 19:00:10 +10:00 |
|
|
Mario Vavti
|
a9d926886e
|
make it more obvious what is behind the dropdowns
|
2016-04-25 10:00:50 +02:00 |
|
|
redmatrix
|
6291c08e01
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-25 00:10:13 -07:00 |
|
|
redmatrix
|
4b9c3cc998
|
Merge branch 'master' into dev
|
2016-04-25 00:09:55 -07:00 |
|
|
redmatrix
|
fdf7120aec
|
revup
|
2016-04-25 00:08:42 -07:00 |
|
|
redmatrix
|
e5e68d7350
|
Merge pull request #355 from Treer/document_tweaks
Document tweaks
|
2016-04-25 08:10:21 +10:00 |
|
|
Treer
|
d914290002
|
merged duplicate entry in docs
|
2016-04-25 03:17:48 +10:00 |
|
|
Treer
|
42ee3ab21c
|
add default_photo_profile to docs
|
2016-04-25 03:09:52 +10:00 |
|
|
Mario Vavti
|
15cfd6fda7
|
revert inline-block for blockquote
|
2016-04-24 12:45:38 +02:00 |
|
|
redmatrix
|
0e34811886
|
add some missing hook entries to the doco
|
2016-04-23 22:55:45 -07:00 |
|
|
redmatrix
|
5b3f536613
|
updated doco to document how to use hook callbacks which are object methods
|
2016-04-23 17:47:00 -07:00 |
|
|
redmatrix
|
ce45a1cf94
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-23 16:57:32 -07:00 |
|
|
redmatrix
|
79c63e3cf4
|
this should work to call a hook for a string class method
|
2016-04-23 16:56:41 -07:00 |
|
|
redmatrix
|
df2990b27e
|
Class method support for hooks
|
2016-04-23 15:16:54 -07: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
|
7e30c1dd82
|
update smarty to version 3.1.29
|
2016-04-23 21:24:22 +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
|
665a517a47
|
bump std version to prevent issues with context help js changes
|
2016-04-23 16:55:55 +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 |
|
|
Andrew Manning
|
f3eae7132f
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content
|
2016-04-23 07:36:06 -04: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 |
|
|
redmatrix
|
fdef224da1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
|
2016-04-23 00:05:33 -07:00 |
|
|
redmatrix
|
59c642ed19
|
revup
|
2016-04-23 00:05:12 -07:00 |
|
|
redmatrix
|
2b91962b32
|
Merge pull request #352 from phellmes/de20160422
Update DE translation strings
|
2016-04-23 07:46:44 +10:00 |
|
 phellmes
|
61e695e143
|
Update DE translation strings
|
2016-04-22 20:00:14 +02:00 |
|
|
Andrew Manning
|
aab9218558
|
Added help content
|
2016-04-22 11:50:46 -04:00 |
|
|
redmatrix
|
c250cb955e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-22 00:51:49 -07:00 |
|
|
redmatrix
|
f111275ddf
|
Merge branch 'master' into dev
|
2016-04-22 00:51:32 -07:00 |
|