SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 04:08:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
0aecdf7255
abapGit/src
History
WolfTreak 0aecdf7255 Possible solution to zabapgit merge functionality to resolve conflicts (#1407) 
* Merging per Textfile

* Add files via upload

* Delete WolfTreak_ABAPGIT_Merging

* Refactoring vom Coding, Darstellung verbessert

* Merging page changed and also merging class extended to instance and conflict methods added

* Refactoring for Travis

* Refactoring for Travis

* Escaping of merged content functions now correct
2018-05-27 16:20:43 +02:00
..
git error message, #1363 2018-05-10 07:30:09 +00:00
http Fix issue 1298 - 2FA behind HTTP Proxy 2018-04-05 12:41:26 +08:00
objects Merge pull request #1401 from christianguenter2/IEXT 2018-05-19 09:27:39 +02:00
persist error parsing xml, #1344 2018-05-07 12:31:13 +02:00
syntax more renaming #1132 (#1212) 2018-02-18 10:04:26 +01:00
ui Possible solution to zabapgit merge functionality to resolve conflicts (#1407) 2018-05-27 16:20:43 +02:00
utils Log: show ALV popup 2018-05-14 13:22:33 +02:00
xml Add unit test for render method (#1278) 2018-03-29 09:08:37 +02:00
zlib add unit tests for zlib (#1271) 2018-03-26 13:55:22 +02:00
package.devc.xml add packages 2017-10-05 15:04:30 +00:00
zabapgit_css_common.w3mi.data.css User specific abapGit settings 2018-04-23 21:28:09 +02:00
zabapgit_css_common.w3mi.xml warnings diplayed in yellow #650 2017-03-05 15:06:53 +02:00
zabapgit_forms.prog.abap Improve error messages (#1213) 2018-03-10 13:27:09 +01:00
zabapgit_forms.prog.xml update to latest abapGit format 2017-01-22 09:37:26 +00:00
zabapgit_js_common.w3mi.data.js #1014 stage can filter by username now 2017-10-21 18:34:26 +02:00
zabapgit_js_common.w3mi.xml W3xx remove filesize finetune, fixes #495 2016-12-12 14:29:45 +02:00
zabapgit_password_dialog.prog.abap Code inspector (#1272) 2018-03-28 08:08:20 +02:00
zabapgit_password_dialog.prog.xml update to latest abapGit format 2017-01-22 09:37:26 +00:00
zabapgit_unit_test_clas_intf.prog.abap Objects to global (#1187) 2018-02-11 09:16:16 +01:00
zabapgit_unit_test_clas_intf.prog.xml update to latest abapGit format 2017-01-22 09:37:26 +00:00
zabapgit_unit_test.prog.abap move some unit tests to global classes (#1210) 2018-02-17 12:53:06 +01:00
zabapgit_unit_test.prog.xml update to latest abapGit format 2017-01-22 09:37:26 +00:00
zabapgit.prog.abap better explanation, #1215 (#1216) 2018-02-24 10:02:49 +01:00
zabapgit.prog.xml XML skip initial data 2017-05-20 10:28:09 +02:00
zabapgit.tran.xml update to latest abapGit format 2017-01-22 09:37:26 +00:00
zcl_abapgit_auth.clas.abap More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zcl_abapgit_auth.clas.xml More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zcl_abapgit_background.clas.abap Default committer name and e-mail from SU01 (#1310) 2018-04-18 19:57:24 +02:00
zcl_abapgit_background.clas.xml More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zcl_abapgit_branch_overview.clas.abap More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zcl_abapgit_branch_overview.clas.xml More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zcl_abapgit_default_transport.clas.abap refactor transport popup 2018-05-08 19:09:30 +02:00
zcl_abapgit_default_transport.clas.xml refactor transport popup 2018-05-08 19:09:30 +02:00
zcl_abapgit_dependencies.clas.abap IEXT serialization 2018-05-14 22:15:00 +02:00
zcl_abapgit_dependencies.clas.xml Refactor resolve dependencies #964 (#978) 2017-10-10 17:32:53 +02:00
zcl_abapgit_dot_abapgit.clas.abap set default starting folder to src, close #1372 2018-05-13 07:30:28 +00:00
zcl_abapgit_dot_abapgit.clas.testclasses.abap trying to fix build, #1134 2018-01-13 11:18:28 +00:00
zcl_abapgit_dot_abapgit.clas.xml lcl_dot_abapgit to global (#1103) 2018-01-08 17:12:00 +01:00
zcl_abapgit_exit.clas.abap exit to modify http client #1252 (#1253) 2018-03-18 15:22:16 +01:00
zcl_abapgit_exit.clas.xml lcl_exit to global 2018-02-11 10:09:03 +00:00
zcl_abapgit_file_status.clas.abap Moving an object should be a deletion #1378 2018-05-13 09:34:33 +00:00
zcl_abapgit_file_status.clas.testclasses.abap Code inspector (#1272) 2018-03-28 08:08:20 +02:00
zcl_abapgit_file_status.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_folder_logic.clas.abap change assert to exception for invalid folder log. 2018-05-13 13:01:58 +02:00
zcl_abapgit_folder_logic.clas.testclasses.abap refactor transport popup 2018-05-08 19:09:30 +02:00
zcl_abapgit_folder_logic.clas.xml lcl_folder_logic to global 2018-01-14 13:53:08 +00:00
zcl_abapgit_http_client.clas.abap To global (#1192) 2018-02-11 10:07:05 +01:00
zcl_abapgit_http_client.clas.xml To global (#1192) 2018-02-11 10:07:05 +01:00
zcl_abapgit_merge.clas.abap Possible solution to zabapgit merge functionality to resolve conflicts (#1407) 2018-05-27 16:20:43 +02:00
zcl_abapgit_merge.clas.xml Possible solution to zabapgit merge functionality to resolve conflicts (#1407) 2018-05-27 16:20:43 +02:00
zcl_abapgit_migrations.clas.abap remove old migrations #1373 2018-05-10 09:00:36 +00:00
zcl_abapgit_migrations.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_news.clas.abap Code inspector (#1272) 2018-03-28 08:08:20 +02:00
zcl_abapgit_news.clas.testclasses.abap lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_news.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_objects_bridge.clas.abap lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_objects_bridge.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_objects.clas.abap Only show transport popup when needed 2018-05-10 21:48:36 +02:00
zcl_abapgit_objects.clas.testclasses.abap fix SUPPORTED_LIST (#1293) 2018-04-03 16:22:03 +02:00
zcl_abapgit_objects.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_repo_content_list.clas.abap more renaming #1132 (#1212) 2018-02-18 10:04:26 +01:00
zcl_abapgit_repo_content_list.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_repo_offline.clas.abap lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_repo_offline.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_repo_online.clas.abap refactor transport popup 2018-05-08 19:09:30 +02:00
zcl_abapgit_repo_online.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_repo_srv.clas.abap clone without pull #832 (#1371) 2018-05-11 10:14:51 +02:00
zcl_abapgit_repo_srv.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_repo.clas.abap Only show transport popup when needed 2018-05-10 21:48:36 +02:00
zcl_abapgit_repo.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_sap_package.clas.abap refactor transport popup 2018-05-08 19:09:30 +02:00
zcl_abapgit_sap_package.clas.xml lcl_sap_package to global 2018-01-12 11:36:33 +00:00
zcl_abapgit_settings.clas.abap ZCL_ABAPGIT_SETTINGS: fixe naming convention 2018-05-13 12:11:22 +02:00
zcl_abapgit_settings.clas.xml lcl_settings to global 2018-01-12 12:24:59 +00:00
zcl_abapgit_skip_objects.clas.abap fix some naming conventions #1132 (#1211) 2018-02-17 13:55:12 +01:00
zcl_abapgit_skip_objects.clas.xml To global (#1192) 2018-02-11 10:07:05 +01:00
zcl_abapgit_stage_logic.clas.abap lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_stage_logic.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_stage.clas.abap Code inspector (#1272) 2018-03-28 08:08:20 +02:00
zcl_abapgit_stage.clas.xml lcl_stage to global (#1133) 2018-01-13 11:43:10 +01:00
zcl_abapgit_syntax_check.clas.abap ignore deleted objects in syntax check 2018-03-16 16:05:08 +01:00
zcl_abapgit_syntax_check.clas.xml first steps #911 2017-09-11 17:53:06 +00:00
zcl_abapgit_tadir.clas.abap fix dump 2018-05-10 06:17:25 +00:00
zcl_abapgit_tadir.clas.xml lcl_repo (#1205) 2018-02-15 15:10:13 +01:00
zcl_abapgit_transport_2_branch.clas.abap lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_transport_2_branch.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_transport_objects.clas.abap To global (#1192) 2018-02-11 10:07:05 +01:00
zcl_abapgit_transport_objects.clas.testclasses.abap Adjust transport unit test 2018-03-17 12:52:52 +01:00
zcl_abapgit_transport_objects.clas.xml To global (#1192) 2018-02-11 10:07:05 +01:00
zcl_abapgit_transport.clas.abap transport to zip, choose folder logic (#1291) 2018-04-03 16:21:20 +02:00
zcl_abapgit_transport.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcl_abapgit_zip.clas.abap Package to zip: check if package exists 2018-05-14 13:13:51 +02:00
zcl_abapgit_zip.clas.xml lcl zip (#1206) 2018-02-15 15:50:51 +01:00
zcx_abapgit_cancel.clas.abap Create global exception classes 2017-10-25 21:04:30 +00:00
zcx_abapgit_cancel.clas.xml Create global exception classes 2017-10-25 21:04:30 +00:00
zcx_abapgit_exception.clas.abap Backport ZCX_ABAPGIT_EXCEPTION to 7.02 2018-03-17 13:01:37 +01:00
zcx_abapgit_exception.clas.testclasses.abap Backport ZCX_ABAPGIT_EXCEPTION to 7.02 2018-03-17 13:01:37 +01:00
zcx_abapgit_exception.clas.xml Improve error messages (#1213) 2018-03-10 13:27:09 +01:00
zcx_abapgit_not_found.clas.abap Beautify 2 2017-10-25 21:55:46 +00:00
zcx_abapgit_not_found.clas.xml Cleanup 2017-10-25 21:24:40 +00:00
zif_abapgit_auth.intf.abap additional auth checks #1231 (#1269) 2018-03-26 12:23:19 +02:00
zif_abapgit_auth.intf.xml More classes to global (#1209) 2018-02-17 12:40:54 +01:00
zif_abapgit_definitions.intf.abap Possible solution to zabapgit merge functionality to resolve conflicts (#1407) 2018-05-27 16:20:43 +02:00
zif_abapgit_definitions.intf.xml fix syntax error, #1195 2018-02-11 11:09:13 +00:00
zif_abapgit_dot_abapgit.intf.abap trying to fix build, #1134 2018-01-13 11:18:28 +00:00
zif_abapgit_dot_abapgit.intf.xml trying to fix build, #1134 2018-01-13 11:18:28 +00:00
zif_abapgit_exit.intf.abap exit to modify http client #1252 (#1253) 2018-03-18 15:22:16 +01:00
zif_abapgit_exit.intf.xml lcl_exit to global 2018-02-11 10:09:03 +00:00
zif_abapgit_sap_package.intf.abap refactor transport popup 2018-05-08 19:09:30 +02:00
zif_abapgit_sap_package.intf.xml lcl_sap_package to global 2018-01-12 11:36:33 +00:00