aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* s/$rr/$rv/redmatrix2016-08-141-22/+22
* event_store_event hookredmatrix2016-08-143-0/+21
* Merge pull request #484 from anaqreon/settings-contexthubzilla2016-08-152-1/+13
|\
| * Context help for settings/features pageAndrew Manning2016-08-142-1/+13
|/
* Merge pull request #482 from anaqreon/nocommenthubzilla2016-08-145-0/+35
|\
| * Change text for submenu on small screens to be static toggle statementAndrew Manning2016-08-142-1/+2
| * Replace hardcoded button title in javascript to translatable textAndrew Manning2016-08-142-2/+4
| * Added a disable comments setting to the "Additional features" settings with a...Andrew Manning2016-08-145-0/+32
* | fix javascript error if not logged inMario Vavti2016-08-141-2/+2
|/
* update bootstrap 3.3.5 > 3.3.7Mario Vavti2016-08-146-138/+111
* btn/dropdown rendering issueMario Vavti2016-08-141-24/+30
* remove js debuggingMario Vavti2016-08-131-1/+0
* fix #480, enable bbcode autocomplete for photo comments and remove some redun...Mario Vavti2016-08-134-16/+3
* pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
* string updateredmatrix2016-08-122-3626/+3620
* Merge pull request #479 from git-marijus/devhubzilla2016-08-131-0/+6
|\
| * possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
* | fix auto-connect settingzottel2016-08-121-3/+0
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-1214-232/+375
|\|
| * better method of dealing with api versionsredmatrix2016-08-111-23/+29
| * more cleanup of apiredmatrix2016-08-112-110/+110
| * move error processing back inside the functionredmatrix2016-08-111-22/+22
| * embed filter adjustmentsredmatrix2016-08-111-13/+17
| * A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but yo...redmatrix2016-08-114-117/+173
| * forum detection was off for forums with custom permsredmatrix2016-08-101-1/+3
| * optimise Onepoll so it doesn't try and fetch posts for a channel that we've n...redmatrix2016-08-101-0/+9
| * initialise jot editor if it is used as a file drop target and isn't yet opened.redmatrix2016-08-101-1/+6
| * update CHANGELOG for 1.12redmatrix2016-08-101-0/+25
| * new versionredmatrix2016-08-101-1/+1
| * implement acl for folder creationMario Vavti2016-08-104-17/+53
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-08-1070-2514/+2837
|\|
| * open editor or comment window when linkdropping to a closed window. We probab...redmatrix2016-08-101-4/+18
| * allow dropping links on comments as well as postsredmatrix2016-08-092-2/+4
| * function order reversedredmatrix2016-08-091-2/+2
| * You can drag links to the editor (which will be parsed and inserted); as well...redmatrix2016-08-092-2/+2
| * bad code formatredmatrix2016-08-092-2/+27
| * updates to hcard parsingredmatrix2016-08-071-4/+9
| * diaspora vcard updatesredmatrix2016-08-072-5/+12
| * server rolesredmatrix2016-08-071-6/+8
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-0724-71/+135
| * fix cloud pathredmatrix2016-08-071-1/+1
| * fix /cloud upload for imagesMario Vavti2016-08-061-1/+1
| * bring back acl for cloud file uploadsMario Vavti2016-08-064-19/+31
| * strings updateredmatrix2016-08-051-2270/+2333
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0538-121/+242
| |\
| | * Merge pull request #477 from git-marijus/devhubzilla2016-08-0637-119/+200
| | |\
| | | * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| | | * Revert "remove some logging"Mario Vavti2016-08-051-1/+10
| | | * remove some loggingMario Vavti2016-08-051-10/+1
| | | * multi acl: port /settingsMario Vavti2016-08-053-5/+7