opendocman icon indicating copy to clipboard operation
opendocman copied to clipboard

Added video/3gpp filetype

Open apmuthu opened this issue 9 years ago • 6 comments

DB Schema & SQL cleanup, fixes

apmuthu avatar Sep 15 '15 15:09 apmuthu

I better way to handle this type of merge is to create individual issues on the opendocman page and then create individual pull requests for each.

stephenlawrence avatar Oct 07 '15 15:10 stephenlawrence

@stephenlawrence: Thanks for the comments. I can create separate issues for these changes, but how does the separate pull request work? When I make a pull request, all future changes also get added in till the issue is merged or rejected!

apmuthu avatar Oct 07 '15 16:10 apmuthu

The install/odm.php is uptodate with the database.sql.

apmuthu avatar Oct 07 '15 16:10 apmuthu

I believe you would create a branch and odm issue for each of these changes and create a pull request from that branch into odm master.

stephenlawrence avatar Oct 08 '15 01:10 stephenlawrence

Have completed all SQL changes, Upgrades, Language cleanups, ERD updations, Categories in File List display. Updated the SQL changes in the comment above as well.

Next time I will make separate unit pull requests. Not proficient with Git branching and merging several tracks as yet.

You can now pull it all in. Just did a successful dry run.

apmuthu avatar Oct 08 '15 02:10 apmuthu

While I appreciate the efforts here this is not a good way of submitting code. I cannot merge in a large list of different issues, I need to be able to accept or reject individual changes and make comments on them. Some of them will not be included, some need changes applied, etc.. I have created new Issues for some of your changes which you can create branches for.

stephenlawrence avatar Oct 09 '15 14:10 stephenlawrence