aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1.10RC'1.10redmatrix2016-07-281-5/+12
|\
| * Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1...redmatrix2016-07-281-68/+3
| * check for new permissions and update channels and connections with defaults i...redmatrix2016-07-251-0/+64
| * trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-241-1/+1
| * permission fixesredmatrix2016-07-191-0/+1
| * Merge branch 'dev' into permsredmatrix2016-07-181-10/+2
| |\
| | * runaway cron emailsredmatrix2016-07-181-10/+2
| | * whitespaceMario Vavti2016-07-181-2/+0
| | * resolve merge conflictMario Vavti2016-07-181-0/+2
| | |\
| | | * change std_versionredmatrix2016-07-171-1/+1
| * | | Merge branch 'dev' into permsredmatrix2016-07-171-3/+3
| |\| |
| | * | roll versionredmatrix2016-07-171-1/+1
| | |/
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-151-1/+1
| | |\
| | | * bump minor version because of jquery updateMario Vavti2016-07-151-1/+1
| | * | login isn't always your email.redmatrix2016-07-151-1/+1
| | |/
| | * schema updates for zot access tokensredmatrix2016-07-141-1/+1
| * | more work on permsredmatrix2016-07-091-1/+1
| |/
| * if cron is broken because the entire db or config table is crashed, don't sen...redmatrix2016-06-301-0/+9
| * db update for abconfig transitionredmatrix2016-06-231-1/+1
| * relocate the cache classredmatrix2016-06-231-1/+0
| * last merge from master did reset the std_version to 1.8 - set it back to 1.9 ...Mario Vavti2016-06-201-1/+1
| * Merge branch 'master' into devMario Vavti2016-06-201-2/+2
| |\
| * | experimental rtl support; this will probably require a fair bit of work.redmatrix2016-06-191-0/+7
| * | schema changes needed for the caldav client bitredmatrix2016-06-181-1/+1
| * | deprecate the item_id table - replace with iconfig. A possibly useful functio...redmatrix2016-06-131-1/+1
* | | move revision upredmatrix2016-06-221-1/+1
| |/ |/|
* | merge conflictredmatrix2016-06-191-6/+0
* | zot_revision should be string, not float1.8redmatrix2016-06-191-1/+1
* | Merge branch '1.8RC'redmatrix2016-06-191-170/+191
|\|
| * move dev forwardredmatrix2016-06-101-1/+1
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-0/+7
| |\
| | * issue #59redmatrix2016-06-081-0/+7
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-0/+1
| |\|
| | * For emojis in posts, extend smilies and save a lot of duplication of effortredmatrix2016-06-041-0/+1
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-1/+1
| |\|
| | * App::init() should be staticredmatrix2016-06-031-1/+1
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-021-5/+6
| |\|
| | * some initial emoji reaction workredmatrix2016-06-021-0/+1
| | * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-011-2/+2
| | * more db column renamesredmatrix2016-05-311-2/+2
| | * more removal of reserved words from DB schemasredmatrix2016-05-311-1/+1
| | * remove unused tablesredmatrix2016-05-301-1/+1
| | * start removing reserved words from database column names (this run: addon and...redmatrix2016-05-301-4/+4
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-291-1/+1
| |\|
| | * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-1/+1
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-281-13/+30
| |\|
| | * allow objs to represent inventoryredmatrix2016-05-271-3/+3
| | * check for session before querying session varsredmatrix2016-05-271-10/+27
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-271-29/+91
| |\|
| | * don't need quite so many backslashesredmatrix2016-05-261-11/+11