 Mario Vavti
|
89ad259050
|
configure ace with setOptions, get rid of redundant scrollbars
|
2016-11-17 11:11:11 +01:00 |
|
 zotlabs
|
0e8b13841a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-16 14:15:42 -08:00 |
|
|
zotlabs
|
91c803ff65
|
use item from DB for return value
|
2016-11-16 14:13:10 -08:00 |
|
|
zotlabs
|
7a17ee9f8c
|
export issue
|
2016-11-16 14:10:57 -08:00 |
|
|
Mario Vavti
|
1ad8f20bce
|
only turn [] and [x] into checkboxes if it is found inside a checklist
|
2016-11-16 20:49:58 +01:00 |
|
|
Mario Vavti
|
de421d02ef
|
remove print margin and set wrap mode to free
|
2016-11-16 14:57:18 +01:00 |
|
|
Mario Vavti
|
da390ff573
|
remove redundant function call
|
2016-11-16 14:28:36 +01:00 |
|
|
Mario Vavti
|
14cfa90d63
|
use modal-lg instead of width 80%
|
2016-11-16 14:17:10 +01:00 |
|
|
Mario Vavti
|
90a97ae35f
|
minor wiki changes
|
2016-11-16 13:14:46 +01:00 |
|
|
zotlabs
|
501bd814c3
|
wiki: simplify permission model, reduce duplicate calls to get the same channel info and permissions, return the owner permissions with the normal permission check (keeping all permission fetching in one place), rename the 'channel' variable to 'owner' in several places to identify this channel role more clearly as to the way it is being used in this module, update the deprecated call to proc_run (include/notifier) and make several notice messages translatable.
|
2016-11-15 18:43:26 -08:00 |
|
|
zotlabs
|
0f5a166cce
|
still a bit of wiki permission weirdness, this should catch the major ones
|
2016-11-15 02:12:30 -08:00 |
|
|
zotlabs
|
d59f450819
|
use same icon with rest of app
|
2016-11-15 00:53:13 -08:00 |
|
|
zotlabs
|
e0a702df76
|
wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app.
|
2016-11-15 00:50:31 -08:00 |
|
|
zotlabs
|
e990a35a91
|
xchan_fetch() returns a simplified structure
|
2016-11-14 21:06:58 -08:00 |
|
|
zotlabs
|
3e286f4f19
|
update api perm_allowed to return all perms if no perm specified
|
2016-11-14 20:59:10 -08:00 |
|
|
zotlabs
|
e0a83b4b94
|
API: add GET /api/z/1.0/perm_allowed
|
2016-11-14 20:50:55 -08:00 |
|
|
zotlabs
|
b9728a96ce
|
API: add GET /api/z/1.0/abconfig
|
2016-11-14 20:30:28 -08:00 |
|
 zotlabsandGitHub
|
537510f081
|
Merge pull request #585 from anaqreon/wiki
Wiki
|
2016-11-15 12:52:48 +11:00 |
|
|
zotlabs
|
dc411ca889
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-14 17:49:03 -08:00 |
|
|
zotlabs
|
9055d0910c
|
API: add GET api/z/1.0/abook
|
2016-11-14 17:47:44 -08:00 |
|
 Andrew Manning
|
1985502894
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-11-14 20:47:38 -05:00 |
|
|
Andrew Manning
|
c3e3c32bdc
|
Moved delete wiki button into new edit wiki form, opened by edit wiki icon in wiki list
|
2016-11-14 20:45:04 -05:00 |
|
|
Andrew Manning
|
f5ad1dfbc5
|
Moved new wiki and new page buttons to widgets
|
2016-11-14 19:58:43 -05:00 |
|
|
zotlabsandGitHub
|
9eab9512a3
|
Merge pull request #584 from phellmes/dev
Update DE translation strings
|
2016-11-15 10:06:53 +11:00 |
|
|
zotlabs
|
078db2dd80
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-11-14 14:03:04 -08:00 |
|
|
zotlabs
|
544330345b
|
SECURITY: public calendar leaks connection information (birthdays) when view_contacts is not allowed
|
2016-11-14 13:55:31 -08:00 |
|
 phellmes
|
4bf1d0373d
|
Update DE translation strings
|
2016-11-14 13:14:33 +01:00 |
|
|
Mario Vavti
|
192df273cc
|
show wiki controls only to owner and whitespace fixes
|
2016-11-14 12:01:16 +01:00 |
|
|
zotlabs
|
cf5c803fe0
|
api: allow group member list to use a group name or id
|
2016-11-13 23:28:03 -08:00 |
|
|
zotlabs
|
3c302bae5a
|
move all the zid related stuff to one file
|
2016-11-13 20:22:01 -08:00 |
|
|
zotlabs
|
103cd2b7a1
|
provide 'per-page' caching for is_matrix_url() results to reduce duplicate queries
|
2016-11-13 16:12:36 -08:00 |
|
|
zotlabs
|
7763643f2e
|
zidify wiki content
|
2016-11-13 15:06:16 -08:00 |
|
|
zotlabsandGitHub
|
61d2bed019
|
Merge pull request #583 from anaqreon/wiki
Move focus to Ace editor when switching to editor tab
|
2016-11-13 12:18:48 +11:00 |
|
|
Andrew Manning
|
52cbbed6a0
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-11-12 19:38:24 -05:00 |
|
|
Andrew Manning
|
4b624ab5da
|
Bring Ace editor into focus when Edit tab is clicked to allow immediate text entry.
|
2016-11-12 19:34:42 -05:00 |
|
|
zotlabs
|
640d15dba5
|
don't send notification for posts/comments on old conversations that were refetched after having expired. We'll accomplish this by limiting notifications to items posted within the last month.
|
2016-11-12 14:09:33 -08:00 |
|
|
zotlabsandGitHub
|
69509f2a2a
|
Merge pull request #582 from anaqreon/wiki
Revised wiki controls
|
2016-11-13 07:28:40 +11:00 |
|
|
Andrew Manning
|
da5b9d5c74
|
Removed wiki list dropdown menus, moving the download and delete icons to beside the open wiki link.
|
2016-11-12 15:24:22 -05:00 |
|
|
Andrew Manning
|
af11525338
|
Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved page tools in there as well as new page and new wiki
|
2016-11-12 14:42:21 -05:00 |
|
|
Andrew Manning
|
98b71bc63a
|
Move save button to tab bar
|
2016-11-12 11:40:56 -05:00 |
|
|
Andrew Manning
|
271244bb36
|
Wiki control dropdown menu improvement
|
2016-11-12 08:06:18 -05:00 |
|
|
zotlabs
|
ebef7d6348
|
attach_rename: flaw in duplicate filename detection resulted in filename(1)(1)(1).ext
|
2016-11-10 20:27:18 -08:00 |
|
|
zotlabs
|
20497f1be3
|
Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin on the first hop since we no longer provide the twitter api by default
|
2016-11-10 15:59:49 -08:00 |
|
|
zotlabs
|
74947d1c1c
|
deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick()
|
2016-11-08 18:15:57 -08:00 |
|
|
zotlabs
|
db3d230ad9
|
more api work
|
2016-11-08 17:47:56 -08:00 |
|
|
zotlabs
|
fabf278633
|
more api re-org
|
2016-11-08 16:55:29 -08:00 |
|
|
zotlabs
|
743cfa13fd
|
a bit more background work to support private mail preview
|
2016-11-08 16:25:36 -08:00 |
|
|
zotlabs
|
127ed1b188
|
typo when consolidating icons
|
2016-11-08 15:33:15 -08:00 |
|
|
zotlabs
|
b80674bf2e
|
move twitter api to addon; there's still a bit of cleanup remaining, mostly dealing with abstracting the authentication calls and separating out the twitter authentication structure from the zot api.
|
2016-11-08 14:54:55 -08:00 |
|
|
zotlabs
|
f74f7d543e
|
use a single icon
|
2016-11-08 11:29:42 -08:00 |
|