wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6988 commits 157 branches 562 tags 714 MiB
Commit graph

6988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Gapczynski
68c8faf39c Correct checking item source for share from same owner when generating item target 2012-10-02 16:37:39 -04:00
Björn Schießle
431d92e7b2 we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name 2012-10-02 21:37:10 +02:00
Björn Schießle
db954f5aba remove unnecessary code and add missing items to select statement 2012-10-02 18:59:20 +02:00
Björn Schießle
92b37119e3 remove textbox after pressing "enter" even if the name is the same 2012-10-02 18:38:17 +02:00
Jörn Friedrich Dreyer
39735721ec escape identifiers in queries 2012-10-02 14:11:25 +02:00
Björn Schießle
3e3038cafc merge all possible conflicts into on array 2012-10-02 13:10:46 +02:00
Frank Karlitschek
3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number. 
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
 2012-10-02 12:10:45 +02:00
Arthur Schiwon
783c02eda9 fix create folder and upload file issue on win, fixes oc-1747, solution follows suggestion from bug tracker 2012-10-02 11:45:47 +02:00
Björn Schießle
c6c0fcc7c8 We can't rely on the assumption that if the matching target is from the same owner that the share type will be different. 
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated

If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
 2012-10-02 11:41:26 +02:00
Björn Schießle
550813ce41 don't use the complete path but the basename if the file/foder has no extension. Otherwise 
we can end up with  different items in the shared directory with the same name (Also folder names can contain dots)
 2012-10-02 11:41:26 +02:00
Jenkins for ownCloud
f0c4356392 [tx-robot] updated from transifex 2012-10-02 02:06:08 +02:00
Thomas Tanghus
36696a8057 Fixed old, annoying css error that it turned out I had made myself :-P 2012-10-01 23:42:45 +02:00
Lukas Reschke
538c2662a9 Merge pull request #23 from lipemat/patch-1 
Fix the File Upload Button in Chrome
Arrow was showing under the button in Chrome. With this commit it should be shown correctly.
 2012-10-01 10:28:51 -07:00
Arthur Schiwon
68fa2b10da Search: fix Notice and thus broken search with activiated error reporting 2012-10-01 19:11:26 +02:00
Arthur Schiwon
33e9399ba3 LDAP: fix sharing doesn't work with ldap groups, oc-1819 2012-10-01 18:27:58 +02:00
Georg Ehrke
43c85248d4 Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871 2012-10-01 16:04:20 +02:00
Arthur Schiwon
b23ad579dc Sharing: backward compatibility to links from OC 4.0. 2012-10-01 14:39:53 +02:00
Robin Appelman
804372947a fix test case for when a user is logged in 2012-10-01 14:07:34 +02:00
Robin Appelman
f77dc9b30f add test to make sure filepaths that are passed to filesystems hooks are normalized 2012-10-01 14:00:14 +02:00
Mat Lipe
d1010e58d8 Update apps/files/css/files.css 
Fixed a strange comment issue
 2012-10-01 06:43:31 -05:00
Robin Appelman
a61c820369 code style 2012-10-01 12:57:13 +02:00
Mat Lipe
2330dd5f21 Update apps/files/css/files.css 
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
 2012-09-30 20:02:52 -05:00
Jenkins for ownCloud
377fb19818 [tx-robot] updated from transifex 2012-10-01 02:08:31 +02:00
Robin Appelman
91d12a2f3d update the filecache by setting mtimes to 0 when the mount configuration has changed instead of clearing the cache 2012-09-30 16:12:16 +02:00
Robin Appelman
113c339c41 fix updating the filecache for when contents of a folder has changed 2012-09-30 16:11:01 +02:00
Robin Appelman
258782584e fix mimetype detection using the 'file' command in some edge cases 2012-09-30 03:58:58 +02:00
Robin Appelman
f8eebcbb01 reload the current url when login in instead of always redirecting to the default app (oc-1873) 2012-09-30 03:47:37 +02:00
Jenkins for ownCloud
7e30c74ea4 [tx-robot] updated from transifex 2012-09-30 02:05:59 +02:00
Lukas Reschke
e8afb3d312 Fix a typo 2012-09-30 00:08:20 +03:00
Bart Visscher
a33dda3c65 Fix double url decoding in fileDownloadPath function 2012-09-29 18:10:23 +02:00
Lukas Reschke
424062f4af Merge pull request #21 from raghunayyar/master 
CSS typo fixed.
 2012-09-29 08:21:42 -07:00
Raghu Nayyar
0ffab9fea8 Update settings/css/settings.css 
CSS typo fixed.
 2012-09-29 20:50:37 +05:30
Lukas Reschke
ef57e9294b Fallback for systems without openssl 2012-09-29 16:44:02 +02:00
Lukas Reschke
992c2c9d4b mt_rand() is not secure from a cryptographic point of view, let's use openssl_random_pseudo_bytes() here 2012-09-29 15:41:13 +02:00
Lukas Reschke
36f1c9b083 rand() + uniqid() are not from cryptographic quality 2012-09-29 15:33:10 +02:00
Lukas Reschke
578aa4e425 Removed sectoken 
This token is completly useless since an attacker can easily extract it
from the page.
 2012-09-29 15:18:38 +02:00
Lukas Reschke
f5fe95a131 Removed sectoken 
This token is completly useless since an attacker can easily extract it
from the page.
 2012-09-29 15:15:35 +02:00
Lukas Reschke
bd804b74c4 mt_rand() is not secure from a security point of view and predictable. Let's use openssl_random_pseudo_bytes() instead. 
Before: 26 bits entropy
After: 72 bits entropy
 2012-09-29 15:03:09 +02:00
Jenkins for ownCloud
dc66e94ee3 [tx-robot] updated from transifex 2012-09-29 02:04:55 +02:00
Jenkins for ownCloud
27bd9df027 [tx-robot] updated from transifex 2012-09-28 23:36:09 +02:00
Thomas Müller
7f6a984e57 Merge pull request #20 from scambra/undo-l10n 
undo interpolation in js for 4.5
 2012-09-28 14:32:44 -07:00
Bart Visscher
22d22d19c0 Do urlencoding in linkTo functions 2012-09-28 22:27:52 +02:00
Bart Visscher
fed34aecfa Fix syntax error in removeETagHook 2012-09-28 21:30:06 +02:00
Bart Visscher
9c4c79346c After selecting a search result, hide the results 2012-09-28 21:18:20 +02:00
Bart Visscher
24bb7d16b7 urlencode filename in search result, fixes problems with & in name 2012-09-28 21:18:20 +02:00
Bart Visscher
366ae6661d Simplify generating file search results 2012-09-28 21:18:20 +02:00
Bart Visscher
4e2f575938 Correctly fix oc-1016 and fix downloading of files 2012-09-28 21:18:20 +02:00
Lukas Reschke
cfc9839812 Merge pull request #19 from arkascha/master 
Reimplementation of CSRF protection strategy
 2012-09-28 10:54:11 -07:00
scambra
8f27881770 undo interpolation in js for 4.5 2012-09-28 19:53:18 +02:00
Christian Reiner
71454b1bca Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations) 2012-09-28 18:57:20 +02:00