aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-071-43/+63
|\
| * rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-061-43/+63
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-062-1/+190
|\|
| * move pconfig to static classredmatrix2016-06-051-0/+189
| * We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-054-10/+22
|\|
| * short-term solution to emoji size issue - make them 32px from the senderredmatrix2016-06-041-1/+1
| * class functions called incorrectlyredmatrix2016-06-041-3/+3
| * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| * allow any (current) emoji to be displayed on any site, and provide a default ...redmatrix2016-06-031-1/+11
| * turn emoji ability into a feature so that either a member or the site admin c...redmatrix2016-06-031-0/+1
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-032-7/+103
|\|
| * experimental emoji supportredmatrix2016-06-021-0/+50
| * preserve app categories when updating a system appredmatrix2016-06-021-7/+25
| * adjust algorithm to ensure new system apps are installed.redmatrix2016-06-021-3/+12
| * install system apps if a) they have never been installed, or b) if the app ve...redmatrix2016-06-021-10/+29
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-0225-196/+189
|\|
| * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0125-196/+189
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-0121-184/+66
|\|
| * more db column renamesredmatrix2016-05-3117-57/+56
| * more removal of reserved words from DB schemasredmatrix2016-05-314-10/+10
| * remove unused tablesredmatrix2016-05-301-117/+0
* | Merge branch 'dev' into sabre32Mario Vavti2016-05-313-5/+171
|\|
| * start removing reserved words from database column names (this run: addon and...redmatrix2016-05-302-5/+5
| * begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-301-0/+166
* | Merge branch 'dev' into sabre32Mario Vavti2016-05-302-3/+3
|\|
| * undefined functionredmatrix2016-05-291-1/+1
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-2/+2
* | upgrade to sabre32Mario Vavti2016-05-281-2/+2
|/
* link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
* track down some issues from the application logsredmatrix2016-05-261-2/+2
* consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-261-59/+1
* another typoMario Vavti2016-05-261-1/+1
* check if $addonDir is a dir to silence warning if it does not existMario Vavti2016-05-261-5/+7
* typoMario Vavti2016-05-261-1/+1
* Merge pull request #402 from git-marijus/devhubzilla2016-05-262-0/+4
|\
| * another try on #385 - replace sabres restrictive CSP with what we do in boot.phpMario Vavti2016-05-252-0/+4
* | some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-251-1/+1
* | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
|/
* require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-241-0/+1
* more work associated with DBA and index.php shuffleredmatrix2016-05-242-42/+14
* relocate index and dbredmatrix2016-05-242-12/+205
* moved enotifyredmatrix2016-05-243-5/+691
* typoredmatrix2016-05-231-1/+1
* change the signed token format. We don't folks to be able to submit random te...redmatrix2016-05-221-1/+1
* Can't use "use x as y" aliases in callback function declarationsredmatrix2016-05-221-1/+1
* move chatroom stuff to zlibredmatrix2016-05-223-15/+286
* add missing fileredmatrix2016-05-221-0/+659
* move apps to zlibredmatrix2016-05-222-16/+18