redmatrix
|
f284558007
|
use only the std_version
|
2016-05-01 19:29:30 -07: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 |
|
Mario Vavti
|
fa80a5c113
|
make weblink and attach button hideable and some minor fixes
|
2016-05-01 15:45:42 +02:00 |
|
redmatrix
|
84d93cca6e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-30 15:02:45 -07: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
|
c96b20c559
|
make mod editlayout use status_editor()
|
2016-04-30 21:56:52 +02: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 |
|
redmatrix
|
4c47d22f4b
|
trim engr_units string slight improvement to avoid subtle bugs
|
2016-04-29 23:47:13 -07:00 |
|
Mario Vavti
|
931a4fafe3
|
get rid of the unused ispublic variable
|
2016-04-29 21:38:36 +02:00 |
|
Treer
|
b5b21ecad7
|
improve whitespace control around definition list ([dl]) bbcode
|
2016-04-30 02:03:38 +10: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
|
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
|
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
|
8e8df26066
|
Use / for album name in photo activities if no album present.
|
2016-04-27 13:25:58 -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
|
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
|
2e7028c976
|
some cleanup on the mysqli driver
|
2016-04-25 22:03:02 -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
|
c3b0c0f32a
|
remove global db variable
|
2016-04-25 16:55:33 -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
|
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 |
|
redmatrix
|
540800da95
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-21 17:09:13 -07:00 |
|
redmatrix
|
1ff189ee90
|
new hook interface (the old one still works but requires handlers to have two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
|
2016-04-21 17:03:05 -07: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 |
|
git-marijus
|
391ed8655e
|
Merge pull request #351 from anaqreon/toggle-context-help
Toggle context help
|
2016-04-21 18:44:50 +02:00 |
|
git-marijus
|
aa0c70e198
|
Merge pull request #348 from git-marijus/dev
add querystring to css and js which is added via head_add_{css, js}
|
2016-04-21 18:42:49 +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 |
|
redmatrix
|
f00a701ad1
|
send the correct number of args
|
2016-04-20 19:56:01 -07:00 |
|
redmatrix
|
0d91f363cc
|
There is no longer a followup flag in the notifier. Remove all traces of it.
|
2016-04-20 19:03:56 -07:00 |
|
Andrew Manning
|
b96eb1c823
|
Merge branch 'dev' into toggle-context-help
|
2016-04-20 21:05:01 -04:00 |
|
redmatrix
|
2641980ac2
|
bb2d updates from testing signature changes
|
2016-04-20 01:40:09 -07:00 |
|
redmatrix
|
21b0128e9e
|
testing dmeta
|
2016-04-19 23:06:43 -07:00 |
|
redmatrix
|
d07afb54e4
|
rework bb2diaspora for eradicating the diaspora comment virus
|
2016-04-19 21:43:12 -07:00 |
|
Mario Vavti
|
6941fbb182
|
add querystring to css and js which is added via head_add_{css, js}
|
2016-04-19 13:38:06 +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
|
d1ecf3f323
|
some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
|
2016-04-18 00:59:42 -07:00 |
|
redmatrix
|
521d404013
|
remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed.
|
2016-04-17 16:37:44 -07:00 |
|
redmatrix
|
521641f3a8
|
filter out a bit more dreport noise - especially for private posts to multiple recipients.
|
2016-04-14 21:53:39 -07:00 |
|
redmatrix
|
a8f7af2079
|
provide general purpose verification class, remove include/session.php (no longer used)
|
2016-04-14 18:51:06 -07:00 |
|
redmatrix
|
ed0bff798b
|
fix marked bug in code
|
2016-04-13 22:58:37 -07:00 |
|