Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 1 | -0/+1 |
|\ | |||||
| * | fix TOS | jeroenpraat | 2016-02-25 | 1 | -0/+1 |
| | | |||||
* | | add 'requires' field to plugin info to list other dependent plugins/addons ↵ | redmatrix | 2016-02-24 | 2 | -4/+2 |
|/ | | | | and disable if dependencies are not installed/enabled | ||||
* | missing function | redmatrix | 2016-02-24 | 1 | -0/+2 |
| | |||||
* | change wording in case where registration is by apprval only | Mario Vavti | 2016-02-23 | 1 | -1/+1 |
| | |||||
* | add salmon key param | redmatrix | 2016-02-22 | 1 | -0/+5 |
| | |||||
* | pubsites: network column is not needed anymore (mentioned in intro text). ↵ | jeroenpraat | 2016-02-22 | 1 | -2/+2 |
| | | | | Because of more vertical space Access and Register columnis separate again. | ||||
* | only hubs from local configured project on pubsites (hubzilla by default). ↵ | jeroenpraat | 2016-02-22 | 1 | -5/+2 |
| | | | | as agreed with Mike. | ||||
* | change wording | Mario Vavti | 2016-02-22 | 1 | -1/+1 |
| | |||||
* | some work on mod/register | Mario Vavti | 2016-02-22 | 1 | -26/+17 |
| | |||||
* | I don't think we need redmatrix hubs (or hubs without no project name) in ↵ | jeroenpraat | 2016-02-22 | 1 | -1/+6 |
| | | | | this list. The other way around (hubzilla in redmatrix pubsites) is no problem I think. If not agreed, please revert. | ||||
* | retry the move of AccessList to composer format (one or more third-party ↵ | redmatrix | 2016-02-21 | 10 | -16/+16 |
| | | | | plugins will likely break as a result) | ||||
* | There was nothing wrong with my pimped pubsites (was another problem). Took ↵ | jeroenpraat | 2016-02-21 | 1 | -8/+15 |
| | | | | the opportunity to update schemas. Plus updated spanish and dutch strings. | ||||
* | Revert pubsites.php. There seems something wrong. Let me troubleshoot that ↵ | jeroenpraat | 2016-02-21 | 1 | -12/+5 |
| | | | | first. | ||||
* | Pimped the pubsites page. I tried to get this into a .tpl-file, but it was ↵ | jeroenpraat | 2016-02-21 | 1 | -5/+12 |
| | | | | to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page. | ||||
* | grid->network, whitespace and bootstrapify create button | Mario Vavti | 2016-02-20 | 1 | -11/+3 |
| | |||||
* | Revert "move accesslist class to namespace" | redmatrix | 2016-02-20 | 10 | -16/+16 |
| | | | | This reverts commit a9711895cf254a0ca34b1e3f7c8e75bb832e6973. | ||||
* | move accesslist class to namespace | redmatrix | 2016-02-20 | 10 | -16/+16 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-19 | 5 | -53/+56 |
|\ | |||||
| * | issue #287 require old password to change password | redmatrix | 2016-02-19 | 1 | -29/+39 |
| | | |||||
| * | no linefeed at end | redmatrix | 2016-02-19 | 1 | -1/+1 |
| | | |||||
| * | finish up the storage move | redmatrix | 2016-02-19 | 2 | -2/+2 |
| | | |||||
| * | move storage assets to zotlabs/storage | redmatrix | 2016-02-19 | 4 | -23/+16 |
| | | |||||
* | | pimp up mod new_channel | Mario Vavti | 2016-02-19 | 1 | -15/+18 |
|/ | |||||
* | siteinfo regression with Zotlabs\Project - add an autoloader | redmatrix | 2016-02-18 | 1 | -1/+1 |
| | |||||
* | Provide Zotlabs\Project and System class for querying details about the ↵ | redmatrix | 2016-02-18 | 5 | -5/+5 |
| | | | | project/version info. Move these out of /boot.php | ||||
* | Merge branch 'iconfig' | redmatrix | 2016-02-17 | 1 | -2/+8 |
|\ | |||||
| * | iconfig debugging | redmatrix | 2016-02-17 | 1 | -2/+8 |
| | | |||||
* | | More clarification about privacy of private content. Changed Channel Name to ↵ | jeroenpraat | 2016-02-17 | 2 | -2/+2 |
| | | | | | | | | simply Name when registering/creating an account or channel. First time when people see this they get confused (by experience on my hubs). This will even be more with UNO. | ||||
* | | Change description | Mario Vavti | 2016-02-17 | 1 | -1/+1 |
| | | |||||
* | | make always preload images before rendering the page a display setting | Mario Vavti | 2016-02-17 | 1 | -1/+7 |
| | | |||||
* | | allow redirection to site workflow page even if auto channel create is applied | redmatrix | 2016-02-16 | 1 | -3/+4 |
| | | |||||
* | | @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) | jeroenpraat | 2016-02-16 | 2 | -0/+4 |
|/ | |||||
* | Add string translation to auto approval option | phellmes | 2016-02-15 | 1 | -32/+34 |
| | | | | | | Make the description for the auto-approval option translatable. Put the switch array of that option (with another missing t-funtion) into a $yes_no variable to be consistent with other settings pages. | ||||
* | form cleanup (profile_photo and cover_photo), admin 'user_approve' not ↵ | redmatrix | 2016-02-14 | 2 | -55/+5 |
| | | | | found, missing close div in mood_content.tpl | ||||
* | guest photo upload failing when js_upload is in use due to non-existent acl ↵ | redmatrix | 2016-02-11 | 2 | -1/+9 |
| | | | | parameters | ||||
* | feed dates weren't being honoured. When that was fixed they turned out to be ↵ | redmatrix | 2016-02-10 | 1 | -0/+2 |
| | | | | reversed. | ||||
* | [invite module] remove trailing spaces from translatable strings | phellmes | 2016-02-09 | 1 | -6/+6 |
| | |||||
* | try that patch again | redmatrix | 2016-02-08 | 1 | -11/+4 |
| | |||||
* | Revert "sort out the well-known acme-challenge mess - at least on apache" | redmatrix | 2016-02-08 | 1 | -4/+11 |
| | | | | This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6. | ||||
* | sort out the well-known acme-challenge mess - at least on apache | redmatrix | 2016-02-08 | 1 | -11/+4 |
| | |||||
* | a few tweaks to uno settings page to allow a default ACL to be created | redmatrix | 2016-02-07 | 1 | -0/+2 |
| | |||||
* | change register workflow if uno is set | redmatrix | 2016-02-07 | 1 | -1/+1 |
| | |||||
* | provide get_server_role() to abstract different roles and capabilities | redmatrix | 2016-02-07 | 1 | -1/+1 |
| | |||||
* | fix uno import by disabling for now | redmatrix | 2016-02-05 | 1 | -0/+9 |
| | |||||
* | uno stuff | redmatrix | 2016-02-05 | 1 | -3/+5 |
| | |||||
* | more uno groundwork | redmatrix | 2016-02-05 | 2 | -3/+3 |
| | |||||
* | initial uno config | redmatrix | 2016-02-04 | 1 | -10/+11 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-04 | 1 | -0/+4 |
|\ | |||||
| * | Merge pull request #274 from mrjive/master | redmatrix | 2016-02-05 | 1 | -0/+4 |
| |\ | | | | | | | Small adding in search result page in /help |