{"push_id":552180814,"size":6,"distinct_size":1,"ref":"refs/heads/feature/project-setup-layout","head":"eab0ad3b055ec325e70a8792a4d03c4df365050b","before":"d6b5a057babe36dd22e886e448015ae2eb42e033","commits":[{"sha":"388b4a060da7c6b7d7ecdeb9701fdeef5393f3e9","author":{"email":"711c73f64afdce07b7e38039a96d2224209e9a6c@hirtfamily.net","name":"Chris Hirt"},"message":"Merge pull request #57 from sil-jterm-2015-taylor-c/feature/project-setup-layout\n\nFeature/project setup layout from taylor c","distinct":false,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/388b4a060da7c6b7d7ecdeb9701fdeef5393f3e9"},{"sha":"06667040dadf2335397c6f15ad8a96bc47a1a85f","author":{"email":"3385f54eb02b54e31a8a37c15a6a11d6e8553ffa@gmail.com","name":"Cambell"},"message":"wip assets/upload: Improve asset uploading\n\n- Improved test coverage\n- Changed usfm upload to upload of zip pack\n- Removed some *.orig files from the repo\n\nTODO\n- Pull from database on page load\n\nSquashed commit of the following:\n\ncommit 5b31975808463df3e4252a471c574fe48dcb8174\nAuthor: Justin Southworth <justin_southworth@taylor.edu>\nDate:   Wed Jan 21 12:46:53 2015 +0700\n\n    wip #5: Edit Discussion test to point to correct file.\n\ncommit e18b2945093c737a2c4352f80c920a3e29c0f66b\nMerge: c37b405 596e3ae\nAuthor: Justin Southworth <justin_southworth@taylor.edu>\nDate:   Wed Jan 21 11:24:24 2015 +0700\n\n    Merge branch 'master' into feature/assets\n\n    Conflicts:\n    \tsrc/angular-app/scriptureforge/webtypesetting/views/composition.css\n    \tsrc/angular-app/scriptureforge/webtypesetting/views/projectSetup.assets.html\n    \tsrc/angular-app/scriptureforge/webtypesetting/views/projectSetup.assets.js\n    \tsrc/models/scriptureforge/webtypesetting/SettingListModel.php\n    \tsrc/models/scriptureforge/webtypesetting/commands/TypesettingUploadCommands.php\n    \tsrc/service/sf.php\n    \ttest/app/scriptureforge/webtypesetting/e2e/assetSettingsPage.spec.js\n    \ttest/app/scriptureforge/webtypesetting/pages/assetSettingsPage.js\n    \ttest/php/scriptureforge/typesetting/commands/AllTests.php\n    \ttest/php/scriptureforge/typesetting/commands/TypesettingUploadCommands_Test.php\n\ncommit c37b4054f17c6826f9d2b04ce24b4cbfe54d1a63\nAuthor: Justin Southworth <justin_southworth@taylor.edu>\nDate:   Wed Jan 21 10:35:15 2015 +0700\n\n    wip #5: Finish PNG upload tests. All pass.\n\n    Existing tests:\n    - Upload succeeds\n    - JPG w/ .png extension fails\n    - PNG w/ .jpg extension fails\n    - Delete succeeds\n\ncommit f9e8caaa5b3a1b20360fc01af53eb4be2eea9c8d\nAuthor: irahopkinson <ira.hopkinson@gmail.com>\nDate:   Tue Jan 20 16:07:58 2015 +0700\n\n    wip #5: wip - adding mock upload of USFM zip\n\ncommit 4e4c5425748370d8844dcc3b9c7902eb6a224c63\nAuthor: irahopkinson <ira.hopkinson@gmail.com>\nDate:   Tue Jan 20 16:05:45 2015 +0700\n\n    wip #5: modify mock upload directive to allow an optional parameter in the file Select function.\n\ncommit e333d312b771acacb1d443390af0d8941120bef9\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Tue Jan 20 03:57:05 2015 -0500\n\n    Bug fix\n\n    - Fixed exception by making a function static\n\ncommit d954076dda7212f226aa1ddb907e1860d6c7e85d\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Tue Jan 20 03:25:12 2015 -0500\n\n    wip #5 Return filepath from backend when image is uploaded\n\n    - Image shows with filename upon uploading an image\n\ncommit 648d86617270eef3517a413538176a70e3c84ade\nAuthor: jsouthwo <justin_southworth@taylor.edu>\nDate:   Tue Jan 20 03:35:31 2015 -0500\n\n    wip #5: Fixing delete tests\n\n    - Old file was removed, causing errors.\n\ncommit 697c38be15b97ecf5b6d123536a47f519fae1523\nAuthor: jsouthwo <justin_southworth@taylor.edu>\nDate:   Tue Jan 20 02:33:55 2015 -0500\n\n    wip #5: Saving changes for changing computers.\n\ncommit a8321879c7227bb6e0b78b28f607014def69de7d\nAuthor: nread <nathaniel_read@taylor.edu>\nDate:   Tue Jan 20 15:19:49 2015 +0700\n\n    wip #5 Added in delete functionality and tests for png and zip files\n\ncommit f6c560860d1e4b56e6a8d4622555671dc02c4b0a\nAuthor: irahopkinson <ira.hopkinson@gmail.com>\nDate:   Tue Jan 20 14:22:02 2015 +0700\n\n    wip #5: uploading zip file E2E\n\ncommit d10edf2630bd13f39b2b87c3d21a724cee8f85c9\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Tue Jan 20 01:11:23 2015 -0500\n\n    wip #5 Overwrite unzipped contents when unpacking\n\ncommit b9f6d30604416e6a6b91fd90a4a20eb1365cc23b\nAuthor: irahopkinson <ira.hopkinson@gmail.com>\nDate:   Tue Jan 20 12:59:27 2015 +0700\n\n    wip #5: PHP setup for functional E2E tests\n\n    - can navigate to Assets Settings page\n\ncommit b7a7e4d4ca21406ca6b19a97ebfea9dd43bbab92\nAuthor: nread <nathaniel_read@taylor.edu>\nDate:   Tue Jan 20 11:20:48 2015 +0700\n\n    wip #5 Added typesetting tests for zip file upload and added testImage for typesetting tests.\n\ncommit b6e14617c8fce99f12966351273982c107da369e\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 23:18:39 2015 -0500\n\n    wip #5 Comment out dropdown until purpose is determined\n\ncommit 089162a5b4f826b17a5ef03beef01091bfa86997\nAuthor: Justin Southworth <justin_southworth@taylor.edu>\nDate:   Tue Jan 20 11:15:30 2015 +0700\n\n    wip #5: Starting on png uploads.\n\n    - Working on unit tests\n\ncommit 344cf8b3136b764ec55ae8dfda1b9b221e7812d5\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 23:03:04 2015 -0500\n\n    wip #5 Connected the front end to the back end to successfully upload a zip file containing usfm files\n\ncommit f14334011092acdc59acad217249679f425c8073\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 22:47:46 2015 -0500\n\n    wip #5 Minor commenting and clean up work\n\n    - Comment out deletion for an item\n    - Comment out Cover/Maps section\n\ncommit 269ffb41df3ef4cbd4a2eea0fd1c76354581c160\nAuthor: jhapner <joshua_hapner1@taylor.edu>\nDate:   Mon Jan 19 22:49:10 2015 -0500\n\n    wip #5: e2e webtypesetting environment setupTestEnvironment\n\n    -setup e2e environment for the webtypesetting app\n    -still some minor bugs\n\ncommit 7c2261473e09fbe60dae40ede2c6d0788ff4d50f\nAuthor: jhapner <joshua_hapner1@taylor.edu>\nDate:   Mon Jan 19 04:34:36 2015 -0500\n\n    e2e Test Environment\n\n    -Worked with Chris to setup typesetting test environment\n\ncommit d41078ae2c66844c3f948e3cad26fa3209e9e340\nAuthor: jhapner <joshua_hapner1@taylor.edu>\nDate:   Mon Jan 19 03:05:06 2015 -0500\n\n    wip #5 assetSettings e2etests\n\n    -initial test created\n\ncommit 2b3151fa4a86e80c9d0ecf7e8af69b8be499c092\nAuthor: irahopkinson <ira.hopkinson@gmail.com>\nDate:   Tue Jan 20 10:31:05 2015 +0700\n\n    wip #5: add usfm zip upload and initial TestTypesettingProject\n\ncommit 6dbb852598a137bb9e00552bc5c9e59111b74d9b\nAuthor: nread <nathaniel_read@taylor.edu>\nDate:   Mon Jan 19 16:38:38 2015 +0700\n\n    wip #5: add zip upload of USFM files from ParaTExt\n\n    TODO - write unit tests\n\ncommit ab562eda432fc6bf9e66a95ae1cdbc22dd732cb3\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 04:02:57 2015 -0500\n\n    wip #5 Change data structure to use zip instead of usfm and minor ui improvement\n\ncommit f36131e6c636f049fd3123df2a884b49ef4a7cce\nAuthor: ryanklimt <ryanklimt@gmail.com>\nDate:   Mon Jan 19 15:59:30 2015 +0700\n\n    wip #5: added test to check that disallowed upload files are not accepted\n\ncommit 32d96e608b1cb6fc77a904bd6dcf16323d17c5ed\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 03:28:47 2015 -0500\n\n    wip #5 Show name of asset instead of showing the whole data object\n\ncommit 0dcf90a67dc5ae2996c2ed2340dd3020110cc834\nAuthor: ryanklimt <ryanklimt@gmail.com>\nDate:   Mon Jan 19 15:13:14 2015 +0700\n\n    wip #5: can upload a USFM file\n\n    - To get unit test to pass, you must create /home/rapuma and give it 777 permissions\n\ncommit e4dd4e7c642e85241a1cf4265dda39decc57db1e\nMerge: 11be8e8 992d6f5\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 03:14:18 2015 -0500\n\n    Merge branch 'feature/assets' of https://github.com/sil-jterm-2015-taylor-a/sfwebchecks into feature/assets\n\ncommit 11be8e80c1e6e6b8e9f8ccc3e3c9c7f24c0280bc\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Mon Jan 19 03:13:59 2015 -0500\n\n    wip #5 Cleaned up the ui to match the original design doc and added functionality to separate the different sections\n\n    - Different sections\n    - Progress bar goes right to left and looks like it should\n\n    - Minor styling things need to be moved to css file\n\ncommit 992d6f5dafa4fcaa37e86e68d063369386d2b719\nAuthor: nread <nathaniel_read@taylor.edu>\nDate:   Mon Jan 19 15:03:30 2015 +0700\n\n    wip #7 Remade models to reflect changes in the assets page per Ira.  Have working CRUD tests.\n\ncommit 7d13b7146f6e1c1978b6ab6fbe9270467e45ecc4\nAuthor: nread <nathaniel_read@taylor.edu>\nDate:   Mon Jan 19 13:49:33 2015 +0700\n\n    wip #7: added attributes to Asset models and updated CRUD tests\n\n    todo:\n    -add CRUD tests for ArrayOf attributes\n\ncommit f70ca5aafd6390625f3ec9901f2c5e9bec45f84e\nAuthor: ryanklimt <ryanklimt@gmail.com>\nDate:   Mon Jan 19 12:01:33 2015 +0700\n\n    wip #5: add PHP file upload commands\n\n    - No unit tests yet\n    - Internal server error from UI\n\ncommit d07587540bab5a47fc0888416ae13a9da02161ff\nAuthor: ryanklimt <ryanklimt@gmail.com>\nDate:   Mon Jan 19 11:10:24 2015 +0700\n\n    fix sfchecks audio upload so it can be mocked for E2E. IJH.\n\ncommit 9b3e3f7c061bf860f5898a9e470634cce9aaf9aa\nAuthor: Justin Southworth <justin_southworth@taylor.edu>\nDate:   Mon Jan 19 11:20:42 2015 +0700\n\n    wip #5 Adding back old design doc, as it's what we're implementing.\n\ncommit c34415868c037f6568ccc557534712cc89aafbbe\nAuthor: bsell93 <bryantsell@gmail.com>\nDate:   Sun Jan 18 22:45:47 2015 -0500\n\n    wip #5 Changes to UI to conform to design docs","distinct":false,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/06667040dadf2335397c6f15ad8a96bc47a1a85f"},{"sha":"94e4c692f1b00e18e7b3fbd2408a4f07d6181ee4","author":{"email":"3385f54eb02b54e31a8a37c15a6a11d6e8553ffa@gmail.com","name":"cambell-prince"},"message":"Merge pull request #58 from sil-jterm-2015-taylor-a/feature/assetsPR\n\nAssets upload","distinct":false,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/94e4c692f1b00e18e7b3fbd2408a4f07d6181ee4"},{"sha":"75e7b4356f4ac39c835e7c84afcd75f5fbaa3ff3","author":{"email":"3385f54eb02b54e31a8a37c15a6a11d6e8553ffa@gmail.com","name":"Cambell"},"message":"wip feature/saveNamedConfiguration: Load and Save named configurations (templates)\n\nConflicts:\n\tsrc/angular-app/scriptureforge/webtypesetting/views/projectSetup.layout.html\n\tsrc/angular-app/scriptureforge/webtypesetting/views/projectSetup.layout.js\n\tsrc/models/scriptureforge/webtypesetting/SettingModel.php","distinct":false,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/75e7b4356f4ac39c835e7c84afcd75f5fbaa3ff3"},{"sha":"5f0eafbc80443ccc72fd5ba6f946984d96647042","author":{"email":"3385f54eb02b54e31a8a37c15a6a11d6e8553ffa@gmail.com","name":"cambell-prince"},"message":"Merge pull request #60 from sil-jterm-2015-taylor-b/feature/saveNamedConfigurations\n\n#4: Feature/save named configurations","distinct":false,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/5f0eafbc80443ccc72fd5ba6f946984d96647042"},{"sha":"eab0ad3b055ec325e70a8792a4d03c4df365050b","author":{"email":"3385f54eb02b54e31a8a37c15a6a11d6e8553ffa@gmail.com","name":"Cambell"},"message":"Fix #6 feature/layout: Layout page complete\n\n- Layout page\n- Backend complete\n- Auto save works\n- Manual save with button\n\nConflicts:\n\tsrc/angular-app/scriptureforge/webtypesetting/views/projectSetup.layout.html","distinct":true,"url":"https://api.github.com/repos/sil-jterm-2015-taylor-c/sfwebchecks/commits/eab0ad3b055ec325e70a8792a4d03c4df365050b"}]}