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

3893 commits

Author SHA1 Message Date
Robin Appelman
dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Robin Appelman
cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud
3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman
4b616764e8 Merge branch 'master' into filesystem 2012-10-26 22:32:44 +02:00
Arthur Schiwon
1313cad1b9 LDAP: let getUsers make use of paged search 2012-10-26 21:54:35 +02:00
Arthur Schiwon
84130b885f LDAP: add support for paged searches. 2012-10-26 21:54:34 +02:00
Arthur Schiwon
fc446d0af4 LDAP: know, wether server supports paged search 2012-10-26 21:54:34 +02:00
Arthur Schiwon
3f78a8190f LDAP: check for resource before unbinding 2012-10-26 21:54:34 +02:00
Robin Appelman
ad5957207d merge master into filesystem 2012-10-26 18:29:24 +02:00
Jan-Christoph Borchardt
f477fda785 separate buttons for new file and upload 2012-10-26 18:16:42 +02:00
Robin Appelman
0e2bf8d373 Merge branch 'master' into filesystem 2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Bart Visscher
43ac43d7af dir in newfile has to start with / 2012-10-25 08:37:13 +02:00
Jenkins for ownCloud
43bae1b473 [tx-robot] updated from transifex 2012-10-25 02:11:53 +02:00
Lukas Reschke
515e1b467e Merge pull request #81 from fmms/master 
Codestyle add some needed spaces.
 2012-10-24 10:16:32 -07:00
Lukas Reschke
7454186806 Forget to urlencode the path 2012-10-24 18:00:19 +02:00
Lukas Reschke
ff6d2f16c4 urlencode 2012-10-24 17:58:52 +02:00
Lukas Reschke
694b1d397d Revert e1a4fe9890 2012-10-24 17:58:52 +02:00
Robin Appelman
5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Björn Schießle
07e08d5928 urldecode target directory 2012-10-24 15:37:51 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Thomas Müller
41898a473e Apply coding style guide 2012-10-24 14:43:34 +03:00
Björn Schießle
a9a27306de fix copy&paste bug from previous commit 2012-10-24 13:11:29 +02:00
Björn Schießle
1d200c554f Shared files are not stored in the file cache. Therefore we need to 
use the share table from the db to find the item source if the public
link re-shares a already shared file.
 2012-10-24 13:11:29 +02:00
Lukas Reschke
916e0fc343 Place the brackets in the first line 2012-10-24 13:09:09 +02:00
Thomas Müller
4c234bd666 Apply coding style guide 
http://owncloud.org/dev/coding-style-guide/
 2012-10-24 12:12:16 +03:00
Björn Schießle
070fe02448 calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem. 2012-10-24 10:06:00 +02:00
Lukas Reschke
a7eb56c799 Merge pull request #76 from fmms/master 
checkstyle: some more cleanups
 2012-10-23 23:48:27 -07:00
Jenkins for ownCloud
f33af71eb0 [tx-robot] updated from transifex 2012-10-24 02:08:34 +02:00
Arthur Schiwon
c443993fc2 LDAP: properly check if Groups-feature is enabled 2012-10-24 00:23:31 +02:00
Lukas Reschke
f112d8cd69 Merge pull request #75 from fmms/master 
More Checkstyle cleanup
 2012-10-23 15:07:14 -07:00
Lukas Reschke
dfecdb9700 Remove uneeded vendor prefixes 2012-10-24 00:00:33 +02:00
Lukas Reschke
f363bde121 Format the CSS in a readable way 2012-10-23 23:57:55 +02:00
Felix Moeller
561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke
e1a4fe9890 Fix urlencoding in the breadcrumb 2012-10-23 17:50:36 +02:00
Lukas Reschke
73f85c3b81 Merge pull request #62 from fmms/master 
More Checkstyle warnings
 2012-10-23 08:07:01 -07:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes 
check free space using folder's owner
 2012-10-23 07:02:21 -07:00
icewind1991
fbe059afd3 Merge pull request #59 from fmms/master 
Starting point to take care of Checkstyle warnings
 2012-10-23 06:58:15 -07:00
Arthur Schiwon
6a2a915559 Files: urldecode urlencoded dir names, fixes oc-2111 2012-10-23 13:50:24 +02:00
Felix Moeller
36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Felix Moeller
2d61f03452 More Checkstyle cleanup 
This is for all LowerCaseConstant warnings
 2012-10-23 08:01:09 +02:00
Jenkins for ownCloud
bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller
6a00a6b9ed Make Jenkins more happy. 
This is NoSpaceAfterComma
 2012-10-23 00:28:12 +02:00
Arthur Schiwon
78a1b987bb LDAP: fix db update for Postgres 2012-10-23 00:18:43 +02:00
Arthur Schiwon
b879cd709e LDAP: fix cache save and check, fixes oc-2118 2012-10-22 22:46:28 +02:00
Felix Moeller
03581ef463 Correct a first issue Checkstyle is complaining about ... 
This is BracketsNotRequired
 2012-10-22 21:40:33 +02:00
Jenkins for ownCloud
d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Robin Appelman
33cabcf590 postpone the cost of setting up some of the external storage backends untill we actually need it 2012-10-21 22:04:45 +02:00
Robin Appelman
5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman
6f1fbf97f7 some namespaces fixed for the shared backend 2012-10-21 00:27:55 +02:00
Robin Appelman
cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman
f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Jenkins for ownCloud
f5043c0661 [tx-robot] updated from transifex 2012-10-19 02:08:00 +02:00
Robin Appelman
9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Arthur Schiwon
81cf726b18 unset UserID after Update 2012-10-18 18:45:03 +02:00
Thomas Müller
e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes 
Date l10n fixes
 2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Jenkins for ownCloud
519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb Merge pull request #37 from scambra/js-interpolation-l10n 
use interpolation for some translations in js
 2012-10-17 13:28:46 -07:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f Update Sabre to version 1.7.1 2012-10-17 16:17:36 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
scambra
c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
scambra
5ecce8bfb7 Translate modification date when file is created/uploaded, use same strings as lib/template.php 2012-10-16 20:25:11 +02:00
Björn Schießle
b08a1696f5 normalize path to avoid problems with trailing slashes, double-slashes, etc. 2012-10-16 12:48:56 +02:00
Jenkins for ownCloud
c3823aa864 [tx-robot] updated from transifex 2012-10-16 02:08:21 +02:00
Arthur Schiwon
24ad6b5a62 LDAP: fix retrieval of Quota and Email 2012-10-15 18:47:28 +02:00
Arthur Schiwon
5708488b3e make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs 2012-10-15 18:16:27 +02:00
Arthur Schiwon
800fd5fd79 LDAP: check if index is set, fix Notices 2012-10-15 17:17:37 +02:00
Jenkins for ownCloud
cf7df2db7a [tx-robot] updated from transifex 2012-10-15 02:09:11 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Robin Appelman
5b2f3c7f72 fix blocking drag & drop upload of folders 2012-10-12 15:30:16 +02:00
Robin Appelman
c099545b6d don't throw errors if certificate folder doesn't exist 2012-10-12 14:52:22 +02:00
Lukas Reschke
e5f2d46c6f Sanitize user input 2012-10-12 14:10:05 +02:00
Lukas Reschke
e45f36c2d4 Sanitize user input 2012-10-12 14:09:58 +02:00
Jenkins for ownCloud
b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman
141ff806c6 fix namespace problems for external storage backends 2012-10-11 23:17:59 +02:00
Robin Appelman
542869114a implement getId for the external storage providers 2012-10-11 23:06:57 +02:00
Robin Appelman
fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Robin Appelman
92ddefe5a6 fix filetype for smb storage backend 2012-10-11 22:18:34 +02:00
Robin Appelman
5698c8519a fix webdav storage backend when trying to open a non existing file for reading 2012-10-11 22:18:34 +02:00
Robin Appelman
5256301a53 skip the files_external test cases the correct way 2012-10-11 22:18:34 +02:00
Benjamin Liles
8336b3287e Various bug fixes for swift 2012-10-11 08:52:21 -05:00
Björn Schießle
77d91d5a03 generate correct link for shared files and shared directories 2012-10-11 13:45:16 +02:00
Jenkins for ownCloud
673e3dae3f [tx-robot] updated from transifex 2012-10-11 02:07:32 +02:00
Robin Appelman
5c6e9518ed drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath 2012-10-10 17:46:29 +02:00
Björn Schießle
41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Björn Schießle
4a712bdd48 only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down 2012-10-10 13:46:51 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Björn Schießle
33dcb3b1f4 fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively) 2012-10-10 11:49:16 +02:00
Robin Appelman
13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Thomas Müller
29fa9dfb79 Merge pull request #25 from visit1985/uploadfilesize 
fixed max possible upload size for files app in admin screen
 2012-10-10 00:41:19 -07:00
Jenkins for ownCloud
fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Michael Gapczynski
4e6f720f14 Fix closing the sharing dropdown by clicking on the share button 2012-10-09 19:23:44 +02:00
Björn Schießle
293484d1ee add directory while creating mount point 2012-10-09 15:18:21 +02:00
VicDeo
f29f1cad1d Prevent Versions click handler from closing sharing dropdown 2012-10-09 13:00:33 +03:00
Jenkins for ownCloud
f1fc73ea5b [tx-robot] updated from transifex 2012-10-09 02:07:41 +02:00
Björn Schießle
32e2d7ef8f check if ID was assigned 2012-10-08 17:47:02 +02:00
Björn Schießle
277dd2b0a9 remove debug output 2012-10-08 17:32:04 +02:00
Björn Schießle
2923d24921 add data-id directly after upload/creation to the file list (bugfix for #1917) 2012-10-08 17:30:35 +02:00
Robin Appelman
c815fd5a5c fix files_external test cases 2012-10-08 14:31:13 +02:00
Robin Appelman
e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Björn Schießle
4dba91838f add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views. 2012-10-08 10:28:29 +02:00
Jenkins for ownCloud
b934668b9e [tx-robot] updated from transifex 2012-10-08 02:07:01 +02:00
Michael Gapczynski
995b8bf12a Remove old Shared folders from the file cache, fixes bug oc-1911 2012-10-07 17:34:21 -04:00
Michael Gapczynski
4b446f3edd Revert part of 5beca59b, fixes file upload bug oc-1926 2012-10-07 17:17:37 -04:00
Jenkins for ownCloud
e36317c21a [tx-robot] updated from transifex 2012-10-07 02:08:12 +02:00
Michael Göhler
7f2208b9a1 fixed max possible upload size for files app in admin screen 
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
 2012-10-07 00:31:07 +02:00
Robin Appelman
a203a4a1c7 add support to mount a specific folder from dropbox 2012-10-06 13:44:53 +02:00
Robin Appelman
54695b11eb test case for dropbox storage 2012-10-06 13:43:34 +02:00
Jenkins for ownCloud
35c5f71989 [tx-robot] updated from transifex 2012-10-06 02:06:49 +02:00
Arthur Schiwon
68bb3809c7 LDAP: we're good for 0.3 now. No code change 2012-10-06 00:38:10 +02:00
Björn Schießle
4f7c7c615e prevent xss attacks 2012-10-05 17:05:23 +02:00
Björn Schießle
5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle
c99f62891a breadcrumbs fixed for public share view 2012-10-05 15:06:59 +02:00
Björn Schießle
0d081ac5ac register download action for directories 2012-10-05 14:28:23 +02:00
Björn Schießle
ef8a4a1629 register download action for files 2012-10-05 14:28:23 +02:00
Björn Schießle
99f4d949c1 fix download link for single files in publicly shared directory 2012-10-05 14:28:23 +02:00
Björn Schießle
72a48ca35e fix download of single publically shared files. 2012-10-05 12:01:18 +02:00
Björn Schießle
dcad7aec82 fixed download of complete publically shared folder 2012-10-05 11:38:00 +02:00
Björn Schießle
f4136854b6 stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename" 2012-10-05 11:15:32 +02:00
Björn Schießle
a611ce4f33 baseDir has to be the whole path to work with shared directories below the root directory. 2012-10-05 10:32:38 +02:00
Björn Schießle
b88a61c633 no content area, it overlaps the file list 2012-10-05 10:32:38 +02:00
Björn Schießle
5beca59b9c check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist) 2012-10-05 10:32:38 +02:00
Jenkins for ownCloud
4fd53eca06 [tx-robot] updated from transifex 2012-10-05 02:06:09 +02:00
Jenkins for ownCloud
5c042d88ad [tx-robot] updated from transifex 2012-10-04 02:07:35 +02:00
Michael Gapczynski
51321526e2 Prevent displaying errors if public link url parameters are incorrect 2012-10-03 16:14:54 -04:00
Jenkins for ownCloud
6fada7a4c0 [tx-robot] updated from transifex 2012-10-03 02:05:14 +02:00
Robin Appelman
ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Jenkins for ownCloud
32a6b3b862 [tx-robot] updated from transifex 2012-10-02 23:18:26 +02:00
Thomas Mueller
7abe1360b2 l18n support added to files_external/js 2012-10-02 23:09:28 +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
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
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
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
33e9399ba3 LDAP: fix sharing doesn't work with ldap groups, oc-1819 2012-10-01 18:27:58 +02:00
Arthur Schiwon
b23ad579dc Sharing: backward compatibility to links from OC 4.0. 2012-10-01 14:39:53 +02:00