 git-marijus
|
18f505608b
|
Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp
context help: added german translation
|
2016-04-29 14:32:50 +02: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 |
|
 sasiflo
|
d8aa0ac36c
|
Merge branch 'dev' into dev_sasiflo_contexthelp
|
2016-04-29 11:40:38 +02:00 |
|
|
sasiflo
|
49b957f7ea
|
Added german translation to context help.
|
2016-04-29 11:39:00 +02:00 |
|
|
Mario Vavti
|
e01b90c4c6
|
css fixes
|
2016-04-29 10:26:41 +02:00 |
|
|
Mario Vavti
|
1fdac57d61
|
jot: cleanup unused variables
|
2016-04-29 09:58:44 +02:00 |
|
 redmatrix
|
bb96f44861
|
allow engineering units (e.g. 400M, 1G) as service class limits
|
2016-04-28 21:02:27 -07:00 |
|
|
redmatrix
|
30a6ae3daa
|
This setting isn't implemented so remove the UI until it is.
|
2016-04-28 20:17:05 -07:00 |
|
|
redmatrix
|
37a852d2d1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-28 18:29:37 -07:00 |
|
|
redmatrix
|
59777333dd
|
Merge branch 'master' into dev
|
2016-04-28 18:29:27 -07:00 |
|
|
redmatrix
|
eb85f8572f
|
revup
|
2016-04-28 18:27:58 -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 |
|
|
redmatrix
|
2ddd03f597
|
provide a Hook method to unregister all hooks with a given filespec component. This will be useful in upgrading plugins to use new interfaces, as you won't have to individually unregister hook declarations that you are no longer using in the code.
|
2016-04-27 22:44:06 -07:00 |
|
|
redmatrix
|
bdef71bda0
|
provide courtesy function for syncing one item. We'll probably be doing this a lot.
|
2016-04-27 21:26:52 -07:00 |
|
|
redmatrix
|
d4eb5e7c6d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-27 13:27:19 -07:00 |
|
|
redmatrix
|
8e8df26066
|
Use / for album name in photo activities if no album present.
|
2016-04-27 13:25:58 -07:00 |
|
|
redmatrix
|
c91e43af34
|
Merge pull request #359 from anaqreon/help-content
Help content
|
2016-04-28 06:18:11 +10:00 |
|
 Andrew Manning
|
b13c21f872
|
Added context help content
|
2016-04-27 06:23:05 -04:00 |
|
|
Andrew Manning
|
f975d9dfe4
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content
|
2016-04-27 05:56:19 -04:00 |
|
|
Mario Vavti
|
a6baa5a6da
|
some refinements on jot
|
2016-04-27 11:36:02 +02:00 |
|
|
redmatrix
|
26131ffc91
|
Merge branch 'master' into dev
|
2016-04-27 00:53:05 -07:00 |
|
|
redmatrix
|
aeda293bd0
|
revup
|
2016-04-27 00:52:00 -07:00 |
|
|
redmatrix
|
a67fa2651d
|
implement the singleton delivery stuff
|
2016-04-26 17:38:44 -07:00 |
|
|
redmatrix
|
509f25e46a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-26 16:14:10 -07:00 |
|
|
redmatrix
|
f99daf8ff9
|
move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery
|
2016-04-26 16:12:31 -07: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
|
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 |
|