Mario Vavti
75128e8f68
make editblock use status_editor()
2016-05-07 23:05:48 +02:00
redmatrix
5882714e23
missed one other place where we called comanche outside the page build
2016-05-06 00:43:37 -07:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -07:00
redmatrix
712b2b1bb2
comments
2016-05-05 22:02:46 -07:00
redmatrix
5508feb6ce
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-05 18:19:20 -07:00
redmatrix
2e3da0cbbb
- Setup: check php version (5.4 required)
...
- Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings
and supports the following forms:
[if $config.system.foo]
[widget=widget1][/widget]
[else]
[widget=widget2][/widget]
[/if]
[if $config.system.foo]
[widget=widget1][/widget]
[/if]
2016-05-05 18:15:07 -07:00
Treer
2174cdcd0e
Unify permissions dialog for network posts, channel posts, and remote posts
...
* changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button.
* hyperlinks the "cannot be changed" part of the warning to the help file
* adds some more content to the help file
2016-05-06 01:44:46 +10: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
9eac9ef2b9
isolate all the tagadelic core code into a class and reuse it
2016-05-04 19:39:39 -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
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
7c57da3a28
Sync the current list of system apps with the built-in name translation table. Some of the names were changed in the past without the translation table being updated to reflect it.
2016-05-03 22:12:09 -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
redmatrix
3df0bb5522
some preliminary structural work for app organisation
2016-05-03 18:41:16 -07:00
redmatrix
b371c028ad
more security stuff
2016-05-02 22:28:27 -07:00
redmatrix
2b7b26f4c0
a bit more oembed security - and document the shortcomings of this approach
2016-05-02 13:31:14 -07:00
redmatrix
559ed3f0a8
sort out the rest of the source categories
2016-05-02 01:18:18 -07:00
redmatrix
a10fe5f13e
a couple of bugfixes from earlier checkins and implementation of source tags
2016-05-01 22:45:38 -07:00
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
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
d1a2aecfa0
move more session related stuff such as paranoia handling (IP address changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions).
2016-04-10 19:20:41 -07:00
redmatrix
e9f1bac062
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-10 17:03:30 -07:00
redmatrix
abfbe9c937
a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session.
2016-04-10 16:56:08 -07:00
Mario Vavti
e2b4d33627
some work on comanche autocomplete
2016-04-09 12:16:42 +02:00
redmatrix
9b66b5eee3
objectify all the session management stuff
2016-04-08 04:44:10 -07:00
redmatrix
279f32b13d
send file sync packets for all known file operations
2016-04-07 18:54:48 -07:00
redmatrix
3a6187af3d
implement updates of attach data to sync'd clones.
2016-04-07 16:44:53 -07:00
redmatrix
aa678ba0ff
reset profile photo and cover photo bits for existing photos if a new one arrives from a clone
2016-04-06 22:14:05 -07:00
redmatrix
e4391e6336
missing profile photo in export data
2016-04-06 21:36:47 -07:00
redmatrix
aa0412d83b
use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload).
2016-04-06 20:25:52 -07:00
redmatrix
861f5232d3
more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested
2016-04-06 19:56:38 -07:00
redmatrix
9831ad515d
file sync testing continued
2016-04-06 18:46:29 -07:00
redmatrix
6650916435
file sync testing
2016-04-06 18:38:48 -07:00
redmatrix
29363a185d
file sync work
2016-04-06 18:07:29 -07:00
redmatrix
a20ef706fd
issue #340
2016-04-06 05:44:40 -07:00
redmatrix
adad8f2ebc
getting file sync data - missed parent folder
2016-04-06 05:20:55 -07:00
redmatrix
fb9c12df15
rework the "remember me" fix to be a bit less hackish
2016-04-06 02:33:11 -07:00
redmatrix
5a2a8717e3
provide function to collect file/photo sync data per help/filesync
2016-04-05 23:11:24 -07:00
redmatrix
0d50d29538
Merge branch 'master' into dev
2016-04-05 22:15:29 -07:00
redmatrix
54aa998b52
undeclared static property App::$stringsave (push_lang() and pop_lang())
2016-04-05 22:13:56 -07:00
redmatrix
fd07940b10
provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones.
2016-04-05 18:24:24 -07:00
Mario Vavti
bd29551f9a
fix contextual help
2016-04-05 16:59:32 +02:00
redmatrix
ec41170121
Merge pull request #338 from anaqreon/contextual-help
...
Contextual help
2016-04-05 22:43:15 +10:00
redmatrix
222ace3770
For GNU-social discovery, use the URI in the feed (author.uri) rather than try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response.
2016-04-03 20:55:38 -07: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
redmatrix
bf3f3564e0
issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity.
2016-04-03 16:41:40 -07:00
redmatrix
cfad5ba8b8
Merge branch 'master' into dev
2016-04-03 16:17:31 -07:00