Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-16 | 18 | -594/+816 |
|\ | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-15 | 8 | -43/+43 |
| |\ | |||||
| | * | change button order for consistency | Mario Vavti | 2016-01-15 | 1 | -4/+5 |
| | | | |||||
| | * | provide a recent activity link in /connections | Mario Vavti | 2016-01-15 | 2 | -3/+5 |
| | | | |||||
| | * | add an approve button to /connections and get rid of the modal popup in ↵ | Mario Vavti | 2016-01-15 | 4 | -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 definitions | Mario Vavti | 2016-01-15 | 4 | -6/+19 |
| | | | |||||
| | * | Use ctrl-d for multi-line messages. | ken restivo | 2016-01-14 | 1 | -3/+5 |
| | | | |||||
| * | | minor version roll | redmatrix | 2016-01-15 | 3 | -526/+571 |
| |/ | |||||
| * | issue with plugin loadable layouts | redmatrix | 2016-01-14 | 3 | -4/+20 |
| | | |||||
| * | update widget docs with widget_cover_photo | redmatrix | 2016-01-14 | 1 | -0/+7 |
| | | |||||
| * | cover photo fetch and widget | redmatrix | 2016-01-14 | 3 | -0/+82 |
| | | |||||
| * | more cover photo work | redmatrix | 2016-01-14 | 1 | -22/+35 |
| | | |||||
| * | this might be controversal - if approving a connection from the popup go ↵ | Mario Vavti | 2016-01-15 | 1 | -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 Vavti | 2016-01-14 | 1 | -0/+2 |
| | | | | | | | | tool before we approved a connection | ||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-01-14 | 2 | -3/+3 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-14 | 8 | -204/+92 |
| | |\ | |||||
| | * | | revision update | redmatrix | 2016-01-14 | 2 | -3/+3 |
| | | | | |||||
| * | | | provide some info about our contacts - status (archived, hidden, etc.), ↵ | Mario Vavti | 2016-01-14 | 5 | -7/+61 |
| | |/ | |/| | | | | | | | public forum (like in directory) and show since when we are connected | ||||
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-01-14 | 39 | -7676/+8564 |
|\| | | |||||
| * | | bring back opacity for archived contacts | Mario Vavti | 2016-01-14 | 1 | -0/+5 |
| | | | |||||
| * | | some work on connections | Mario Vavti | 2016-01-14 | 5 | -190/+79 |
| | | | |||||
| * | | some template work on follow widget | Mario Vavti | 2016-01-14 | 4 | -17/+11 |
| |/ | |||||
| * | more progress on cover photo cropping and storage | redmatrix | 2016-01-13 | 2 | -4/+395 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-13 | 1 | -1/+1 |
| |\ | |||||
| | * | fix sharing of photo items | Mario Vavti | 2016-01-13 | 1 | -1/+1 |
| | | | |||||
| * | | some initial work on uploading and cropping cover photos | redmatrix | 2016-01-13 | 6 | -2/+121 |
| |/ | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-13 | 1 | -1/+1 |
| |\ | |||||
| | * | 20em is to big for mobile use | Mario Vavti | 2016-01-13 | 1 | -1/+1 |
| | | | |||||
| * | | more work on auto channel creation during register | redmatrix | 2016-01-13 | 4 | -1/+116 |
| |/ | |||||
| * | very small tweaks to CLI plugin manager utility | redmatrix | 2016-01-13 | 2 | -6/+8 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-12 | 1 | -2/+2 |
| |\ | |||||
| | * | Correct docs. | ken restivo | 2016-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | cleanup text in INSTALL.txt | redmatrix | 2016-01-12 | 1 | -13/+25 |
| |/ | |||||
| * | cli utility for managing addons | redmatrix | 2016-01-12 | 1 | -0/+130 |
| | | |||||
| * | 'auto channel creation' - if the corresponding config variable is set, ↵ | redmatrix | 2016-01-12 | 8 | -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 restivo | 2016-01-12 | 1 | -0/+3 |
| | | |||||
| * | Add very simple, minimalist posting shell script. | ken restivo | 2016-01-12 | 1 | -0/+33 |
| | | |||||
| * | "aconfig" or account configuration storage, needed for some upcoming work. ↵ | redmatrix | 2016-01-11 | 1 | -0/+19 |
| | | | | | | | | Built on top of xconfig. | ||||
| * | logic reversal in version checking | redmatrix | 2016-01-11 | 1 | -3/+3 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-11 | 3 | -7418/+7437 |
| |\ | |||||
| | * | Update README.md | Jeroen van Riet Paap | 2016-01-11 | 1 | -4/+4 |
| | | | |||||
| | * | center | Jeroen van Riet Paap | 2016-01-11 | 1 | -0/+4 |
| | | | |||||
| | * | point to installation docu | Jeroen van Riet Paap | 2016-01-11 | 1 | -1/+4 |
| | | | |||||
| | * | Merge pull request #253 from wave72/master | Wave | 2016-01-11 | 2 | -7417/+7429 |
| | |\ | | | | | | | | | Italian strings updated | ||||
| | | * | Italian strings updated | Paolo Tacconi | 2016-01-11 | 2 | -7417/+7429 |
| | | | | |||||
| * | | | plugin version compatibility checking. To use, set MinVersion, MaxVersion or ↵ | redmatrix | 2016-01-11 | 5 | -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 Eriksen | 2016-01-11 | 16 | -19556/+20729 |
|\| | | |||||
| * | | revert lost link | redmatrix | 2016-01-10 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #252 from einervonvielen/homeinstall | redmatrix | 2016-01-11 | 4 | -1/+1118 |
| |\ \ | | | | | | | | | installation script for debian next to a router at home | ||||
| | * | | Added files for installation script | Einer von Vielen | 2016-01-10 | 3 | -0/+1118 |
| | | | |