aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add os_path and display_path to photos, fix some issues with multiple path se...zotlabs2017-03-143-96/+12
* store os_path and display_path with fileszotlabs2017-03-141-2/+3
* use dim for the button border alsozotlabs2017-03-141-1/+1
* dim class was un-themedzotlabs2017-03-142-2/+2
* input filter updateszotlabs2017-03-146-103/+57
* fix group by item queryzotlabs2017-03-141-17/+15
* class MarkdownSoap to safely store markdown by purifying and preserving (esca...zotlabs2017-03-141-0/+86
* get rid of some cruft in boot.phpzotlabs2017-03-141-62/+17
* make redbasic compatible with red 5.xzotlabs2017-03-131-1/+1
* remove the unimplemented upload limit site settingszotlabs2017-03-131-3/+0
* code_allowed is a real mess. Start the cleanup by remving the account level c...zotlabs2017-03-137-79/+28
* Merge branch 'dev' into redzotlabs2017-03-131-1/+1
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-132-2/+2
| |\
| | * Merge pull request #697 from anaqreon/devgit-marijus2017-03-131-1/+1
| | |\
| | | * Add id to app-menu for JS accessAndrew Manning2017-03-121-1/+1
| | * | we need to have this even if we are not the owner. otherwise we loose the acl...Mario Vavti2017-03-131-1/+1
| | |/
* | | move oauth2 to vendorzotlabs2017-03-14132-3612/+1324
* | | better handling of mimetype securityzotlabs2017-03-123-20/+7
* | | remove more hardwired brandingzotlabs2017-03-123-65/+67
* | | update licensezotlabs2017-03-121-1/+1
* | | update readmezotlabs2017-03-121-27/+3
* | | grrr. stop making branding assumptions.zotlabs2017-03-126-13/+8
* | | more cleanupzotlabs2017-03-121-29/+35
* | | update std_versionzotlabs2017-03-121-1/+1
* | | db issueszotlabs2017-03-124-90/+8
* | | Merge branch 'dev' into redzotlabs2017-03-113-3/+27
|\| |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-112-2/+26
| |\|
| | * Login-box css-fix for Bluegrid schemejeroenpraat2017-03-111-1/+25
| | * Merge pull request #693 from anaqreon/devgit-marijus2017-03-111-1/+1
| | |\
| | | * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
| | |/
| * | stringszotlabs2017-03-101-3838/+3824
| * | Monday is a proper name and should be capitalised (except in private conversa...zotlabs2017-03-081-1/+1
| |/
* | stringszotlabs2017-03-101-3838/+3824
* | one role.zotlabs2017-03-094-61/+5
* | more cleanupzotlabs2017-03-093-40/+5
* | Merge branch 'dspr' into redzotlabs2017-03-0911-7395/+7326
|\ \
| * | move all the diaspora content hacks to the diaspora pluginzotlabs2017-03-081-408/+9
| * | DCV stuffzotlabs2017-03-071-20/+6
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
| |\
| | * allow post_activity_item to be passed an empty ACL without resetting to chann...zotlabs2017-03-061-1/+2
| | * add public_policy to the nwiki container also. This should not affect the rec...zotlabs2017-03-061-0/+2
| | * correct fix for wiki anonymous read issue (items_permissions_sql checks item....zotlabs2017-03-062-9/+6
| * | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
| |/
| * allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
| * do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
| * remove include/probe.php which has never completed development and has never ...zotlabs2017-03-054-106/+1
* | go back to where the problem startedzotlabs2017-03-092-600/+13
* | Merge branch 'dev' into redzotlabs2017-03-051824-18/+2
|\|
| * move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2
* | some event workzotlabs2017-03-052-0/+5
|/