Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

authpartner

Clone or download

conflict file

Download Browse
+0 −13
Testelocker Server 2017-06-20 17:39
Testelocker Server 2017-06-20 17:39
4c749bdba866b499340b25ecf93dd2b144fb963f
git #authpartner/4c749bdba866b499340b25ecf93dd2b144fb963f

Modified Files

List
Side by side diff
M footer.php
+0 −2
--- 'a/footer.php'
+++ b/footer.php
@@ -31,11 +31,9 @@
</div><!-- .container -->
</footer>
</div>
-<script language="javascript" charset="UTF-8" type="text/javascript" src="js/stats.js"></script>
<!-- /.container -->
<!-- jQuery -->
<!-- Bootstrap Core JavaScript -->
-
<script src="js/bootstrap.min.js"></script>
</body>
</html>
\ No newline at end of file
M uploaddoc.php
+0 −1
--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -116,7 +116,6 @@ $dataF = json_decode($resFileNew[1], TRU
</tr>
</thead>
<tbody id="folderPath">
- <div id="loading" style="height:42px; width:56px; margin:0 auto;"></div>
<?php
foreach ((array) ($dataF['items']) as $api_detail) {
if (isset($api_detail['id'])) {
M xml/hashKey.xml
+0 −5
--- 'a/xml/hashKey.xml'
+++ b/xml/hashKey.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<maincontent>
- <code num="24dfacffaa4aa27cd674cadb6a35a87455fb5ba1"/>
- <access_token>92429a583136ed134cbb41f7eab3562d0a926d0e</access_token>
-</maincontent>
M xml/hashhkey.xml
+0 −5
--- 'a/xml/hashhkey.xml'
+++ b/xml/hashhkey.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<maincontent>
- <code num="e1134f28fd037eaa64fd8bf4f13cfef09cde9ee7"/>
- <access_token>60b9e6cfa9a8a2b443d9e42c1373764428c71bf2</access_token>
-</maincontent>