| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Merge pull request #583 from anaqreon/wiki | zotlabs | 2016-11-13 | 1 | -2/+6 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-11-12 | 2 | -205/+225 |
| |\
| |/
|/| |
|
* | | don't send notification for posts/comments on old conversations that were ref... | zotlabs | 2016-11-12 | 2 | -205/+225 |
* | | Merge pull request #582 from anaqreon/wiki | zotlabs | 2016-11-13 | 3 | -36/+61 |
|\ \ |
|
| | * | Bring Ace editor into focus when Edit tab is clicked to allow immediate text ... | Andrew Manning | 2016-11-12 | 1 | -2/+6 |
| |/ |
|
| * | Removed wiki list dropdown menus, moving the download and delete icons to bes... | Andrew Manning | 2016-11-12 | 1 | -14/+6 |
| * | Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved pag... | Andrew Manning | 2016-11-12 | 2 | -20/+51 |
| * | Move save button to tab bar | Andrew Manning | 2016-11-12 | 1 | -3/+5 |
| * | Wiki control dropdown menu improvement | Andrew Manning | 2016-11-12 | 1 | -9/+9 |
|/ |
|
* | attach_rename: flaw in duplicate filename detection resulted in filename(1)(1... | zotlabs | 2016-11-10 | 1 | -0/+4 |
* | Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ... | zotlabs | 2016-11-10 | 6 | -5/+7 |
* | deprecate/remove get_channel_by_nick() which is just a less generalised varia... | zotlabs | 2016-11-08 | 6 | -28/+26 |
* | more api work | zotlabs | 2016-11-08 | 2 | -171/+4 |
* | more api re-org | zotlabs | 2016-11-08 | 2 | -38/+44 |
* | a bit more background work to support private mail preview | zotlabs | 2016-11-08 | 1 | -3/+17 |
* | typo when consolidating icons | zotlabs | 2016-11-08 | 1 | -1/+1 |
* | move twitter api to addon; there's still a bit of cleanup remaining, mostly d... | zotlabs | 2016-11-08 | 2 | -1591/+40 |
* | use a single icon | zotlabs | 2016-11-08 | 1 | -2/+2 |
* | let's use the bar-chart icon for voting to make the look consistent with the ... | zotlabs | 2016-11-07 | 1 | -1/+1 |
* | distinguish the buttons for voting and attendance by adding a calendar icon t... | zotlabs | 2016-11-07 | 1 | -1/+1 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-07 | 2 | -4/+4 |
|\ |
|
| * | reverse logic | Mario Vavti | 2016-11-07 | 2 | -4/+4 |
* | | cleanup and re-organise the voting and attendance buttons | zotlabs | 2016-11-07 | 3 | -19/+40 |
|/ |
|
* | Merge pull request #580 from zzottel/dev | zotlabs | 2016-11-08 | 1 | -2/+2 |
|\ |
|
| * | fix a fatal error with incorrect DB object access | zottel | 2016-11-07 | 1 | -2/+2 |
|/ |
|
* | reorganise emoticons | zotlabs | 2016-11-06 | 31 | -37/+37 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-05 | 2 | -1/+11 |
|\ |
|
| * | some fixes for the recent changes in the personal menu dropdown | Mario Vavti | 2016-11-04 | 2 | -2/+6 |
| * | Merge pull request #579 from anaqreon/ui | zotlabs | 2016-11-04 | 1 | -0/+6 |
| |\ |
|
| | * | Collapse navbar-collapse-1 if avatar menu is clicked. | Andrew Manning | 2016-11-03 | 1 | -0/+6 |
| |/ |
|
* / | provide /locs link on settings page if there is more than one hubloc for this... | zotlabs | 2016-11-05 | 5 | -280/+277 |
|/ |
|
* | ignore flags to dns_get_record() and look for anything | zotlabs | 2016-11-02 | 1 | -4/+7 |
* | issue #409 - use item_notshown for file activities to prevent display but all... | zotlabs | 2016-11-02 | 1 | -1/+1 |
* | provide merged usermenu div for all server roles | zotlabs | 2016-11-02 | 1 | -4/+0 |
* | issue #576 - duplicate events shown | zotlabs | 2016-11-02 | 2 | -4/+3 |
* | silence a minor warning | zotlabs | 2016-11-02 | 1 | -0/+1 |
* | convert manual page updates to a display setting instead of a feature | zotlabs | 2016-11-02 | 9 | -14/+20 |
* | if connecting to a channel that is already pending, undo the pending and set ... | zotlabs | 2016-11-02 | 1 | -2/+23 |
* | remove debugging | zotlabs | 2016-11-02 | 1 | -3/+0 |
* | issue #575, when 'nofinish' is set on an event, invalid date was generated/st... | zotlabs | 2016-11-02 | 1 | -4/+8 |
* | allow your own likes/comments to be updated when in static update mode | zotlabs | 2016-11-02 | 8 | -15/+43 |
* | Merge pull request #574 from zotlabs/static_update | git-marijus | 2016-11-02 | 8 | -0/+27 |
|\ |
|
| * | feature: static page update as opposed to live update of conversations on the... | zotlabs | 2016-11-01 | 8 | -0/+27 |
* | | retry liveupdate up to 10 times if we receive incomplete/truncated html data. | zotlabs | 2016-11-01 | 1 | -1/+22 |
|/ |
|
* | Merge pull request #573 from phellmes/dev | zotlabs | 2016-11-02 | 2 | -6139/+9906 |
|\ |
|
| * | update DE translation strings | phellmes | 2016-11-01 | 2 | -6139/+9906 |
* | | command line connect utility. | zotlabs | 2016-11-01 | 2 | -2/+66 |
|/ |
|
* | bbcode event formatting issue | zotlabs | 2016-10-31 | 2 | -2/+3 |
* | provide plugin restrictions based on config settings | zotlabs | 2016-10-31 | 1 | -0/+7 |
* | string update | zotlabs | 2016-10-30 | 3 | -505/+555 |