aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #583 from anaqreon/wikizotlabs2016-11-131-2/+6
|\
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-11-122-205/+225
| |\ | |/ |/|
* | don't send notification for posts/comments on old conversations that were ref...zotlabs2016-11-122-205/+225
* | Merge pull request #582 from anaqreon/wikizotlabs2016-11-133-36/+61
|\ \
| | * Bring Ace editor into focus when Edit tab is clicked to allow immediate text ...Andrew Manning2016-11-121-2/+6
| |/
| * Removed wiki list dropdown menus, moving the download and delete icons to bes...Andrew Manning2016-11-121-14/+6
| * Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved pag...Andrew Manning2016-11-122-20/+51
| * Move save button to tab barAndrew Manning2016-11-121-3/+5
| * Wiki control dropdown menu improvementAndrew Manning2016-11-121-9/+9
|/
* attach_rename: flaw in duplicate filename detection resulted in filename(1)(1...zotlabs2016-11-101-0/+4
* Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ...zotlabs2016-11-106-5/+7
* deprecate/remove get_channel_by_nick() which is just a less generalised varia...zotlabs2016-11-086-28/+26
* more api workzotlabs2016-11-082-171/+4
* more api re-orgzotlabs2016-11-082-38/+44
* a bit more background work to support private mail previewzotlabs2016-11-081-3/+17
* typo when consolidating iconszotlabs2016-11-081-1/+1
* move twitter api to addon; there's still a bit of cleanup remaining, mostly d...zotlabs2016-11-082-1591/+40
* use a single iconzotlabs2016-11-081-2/+2
* let's use the bar-chart icon for voting to make the look consistent with the ...zotlabs2016-11-071-1/+1
* distinguish the buttons for voting and attendance by adding a calendar icon t...zotlabs2016-11-071-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-072-4/+4
|\
| * reverse logicMario Vavti2016-11-072-4/+4
* | cleanup and re-organise the voting and attendance buttonszotlabs2016-11-073-19/+40
|/
* Merge pull request #580 from zzottel/devzotlabs2016-11-081-2/+2
|\
| * fix a fatal error with incorrect DB object accesszottel2016-11-071-2/+2
|/
* reorganise emoticonszotlabs2016-11-0631-37/+37
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-052-1/+11
|\
| * some fixes for the recent changes in the personal menu dropdownMario Vavti2016-11-042-2/+6
| * Merge pull request #579 from anaqreon/uizotlabs2016-11-041-0/+6
| |\
| | * Collapse navbar-collapse-1 if avatar menu is clicked.Andrew Manning2016-11-031-0/+6
| |/
* / provide /locs link on settings page if there is more than one hubloc for this...zotlabs2016-11-055-280/+277
|/
* ignore flags to dns_get_record() and look for anythingzotlabs2016-11-021-4/+7
* issue #409 - use item_notshown for file activities to prevent display but all...zotlabs2016-11-021-1/+1
* provide merged usermenu div for all server roleszotlabs2016-11-021-4/+0
* issue #576 - duplicate events shownzotlabs2016-11-022-4/+3
* silence a minor warningzotlabs2016-11-021-0/+1
* convert manual page updates to a display setting instead of a featurezotlabs2016-11-029-14/+20
* if connecting to a channel that is already pending, undo the pending and set ...zotlabs2016-11-021-2/+23
* remove debuggingzotlabs2016-11-021-3/+0
* issue #575, when 'nofinish' is set on an event, invalid date was generated/st...zotlabs2016-11-021-4/+8
* allow your own likes/comments to be updated when in static update modezotlabs2016-11-028-15/+43
* Merge pull request #574 from zotlabs/static_updategit-marijus2016-11-028-0/+27
|\
| * feature: static page update as opposed to live update of conversations on the...zotlabs2016-11-018-0/+27
* | retry liveupdate up to 10 times if we receive incomplete/truncated html data.zotlabs2016-11-011-1/+22
|/
* Merge pull request #573 from phellmes/devzotlabs2016-11-022-6139/+9906
|\
| * update DE translation stringsphellmes2016-11-012-6139/+9906
* | command line connect utility.zotlabs2016-11-012-2/+66
|/
* bbcode event formatting issuezotlabs2016-10-312-2/+3
* provide plugin restrictions based on config settingszotlabs2016-10-311-0/+7
* string updatezotlabs2016-10-303-505/+555