Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-17 | 4 | -1232/+1342 |
|\ | |||||
| * | update es-es and nl strings. adjusted a few matrix to grid strings | jeroenpraat | 2016-01-17 | 4 | -1232/+1342 |
| | | |||||
* | | generalise the site icon | redmatrix | 2016-01-17 | 2 | -7/+7 |
|/ | |||||
* | move dir total ratings button to the left to prevent the connect button ↵ | Mario Vavti | 2016-01-16 | 1 | -2/+3 |
| | | | | beeing shifted on channels with ratings | ||||
* | 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 | 1 | -1/+1 |
| | |||||
* | add an approve button to /connections and get rid of the modal popup in ↵ | Mario Vavti | 2016-01-15 | 2 | -20/+8 |
| | | | | /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 | 1 | -0/+10 |
| | |||||
* | 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 | ||||
* | provide some info about our contacts - status (archived, hidden, etc.), ↵ | Mario Vavti | 2016-01-14 | 4 | -6/+37 |
| | | | | public forum (like in directory) and show since when we are connected | ||||
* | bring back opacity for archived contacts | Mario Vavti | 2016-01-14 | 1 | -0/+5 |
| | |||||
* | some work on connections | Mario Vavti | 2016-01-14 | 3 | -178/+56 |
| | |||||
* | some template work on follow widget | Mario Vavti | 2016-01-14 | 3 | -15/+9 |
| | |||||
* | more progress on cover photo cropping and storage | redmatrix | 2016-01-13 | 1 | -4/+4 |
| | |||||
* | some initial work on uploading and cropping cover photos | redmatrix | 2016-01-13 | 2 | -0/+81 |
| | |||||
* | 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 | 3 | -0/+92 |
|/ | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-01-11 | 2 | -7417/+7429 |
|\ | |||||
| * | 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 | 2 | -3/+22 |
|/ / | | | | | | | 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. | ||||
* | | revert lost link | redmatrix | 2016-01-10 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #252 from einervonvielen/homeinstall | redmatrix | 2016-01-11 | 1 | -1/+0 |
|\ \ | | | | | | | installation script for debian next to a router at home | ||||
| * | | indexed | Einer von Vielen | 2016-01-10 | 1 | -1/+0 |
| | | | |||||
* | | | String update es-es and nl. Plus some extra bits, incl .gitignore update ↵ | jeroenpraat | 2016-01-10 | 7 | -14838/+14862 |
|/ / | | | | | | | with pageheader.html | ||||
* | | features management page for hubmins | redmatrix | 2016-01-06 | 2 | -0/+32 |
| | | |||||
* | | Merge pull request #248 from wave72/master | Wave | 2016-01-04 | 2 | -111/+111 |
|\| | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2016-01-04 | 2 | -111/+111 |
| | | |||||
* | | added some real examples for the default-permission-role in de docu. also ↵ | jeroenpraat | 2016-01-03 | 2 | -12/+23 |
| | | | | | | | | updated comanche template redable and another css class to tpl file | ||||
* | | Provide the ability for a hub admin to specify a default permissions role ↵ | redmatrix | 2016-01-02 | 1 | -4/+7 |
| | | | | | | | | for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired. | ||||
* | | Update es+nl strings and added title on hover for items (needed to view ↵ | jeroenpraat | 2016-01-02 | 7 | -212/+224 |
| | | | | | | | | titles that are cut-off) | ||||
* | | issue #241 (redmatrix issue 405) | redmatrix | 2016-01-01 | 1 | -0/+2 |
| | | |||||
* | | nl+es-es string update | jeroenpraat | 2015-12-29 | 4 | -58/+47 |
| | | |||||
* | | Removed defunct URL from old auto-update idea | Andrew Manning | 2015-12-26 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-25 | 3 | -47/+45 |
|\ \ | |||||
| * | | update es-es strings | jeroenpraat | 2015-12-25 | 3 | -47/+45 |
| | | | |||||
* | | | regression: default inherited permission was not being set for a connection ↵ | redmatrix | 2015-12-25 | 1 | -0/+1 |
|/ / | | | | | | | if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting. | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-24 | 13 | -1710/+1761 |
|\ \ | |||||
| * | | After reading and talking with experts I came to the conclusion that es-es ↵ | jeroenpraat | 2015-12-24 | 12 | -23098/+1 |
| | | | | | | | | | | | | and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960 | ||||
| * | | reverted my previous commit. this is going to be fixed remotely upstream. ↵ | jeroenpraat | 2015-12-23 | 21 | -20/+1 |
| | | | | | | | | | | | | Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958. | ||||
| * | | Spanish language codes. See issue #234 | jeroenpraat | 2015-12-23 | 41 | -0/+23117 |
| | | | |||||
| * | | update es+nl strings | jeroenpraat | 2015-12-22 | 4 | -1710/+1760 |
| | | | |||||
* | | | start on refactor of plugin/theme/widget info block parsing | redmatrix | 2015-12-22 | 1 | -6/+7 |
|/ / | |||||
* | | merge hell | redmatrix | 2015-12-20 | 1 | -30/+39 |
| | | |||||
* | | Updated Norwegian strings for Hubzilla | Haakon Meland Eriksen | 2015-12-20 | 2 | -1591/+1669 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-20 | 2 | -841/+867 |
|\| | |||||
| * | Merge pull request #230 from wave72/master | Wave | 2015-12-20 | 2 | -841/+867 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | wave72 | 2015-12-20 | 2 | -841/+867 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-18 | 6 | -7957/+8261 |
|\| | |