Added video/3gpp filetype #220
Conversation
|
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: 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! |
|
The install/odm.php is uptodate with the database.sql. |
Synched database.sql with install/odm.php Arranged the tables in alphabetical order in database.sql to match dumps opendocman#220 (comment)
Cleaned up all language files and synced them with english file All language files are now in same string order
|
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. |
|
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. |
|
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. |
opendocman@701d219 The new minimum value is 1000-01-01 00:00:00 https://dev.mysql.com/doc/refman/5.5/en/datetime.html
DB Schema & SQL cleanup, fixes