| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 3 | -69/+94 |
| |\ | |||||
| | * | allow any (current) emoji to be displayed on any site, and provide a default ↵ | redmatrix | 2016-06-03 | 1 | -14/+4 |
| | | | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices. | ||||
| | * | turn emoji ability into a feature so that either a member or the site admin ↵ | redmatrix | 2016-06-03 | 1 | -1/+1 |
| | | | | | | | | | can disable it. Default is enabled. | ||||
| | * | some theming for emoji button | Mario Vavti | 2016-06-03 | 2 | -95/+95 |
| | | | |||||
| | * | restrict emoji reactions to the top level for now. | redmatrix | 2016-06-02 | 1 | -0/+2 |
| | | | |||||
| | * | menu entries for basic emoji support. I could use a bit of help theming ↵ | redmatrix | 2016-06-02 | 2 | -0/+33 |
| | | | | | | | | | this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions. | ||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 6 | -22/+31 |
| |\| | |||||
| | * | more db column renames | redmatrix | 2016-05-31 | 3 | -10/+18 |
| | | | |||||
| | * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 1 | -1/+1 |
| | | | |||||
| | * | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 2 | -11/+14 |
| | | | |||||
| * | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 1 | -0/+2 |
| | | | |||||
| * | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 2 | -1/+39 |
| | | | | | | | | | history for wiki pages. | ||||
| * | | Replaced wiki item record object field with ActivityStreams information. ↵ | Andrew Manning | 2016-05-30 | 1 | -1/+1 |
| | | | | | | | | | Wiki git repo path is stored in iconfig instead. | ||||
| * | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 1 | -0/+2 |
| | | | |||||
| * | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 1 | -0/+2 |
| | | | |||||
| * | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 2 | -0/+15 |
| | | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages. | ||||
| * | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵ | Andrew Manning | 2016-05-29 | 1 | -1/+1 |
| | | | | | | | | | bug with author in wiki item table record. | ||||
| * | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 1 | -2/+21 |
| | | | |||||
| * | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 1 | -6/+8 |
| | | | | | | | | | sandbox text format. | ||||
| * | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 2 | -5/+6 |
| | | | | | | | | | Removed some logger calls. | ||||
| * | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 2 | -1/+18 |
| | | | |||||
| * | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 1 | -0/+19 |
| | | | |||||
| * | | Wiki deletion works | Andrew Manning | 2016-05-27 | 1 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 23 | -2002/+2114 |
| |\| | |||||
| | * | consolidate all the sys_boot functionality that is common between the web ↵ | redmatrix | 2016-05-26 | 12 | -12/+12 |
| | | | | | | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. | ||||
| | * | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 1 | -1/+1 |
| | | | | | | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it. | ||||
| | * | app rendering issues, typo in class name and could not find icon ↵ | redmatrix | 2016-05-25 | 1 | -1/+1 |
| | | | | | | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead | ||||
| | * | remove the add others button for now - after some research it turned out not ↵ | Mario Vavti | 2016-05-25 | 2 | -8/+0 |
| | | | | | | | | | beeing so useful | ||||
| | * | code cleanup | redmatrix | 2016-05-24 | 1 | -1/+1 |
| | | | |||||
| | * | Update NL + ES_ES | jeroenpraat | 2016-05-22 | 4 | -1318/+1398 |
| | | | |||||
| | * | Update DE translation strings | phellmes | 2016-05-21 | 2 | -661/+701 |
| | | | |||||
| * | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 2 | -3/+24 |
| | | | |||||
| * | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 2 | -7/+4 |
| | | | |||||
| * | | Successful new wiki git repo and item table record | Andrew Manning | 2016-05-21 | 1 | -17/+4 |
| | | | |||||
| * | | Forgot some templates | Andrew Manning | 2016-05-21 | 2 | -0/+21 |
| | | | |||||
| * | | Trying to fix wiki branch starting fresh from dev | Andrew Manning | 2016-05-21 | 2 | -0/+118 |
| |/ | |||||
| * | possible fix for #385 | Mario Vavti | 2016-05-21 | 2 | -1/+5 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-19 | 1 | -17/+32 |
| |\ | |||||
| | * | Replace text strings for translation support | Andrew Manning | 2016-05-19 | 1 | -9/+3 |
| | | | |||||
| | * | Improved plugin repo management UI in admin/plugins | Andrew Manning | 2016-05-19 | 1 | -17/+38 |
| | | | |||||
| * | | provide an acl select option for only me | Mario Vavti | 2016-05-19 | 2 | -15/+58 |
| |/ | |||||
| * | Merge pull request #388 from phellmes/de20160516 | hubzilla | 2016-05-17 | 2 | -3045/+3082 |
| |\ | | | | | Update DE translation strings | ||||
| | * | Update DE translations strings | phellmes | 2016-05-16 | 2 | -3045/+3082 |
| | | | |||||
| * | | Dutch and Spanish Spanish strings, and some schema-bits | jeroenpraat | 2016-05-16 | 9 | -5809/+5990 |
| |/ | |||||
| * | Enable options for chat notifications, with optional audio. Notify for ↵ | Andrew Manning | 2016-05-13 | 1 | -3/+45 |
| | | | | | member entering room and incoming messages. | ||||
| * | change wording restricted -> custom selection and add a label to the select | Mario Vavti | 2016-05-13 | 1 | -1/+1 |
| | | |||||
| * | instead of radio buttons use select to choose between public and restricted ↵ | Mario Vavti | 2016-05-13 | 2 | -60/+70 |
| | | | | | acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible. | ||||
| * | Merge remote-tracking branch 'upstream/dev' into chat-notify | Andrew Manning | 2016-05-11 | 2 | -23/+23 |
| |\ | |||||
| | * | Merge pull request #376 from anaqreon/plugin-repo | redmatrix | 2016-05-12 | 1 | -3/+3 |
| | |\ | | | | | | | Check if target directories are writable when adding, updating, or removing plugin repos | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |