aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* fix closing parenthesis in wrong spotMario Vavti2018-04-171-2/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-162-11/+6
|\
| * remove some more distinct in queries and observe any regressions. this is rel...Mario Vavti2018-04-162-7/+2
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-162-5/+18
| |\
| * | fix regression where in the starred tab only top level posts were visibleMario Vavti2018-04-151-4/+4
* | | don't save a permcat with empty namezotlabs2018-04-161-0/+5
| |/ |/|
* | draft-cavage issueszotlabs2018-04-151-3/+9
* | issue with wiki synczotlabs2018-04-151-2/+9
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-132-34/+26
|\
| * accept system_language through either get or postzotlabs2018-04-121-3/+3
| * remove recipient name from stored notifications but keep them in emails.zotlabs2018-04-121-31/+23
* | provide visible star status for starred postsMario Vavti2018-04-131-3/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-113-4/+19
|\
| * allow to toggle visibility of likes/dislikes in notificationsMario Vavti2018-04-113-4/+19
* | channel delegation: push current identity and pop it on logout from the deleg...zotlabs2018-04-112-1/+8
|/
* last commented expiration setting in adminzotlabs2018-04-102-3/+7
* add commented_days parameter to item_expire(), default 7. Both expire_days an...zotlabs2018-04-091-6/+3
* Create catcloud widget and provide a type option which can include 'cards' or...zotlabs2018-04-091-0/+46
* Show "Unseen public activity" channel setting when site only public streams a...Julian Schweinsberg2018-04-091-2/+3
* Modified notifications widget to add the public stream when the current user ...Julian Schweinsberg2018-04-091-1/+1
* Merge pull request #1051 from anaqreon/auto-savegit-marijus2018-04-091-1/+4
|\
| * Added feature setting for auto-save, defaulting to enabled.Andrew Manning2018-04-081-1/+4
| * removed Autosavetext.php file since it is not used with localStorageAndrew Manning2018-04-081-37/+0
| * Merge branch 'dev' into auto-saveAndrew Manning2018-04-081-1/+1
| |\
| * | Auto-save post and comment entry using localStorage in browser.Andrew Manning2018-04-081-4/+0
| * | Merge branch 'dev' into auto-saveAndrew Manning2018-04-0712-20/+196
| |\ \
| * | | Post body and title are auto-savedAndrew Manning2018-04-042-0/+41
* | | | more intelligent handling of level 0 - and remove an extraneous logging functionzotlabs2018-04-081-2/+7
* | | | more work merging techlevels and featureszotlabs2018-04-081-25/+32
* | | | first cut of feature/techlevel mergezotlabs2018-04-081-4/+24
* | | | extend ACzotlabs2018-04-082-1/+5
* | | | hubzilla issue #1050 pubstream notifications visible when pubstream is notzotlabs2018-04-081-1/+2
| |_|/ |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-081-1/+1
|\ \ \ | |_|/ |/| |
| * | we shouldn't need distinct here, since ids_to_querystr() will filter duplicat...zotlabs2018-04-071-1/+1
* | | rename button label in editpost from edit to submitMario Vavti2018-04-071-1/+1
* | | rename relation to relationship - issue #1044Mario Vavti2018-04-071-1/+1
* | | use Title instead of Caption - issue #1037Mario Vavti2018-04-071-3/+3
* | | Use Add Files/Photos instead of Upload to open the upload dialogMario Vavti2018-04-072-3/+3
|/ /
* | bring back the dnt policy document, not sure when it was lostzotlabs2018-04-051-1/+4
* | oauth2 client settings pagezotlabs2018-04-053-6/+175
* | fix permalinks to children of articles and cardszotlabs2018-04-054-3/+6
* | private forum mentionszotlabs2018-04-041-1/+1
* | allow the profile recrods to be cloned separatelyzotlabs2018-04-041-1/+2
|/
* disable the oauth2testvehicle completely until it is safezotlabs2018-04-031-1/+3
* get rid of dangerous test codezotlabs2018-04-031-68/+0
* OAuth2 integrationzotlabs2018-04-033-10/+88
* Merge branch 'master' into oauth2zotlabs2018-04-033-4/+8
|\
| * some more work on hubzilla issue #1019zotlabs2018-04-021-1/+5
| * obscurify chatszotlabs2018-04-012-3/+3
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-314-33/+290
|\ \ | |/ |/|