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

10482 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan-Christoph Borchardt
70f0e0a8da Merge pull request #2162 from owncloud/trash_bin_home 
let the home icon link to the files view in the trash bin
 2013-03-07 06:26:15 -08:00
Björn Schießle
ba9f5f5885 add dirlisting var to file list 2013-03-07 14:54:59 +01:00
Björn Schießle
7c16c2c9ae Merge pull request #2163 from owncloud/fix_file_download 
json encode list of files
 2013-03-07 05:45:19 -08:00
Björn Schießle
ce9942331e create a meanigful file name if files are from the root folder 2013-03-07 14:24:18 +01:00
Björn Schießle
3970d1f875 remove debug output 2013-03-07 14:18:27 +01:00
Björn Schießle
4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Björn Schießle
dda4c6bf4b no dir parameter needed 2013-03-07 13:51:18 +01:00
Björn Schießle
7188303651 let the home icon link to the files view in the trash bin 2013-03-07 13:48:02 +01:00
Jenkins for ownCloud
97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Michael Gapczynski
812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Brice Maron
a68cbb00e0 Preserve Debug flag accross config writes 2013-03-06 21:05:13 +01:00
blizzz
e5a497c924 Merge pull request #2134 from owncloud/fix_2127 
return 403 when mkdir failed on webDAV, fixes #2127
 2013-03-06 06:57:45 -08:00
Arthur Schiwon
6acbadf418 return 403 when mkdir failed on webDAV, fixes #2127 2013-03-06 15:21:12 +01:00
Thomas Müller
a2aebbd742 Merge pull request #2130 from owncloud/fix_2128 
fix #2128
 2013-03-06 05:05:40 -08:00
Bernhard Posselt
3213331f73 Merge pull request #2129 from owncloud/don't-sanitize-error-message 
Don't sanitize error message hint
 2013-03-06 04:19:55 -08:00
Lukas Reschke
cfb10dc58c Add warning about sanitization 2013-03-06 13:05:22 +01:00
Georg Ehrke
a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Lukas Reschke
630ee644db Don't sanitize error message hint 2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt
ab7dc76ff1 add type=text to ZIP size field, fix second part of #2097 2013-03-06 12:39:36 +01:00
Jan-Christoph Borchardt
114c6457a3 add email input type to styled inputs, fix #2097 2013-03-06 12:38:43 +01:00
Bernhard Posselt
145fb18042 Merge pull request #2120 from owncloud/clear-caches 
Clear the CSS and JS cache earlier to make sure update goes smoothly
 2013-03-06 02:53:16 -08:00
Bernhard Posselt
d9a0d1d23b Merge pull request #2119 from owncloud/fix_ldap_settings 
LDAP: fix settings output thus make settings work again
 2013-03-06 02:32:31 -08:00
Björn Schießle
82990b82a6 Merge pull request #2118 from owncloud/fix_1689 
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
 2013-03-06 00:38:06 -08:00
Arthur Schiwon
bce0c3c372 LDAP: move more settings stuff to template file 2013-03-06 08:26:33 +01:00
Michael Gapczynski
771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski
4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Michael Gapczynski
5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Arthur Schiwon
1e5f8b0e20 LDAP: fix settings output thus make settings work again 2013-03-05 23:43:22 +01:00
Arthur Schiwon
b5dc8b9ca3 whitespace 2013-03-05 21:25:59 +01:00
Arthur Schiwon
72c293e834 LDAP: implementation of displayNamesInGroup 2013-03-05 21:23:58 +01:00
Arthur Schiwon
5da9223d1c make getDisplayNames optional feature for Group Backends, fall back to internal names 2013-03-05 21:22:34 +01:00
Frank Karlitschek
4830ba8035 Merge pull request #2112 from owncloud/fix_1673 
LDAP: escape some more chars for proper search filter, fixes #1673
 2013-03-05 06:03:25 -08:00
Arthur Schiwon
055fadd10d LDAP: escape some more chars for proper search filter, fixes #1673 2013-03-05 14:33:20 +01:00
Björn Schießle
f3b9c9eb73 Merge pull request #2108 from owncloud/fix_ldap_errorcheck 
LDAP: error codes can be negative, too
 2013-03-05 05:03:14 -08:00
Arthur Schiwon
b08894ba77 LDAP: error codes can be negative, too 2013-03-05 13:47:03 +01:00
Michael Gapczynski
ee0c38bb51 Fix group post_shared hook 2013-03-04 19:43:56 -05:00
Tom Needham
370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
blizzz
ef70978524 Merge pull request #2073 from owncloud/trashbin_userHome 
make trashbin work with different user homes
 2013-03-04 04:38:24 -08:00
Frank Karlitschek
d4ea381040 Merge pull request #2072 from owncloud/fix_typo 
fix wrong var name
 2013-03-04 04:19:24 -08:00
Björn Schießle
2a5d9ca9c5 damn copy&paste, fix wrong var name 2013-03-04 12:59:48 +01:00
Björn Schießle
d23702d324 make trashbin work with different user homes 2013-03-04 12:57:32 +01:00
Lukas Reschke
2a9c3c1660 Merge pull request #2069 from owncloud/fix_sanitize_call 
use p() for the output and not for the comparison
 2013-03-04 03:41:47 -08:00
Björn Schießle
05aad21b99 Merge pull request #2070 from owncloud/fix_quota 
fix quota calculation for trash and versions
 2013-03-04 03:33:47 -08:00
Björn Schießle
21bad1fcc0 fix type in var name 2013-03-04 12:33:16 +01:00
Björn Schießle
94dab96dba fix quota calculation for trash and versions 2013-03-04 12:17:57 +01:00
Björn Schießle
ccc4102cd9 fix p() call 2013-03-04 12:12:27 +01:00
Björn Schießle
52919fa94b use p() for the output and not for the comparison 2013-03-04 12:01:45 +01:00
Lukas Reschke
310edb450c Merge pull request #2068 from owncloud/fix_ldap_typo 
LDAP: typos in app description
 2013-03-04 02:56:02 -08:00
Arthur Schiwon
39a94a3edc LDAP: orthograophy fix 2013-03-04 11:44:34 +01:00