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

10287 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Frank Karlitschek
2b7ff7273d ownCloud 5 RC2 2013-03-02 04:06:27 +01:00
Jenkins for ownCloud
6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Michael Gapczynski
db23c885d9 Merge pull request #2096 from owncloud/cache-upgrade-id 
Cache: also check if the file id is already in the cache during upgrade
 2013-03-04 14:55:20 -08:00
Robin Appelman
9d9acf24de Cache: more efficient detection for existing entries during upgrade 2013-03-04 23:19:55 +01:00
Lukas Reschke
76e6369ec1 Merge pull request #2077 from owncloud/oc_filepicker_inline_js 
Remove inline js from OC.Dialogs.FilePicker.
 2013-03-04 13:49:52 -08:00
Lukas Reschke
fdb37d191b Merge pull request #2092 from owncloud/infieldlabels-placeholder 
explicitly add empty placeholder to inputs which use infield labels
 2013-03-04 13:31:21 -08:00
Robin Appelman
56ae4bb6e9 Cache: also check if the file id is already in the cache during upgrade 
Should solve upgrade issues if only some of the configured storages were migrated previously
 2013-03-04 22:26:03 +01:00
Frank Karlitschek
33c62bf110 Merge pull request #2090 from owncloud/fixing-2089-master 
fixes #2089
 2013-03-04 13:17:35 -08:00
Jan-Christoph Borchardt
07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
Bernhard Posselt
62dde34887 Merge pull request #2088 from owncloud/fixing-1844-again-master 
adding test case for getDefaultEmailAddress() + fixing #1844 again
 2013-03-04 12:52:35 -08:00
Thomas Mueller
a118906f26 fixes #2089 2013-03-04 21:45:21 +01:00
Thomas Mueller
6019cdd5bd adding test case for getDefaultEmailAddress() + fixing #1844 again 2013-03-04 21:10:18 +01:00
Thomas Müller
5c061561c5 Merge pull request #2078 from owncloud/save_category_relations 
VCategories: Don't forget to save category relations if category exists.
 2013-03-04 12:04:16 -08:00
Lukas Reschke
cf6db7a7cd Merge pull request #2085 from owncloud/csp_shitty-browsers 
Only send the standard headers
 2013-03-04 12:03:00 -08:00
Lukas Reschke
a97006144e Only send the standard headers 
Fixes https://github.com/owncloud/apps/issues/675
 2013-03-04 20:35:58 +01:00
Bernhard Posselt
ee00ddeb60 Merge pull request #2084 from owncloud/fix-group-displaynames 
Fix #2074 by initializing  as an array
 2013-03-04 11:12:34 -08:00
Michael Gapczynski
8b09402b77 Fix #2074 by initializing as an array 2013-03-04 12:08:41 -05:00
Bernhard Posselt
8c64484c5e Merge pull request #2082 from owncloud/fix-permissions-class 
Change remove() $user parameter to optional
 2013-03-04 09:03:09 -08:00
Bernhard Posselt
b3df526ef2 Merge pull request #2079 from owncloud/fix_expire_function 
fix expire function
 2013-03-04 09:01:58 -08:00
Bernhard Posselt
8c8423e766 Merge pull request #2076 from owncloud/filestable-specificity 
fix files table CSS specificity issue causing multiselect bar overlap
 2013-03-04 09:00:05 -08:00
Michael Gapczynski
ec2a9169b9 Change remove() $user parameter to optional 2013-03-04 11:44:09 -05:00
Björn Schießle
70014d37dc fix expire function 2013-03-04 17:20:14 +01:00
Thomas Tanghus
c08a04bc83 VCategories: Don't forget to save category relations if category exists. 2013-03-04 17:05:08 +01:00
raghunayyar
d9c11a93c6 Corrects Files Layout in Trashbin 2013-03-04 21:34:50 +05:30
Thomas Tanghus
e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +01:00
Jan-Christoph Borchardt
afe7ea8ca2 fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 2013-03-04 16:10:11 +01:00