Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• f926915e56 zot: specify crypto method zotlabs 2016-11-20 21:18:38 -08:00
• 69123590fb Merge pull request #595 from git-marijus/dev zotlabsandGitHub 2016-11-21 06:31:07 +11:00
• 66a35e973c Merge pull request #593 from mjfriaza/dev git-marijusandGitHub 2016-11-20 15:42:07 +01:00
• 9d1443bbfe move the remote user homebutton to the user menu. this way everything remote user related is in one place. Mario Vavti 2016-11-20 15:38:36 +01:00
• f4f3769225 fix #594 Mario Vavti 2016-11-20 14:15:13 +01:00
• 38543ad202 Updated ES-ES: better revision of some plugins Manuel Jiménez Friaza 2016-11-20 10:21:47 +01:00
• dda2ea8fed Do not render maps for Diaspora destinations. zotlabs 2016-11-19 14:16:38 -08:00
• 2293f9dad6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-19 13:16:55 -08:00
• abb3341030 redmatrix is no longer considered a supported platform and will not be listed in pubsites as of 2.x zotlabs 2016-11-19 13:01:50 -08:00
• 81e51dcafd Merge pull request #592 from mjfriaza/dev zotlabsandGitHub 2016-11-19 22:48:14 +11:00
• e84e2c7258 Fixed a grammatical concordance error at file connedit in Spanish contextual help Manuel Jiménez Friaza 2016-11-19 11:32:25 +01:00
• d9b46587fe Updated the Spanish translation Manuel Jiménez Friaza 2016-11-19 11:18:51 +01:00
• 36322acb6d string update zotlabs 2016-11-18 23:43:33 -08:00
• 12b39feba3 Merge pull request #591 from anaqreon/wiki-gui zotlabsandGitHub 2016-11-19 17:48:02 +11:00
• 16281c626b Hide all content if no wiki is selected except for a message saying to choose one. Andrew Manning 2016-11-18 22:10:55 -05:00
• d24e867603 Move page list back out to the side menu, but with the new page form below the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case. Andrew Manning 2016-11-18 21:55:29 -05:00
• d5c14a513d Wiki pages display in tab to the left of the edit pane tab. Home is always first in the list. Andrew Manning 2016-11-18 21:25:40 -05:00
• f9b836027d Merge branch 'dev' into wiki-gui Andrew Manning 2016-11-18 18:51:02 -05:00
• 3147b7c62b revert simple checkbox Mario Vavti 2016-11-18 14:15:01 +01:00
• 0ceb75ea09 add a simple checkbox template for use in widgets Mario Vavti 2016-11-18 13:55:48 +01:00
• 3cb138ea41 move commit message and save button into edit pane. Change page list tab label to Pages and move current page name back to section header. Andrew Manning 2016-11-18 06:04:00 -05:00
• 9016ba0d61 Remove page widget completely. Render the page list in a tab alongside History Edit and renamed View tabs. Move new page form below new page button within this page list tab. Andrew Manning 2016-11-17 20:38:07 -05:00
• 3b6248cb64 dba_pdo: return false on q() DB error like the old driver did zotlabs 2016-11-17 15:15:34 -08:00
• 5a71984b38 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-17 11:01:38 -08:00
• 1274889931 issue #588, change 'Bug Report' app to 'Report Bug' zotlabs 2016-11-17 11:00:34 -08:00
• ed7e715812 Merge pull request #590 from encyclomundi/dev zotlabsandGitHub 2016-11-18 05:54:46 +11:00
• 4d12af8396 added member OpenID member URL Your Name 2016-11-17 06:01:40 -08:00
• 6f45fb6e14 added Guest Access Token Your Name 2016-11-17 05:57:09 -08:00
• 9de15616a5 Added observer.webname Your Name 2016-11-17 05:42:45 -08:00
• 5c0ef950cc Minor Change: add Guest Access Token permission option. Your Name 2016-11-17 05:23:51 -08:00
• 0b0e0f8f43 wiki list fixes Mario Vavti 2016-11-17 14:17:26 +01:00
• a444c860a4 Merge pull request #589 from anaqreon/wiki-gui git-marijusandGitHub 2016-11-17 12:42:30 +01:00
• 20db8bbe2e Highlight active wiki in list in preparation for removing active wiki name from content section header to make room for page list viewer Andrew Manning 2016-11-17 05:58:26 -05:00
• 154923ca7d Merge remote-tracking branch 'upstream/dev' into wiki-gui Andrew Manning 2016-11-17 05:33:09 -05:00
• a34d636366 remove redundant comma Mario Vavti 2016-11-17 11:30:11 +01:00
• 89ad259050 configure ace with setOptions, get rid of redundant scrollbars Mario Vavti 2016-11-17 11:11:11 +01:00
• db1ae80877 Hide edit dialog if new wiki dialog opens Andrew Manning 2016-11-16 20:46:30 -05:00
• 7aa712a481 Create wiki edit dialogs directly underneath the wiki name in the wiki list Andrew Manning 2016-11-16 20:38:06 -05:00
• 748c894450 Move new wiki dialog directly underneath new wiki button in wiki list widget Andrew Manning 2016-11-16 20:16:46 -05:00
• 0e8b13841a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-16 14:15:42 -08:00
• d284b8e0a0 roll minor version (master) zotlabs 2016-11-16 14:14:30 -08:00
• 4ce1cccc4a export issue zotlabs 2016-11-16 14:10:57 -08:00
• 91c803ff65 use item from DB for return value zotlabs 2016-11-16 14:13:10 -08:00
• 7a17ee9f8c export issue zotlabs 2016-11-16 14:10:57 -08:00
• 1ad8f20bce only turn [] and [x] into checkboxes if it is found inside a checklist Mario Vavti 2016-11-16 20:49:58 +01:00
• de421d02ef remove print margin and set wrap mode to free Mario Vavti 2016-11-16 14:57:18 +01:00
• da390ff573 remove redundant function call Mario Vavti 2016-11-16 14:28:36 +01:00
• 14cfa90d63 use modal-lg instead of width 80% Mario Vavti 2016-11-16 14:17:10 +01:00
• 90a97ae35f minor wiki changes Mario Vavti 2016-11-16 13:14:46 +01:00
• 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. zotlabs 2016-11-15 18:43:26 -08:00
• 0f5a166cce still a bit of wiki permission weirdness, this should catch the major ones zotlabs 2016-11-15 02:12:30 -08:00
• d59f450819 use same icon with rest of app zotlabs 2016-11-15 00:53:13 -08:00
• e0a702df76 wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app. zotlabs 2016-11-15 00:50:31 -08:00
• e990a35a91 xchan_fetch() returns a simplified structure zotlabs 2016-11-14 21:06:58 -08:00
• 3e286f4f19 update api perm_allowed to return all perms if no perm specified zotlabs 2016-11-14 20:59:10 -08:00
• e0a83b4b94 API: add GET /api/z/1.0/perm_allowed zotlabs 2016-11-14 20:50:55 -08:00
• b9728a96ce API: add GET /api/z/1.0/abconfig zotlabs 2016-11-14 20:30:28 -08:00
• 537510f081 Merge pull request #585 from anaqreon/wiki zotlabsandGitHub 2016-11-15 12:52:48 +11:00
• dc411ca889 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-14 17:49:03 -08:00
• 9055d0910c API: add GET api/z/1.0/abook zotlabs 2016-11-14 17:47:44 -08:00
• 1985502894 Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-11-14 20:47:38 -05:00
• c3e3c32bdc Moved delete wiki button into new edit wiki form, opened by edit wiki icon in wiki list Andrew Manning 2016-11-14 20:45:04 -05:00
• f5ad1dfbc5 Moved new wiki and new page buttons to widgets Andrew Manning 2016-11-14 19:58:43 -05:00
• 9eab9512a3 Merge pull request #584 from phellmes/dev zotlabsandGitHub 2016-11-15 10:06:53 +11:00
• 078db2dd80 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-14 14:03:04 -08:00
• a3796f9baa SECURITY: public calendar leaks connection information (birthdays) when view_contacts is not allowed zotlabs 2016-11-14 13:55:31 -08:00
• bdc279a49b Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge zotlabs 2016-11-14 13:57:33 -08:00
• 544330345b SECURITY: public calendar leaks connection information (birthdays) when view_contacts is not allowed zotlabs 2016-11-14 13:55:31 -08:00
• 4bf1d0373d Update DE translation strings phellmes 2016-11-14 13:14:33 +01:00
• 192df273cc show wiki controls only to owner and whitespace fixes Mario Vavti 2016-11-14 12:01:16 +01:00
• cf5c803fe0 api: allow group member list to use a group name or id zotlabs 2016-11-13 23:28:03 -08:00
• 3c302bae5a move all the zid related stuff to one file zotlabs 2016-11-13 20:22:01 -08:00
• 103cd2b7a1 provide 'per-page' caching for is_matrix_url() results to reduce duplicate queries zotlabs 2016-11-13 16:12:36 -08:00
• 7763643f2e zidify wiki content zotlabs 2016-11-13 15:06:16 -08:00
• 61d2bed019 Merge pull request #583 from anaqreon/wiki zotlabsandGitHub 2016-11-13 12:18:48 +11:00
• 52cbbed6a0 Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-11-12 19:38:24 -05:00
• 4b624ab5da Bring Ace editor into focus when Edit tab is clicked to allow immediate text entry. Andrew Manning 2016-11-12 19:34:42 -05:00
• 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. zotlabs 2016-11-12 14:09:33 -08:00
• 69509f2a2a Merge pull request #582 from anaqreon/wiki zotlabsandGitHub 2016-11-13 07:28:40 +11:00
• da5b9d5c74 Removed wiki list dropdown menus, moving the download and delete icons to beside the open wiki link. Andrew Manning 2016-11-12 15:24:22 -05:00
• 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 Andrew Manning 2016-11-12 14:42:21 -05:00
• 98b71bc63a Move save button to tab bar Andrew Manning 2016-11-12 11:40:56 -05:00
• 271244bb36 Wiki control dropdown menu improvement Andrew Manning 2016-11-12 08:06:18 -05:00
• ebef7d6348 attach_rename: flaw in duplicate filename detection resulted in filename(1)(1)(1).ext zotlabs 2016-11-10 20:27:18 -08:00
• 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 zotlabs 2016-11-10 15:59:49 -08:00
• 74947d1c1c deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick() zotlabs 2016-11-08 18:15:57 -08:00
• db3d230ad9 more api work zotlabs 2016-11-08 17:47:56 -08:00
• fabf278633 more api re-org zotlabs 2016-11-08 16:55:29 -08:00
• 743cfa13fd a bit more background work to support private mail preview zotlabs 2016-11-08 16:25:36 -08:00
• 127ed1b188 typo when consolidating icons zotlabs 2016-11-08 15:33:15 -08:00
• 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. zotlabs 2016-11-08 14:54:55 -08:00
• f74f7d543e use a single icon zotlabs 2016-11-08 11:29:42 -08:00
• 72caf2ef9d let's use the bar-chart icon for voting to make the look consistent with the event attendance button and hint at its function zotlabs 2016-11-07 19:10:35 -08:00
• 5ef05d3a63 distinguish the buttons for voting and attendance by adding a calendar icon to the button used for attendance zotlabs 2016-11-07 19:00:22 -08:00
• 26aaa62048 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-07 18:30:47 -08:00
• c427fe94da cleanup and re-organise the voting and attendance buttons zotlabs 2016-11-07 18:29:38 -08:00
• 7cd7837e08 reverse logic Mario Vavti 2016-11-07 23:24:07 +01:00
• 66f7437965 Merge pull request #580 from zzottel/dev zotlabsandGitHub 2016-11-08 05:39:49 +11:00
• cb32640f70 fix a fatal error with incorrect DB object access zottel 2016-11-07 12:19:03 +01:00
• 66c07a8b33 reorganise emoticons zotlabs 2016-11-06 20:31:37 -08:00