aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-03107-692/+755
|\
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-032-95/+95
| |\
| | * some theming for emoji buttonMario Vavti2016-06-032-95/+95
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0366-8/+146
| |\|
| | * restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| | * menu entries for basic emoji support. I could use a bit of help theming this....redmatrix2016-06-022-0/+33
| | * experimental emoji supportredmatrix2016-06-0261-0/+52
| | * some initial emoji reaction workredmatrix2016-06-022-1/+6
| | * 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-0242-616/+541
| |\|
| | * check all return valuesredmatrix2016-06-011-1/+1
| | * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0142-616/+541
* | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-0146-461/+295
|\| |
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0146-461/+295
| |\|
| | * more db column renamesredmatrix2016-05-3136-163/+210
| | * more removal of reserved words from DB schemasredmatrix2016-05-3112-37/+54
| | * provide a sort of mutex lock around db logging so it can't possibly recurse. ...redmatrix2016-05-312-10/+18
| | * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| | * remove unused tablesredmatrix2016-05-305-258/+17
| * | Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
| |\|
| * | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-05-300-0/+0
| |\ \
| * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-305-5/+7
| |\ \ \
* | \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | remove a bunch of unused stuff, some of which is orphaned and some which repr...redmatrix2016-05-30343-54949/+0
| * | | don't update hubloc_connected any more often than 15 minutes. We don't requir...redmatrix2016-05-301-5/+11
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-303-18/+21
| |\ \ \
| | * \ \ Merge pull request #405 from git-marijus/devhubzilla2016-05-313-18/+21
| | |\ \ \
| | | * | | render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-303-18/+21
| | | | |/ | | | |/|
| * | | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-3010-33/+51
| * | | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-302-144/+183
| |/ / /
| * / / redundant dev line from an earlier modification causes issue #404redmatrix2016-05-302-20/+6
| |/ /
* | / Merge branch 'dev' into sabre32Mario Vavti2016-05-305-5/+7
|\| | | |/ |/|
| * undefined functionredmatrix2016-05-291-1/+1
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-294-4/+6
* | use composer to install sabre32Mario Vavti2016-05-2947-1338/+125
* | missed some filesMario Vavti2016-05-2938-1276/+2663
* | upgrade to sabre32Mario Vavti2016-05-28228-8563/+10075
|/
* allow objs to represent inventoryredmatrix2016-05-274-4/+25
* strings updateredmatrix2016-05-271-2109/+2099
* check for session before querying session varsredmatrix2016-05-271-10/+27
* link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
* track down some issues from the application logsredmatrix2016-05-263-4/+13
* don't need quite so many backslashesredmatrix2016-05-261-11/+11
* consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-2616-100/+82
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-263-7/+9
|\
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 03:50:20 +0000