aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1618-594/+816
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-158-43/+43
| |\
| | * change button order for consistencyMario Vavti2016-01-151-4/+5
| | |
| | * provide a recent activity link in /connectionsMario Vavti2016-01-152-3/+5
| | |
| | * add an approve button to /connections and get rid of the modal popup in ↵Mario Vavti2016-01-154-29/+11
| | | | | | | | | | | | /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...
| | * provide more contact infos and update some protocol type definitionsMario Vavti2016-01-154-6/+19
| | |
| | * Use ctrl-d for multi-line messages.ken restivo2016-01-141-3/+5
| | |
| * | minor version rollredmatrix2016-01-153-526/+571
| |/
| * issue with plugin loadable layoutsredmatrix2016-01-143-4/+20
| |
| * update widget docs with widget_cover_photoredmatrix2016-01-141-0/+7
| |
| * cover photo fetch and widgetredmatrix2016-01-143-0/+82
| |
| * more cover photo workredmatrix2016-01-141-22/+35
| |
| * this might be controversal - if approving a connection from the popup go ↵Mario Vavti2016-01-151-0/+3
| | | | | | | | back to connections page. if the popup is dismissed and the connection is approved from the page stay on /connedit page to be able to adjust perms etc...
| * since the perms will be reset on approval better do not provide the perms ↵Mario Vavti2016-01-141-0/+2
| | | | | | | | tool before we approved a connection
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-01-142-3/+3
| |\
| | * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-148-204/+92
| | |\
| | * | revision updateredmatrix2016-01-142-3/+3
| | | |
| * | | provide some info about our contacts - status (archived, hidden, etc.), ↵Mario Vavti2016-01-145-7/+61
| | |/ | |/| | | | | | | public forum (like in directory) and show since when we are connected
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1439-7676/+8564
|\| |
| * | bring back opacity for archived contactsMario Vavti2016-01-141-0/+5
| | |
| * | some work on connectionsMario Vavti2016-01-145-190/+79
| | |
| * | some template work on follow widgetMario Vavti2016-01-144-17/+11
| |/
| * more progress on cover photo cropping and storageredmatrix2016-01-132-4/+395
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\
| | * fix sharing of photo itemsMario Vavti2016-01-131-1/+1
| | |
| * | some initial work on uploading and cropping cover photosredmatrix2016-01-136-2/+121
| |/
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\
| | * 20em is to big for mobile useMario Vavti2016-01-131-1/+1
| | |
| * | more work on auto channel creation during registerredmatrix2016-01-134-1/+116
| |/
| * very small tweaks to CLI plugin manager utilityredmatrix2016-01-132-6/+8
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-121-2/+2
| |\
| | * Correct docs.ken restivo2016-01-121-2/+2
| | |
| * | cleanup text in INSTALL.txtredmatrix2016-01-121-13/+25
| |/
| * cli utility for managing addonsredmatrix2016-01-121-0/+130
| |
| * 'auto channel creation' - if the corresponding config variable is set, ↵redmatrix2016-01-128-26/+97
| | | | | | | | | | | | create a channel when an account is created. Plugins can provide the necessary channel details (probably from an extended registration form). If no details are provided, a social (mostly public) channel will be created using the LHS of the email address and you will be directed to your channel page (unless email verification is required, in which case this step will be delayed until successful validation and login). If the reddress is already assigned a random name(1000-9999) reddress will be assigned.
| * Source the conf.ken restivo2016-01-121-0/+3
| |
| * Add very simple, minimalist posting shell script.ken restivo2016-01-121-0/+33
| |
| * "aconfig" or account configuration storage, needed for some upcoming work. ↵redmatrix2016-01-111-0/+19
| | | | | | | | Built on top of xconfig.
| * logic reversal in version checkingredmatrix2016-01-111-3/+3
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-113-7418/+7437
| |\
| | * Update README.mdJeroen van Riet Paap2016-01-111-4/+4
| | |
| | * centerJeroen van Riet Paap2016-01-111-0/+4
| | |
| | * point to installation docuJeroen van Riet Paap2016-01-111-1/+4
| | |
| | * Merge pull request #253 from wave72/masterWave2016-01-112-7417/+7429
| | |\ | | | | | | | | Italian strings updated
| | | * Italian strings updatedPaolo Tacconi2016-01-112-7417/+7429
| | | |
| * | | plugin version compatibility checking. To use, set MinVersion, MaxVersion or ↵redmatrix2016-01-115-11/+97
| |/ / | | | | | | | | | MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way.
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1116-19556/+20729
|\| |
| * | revert lost linkredmatrix2016-01-101-0/+1
| | |
| * | Merge pull request #252 from einervonvielen/homeinstallredmatrix2016-01-114-1/+1118
| |\ \ | | | | | | | | installation script for debian next to a router at home
| | * | Added files for installation scriptEiner von Vielen2016-01-103-0/+1118
| | | |