mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,317 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

10317 Commits

Author SHA1 Message Date
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
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
Arthur Schiwon 0703065e2a LDAP: typos in app description 2013-03-04 11:29:35 +01:00
Bart Visscher de066beaaf Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares 
Fix file actions including permanent shares
 2013-03-04 01:56:23 -08:00
Bart Visscher b0be84d6d3 Merge pull request #2065 from owncloud/files_datepicker 
Datepicker height fixed.
 2013-03-04 01:43:32 -08:00
Frank Karlitschek 36a1bcb732 Merge pull request #2061 from owncloud/app-text 
Add the description as text and not as html
 2013-03-04 00:01:26 -08:00
Frank Karlitschek d70912e72b Merge pull request #2060 from owncloud/escapeGroupname 
Sanitize uid, group and quota
 2013-03-04 00:00:47 -08:00
Frank Karlitschek 17f7bd4c14 Merge pull request #2059 from owncloud/getlog 
Add log as text and not as HTML
 2013-03-04 00:00:04 -08:00
raghunayyar d3ddf03687 Datepicker height fixed. 
New id defined for files table for positioning.
 2013-03-04 09:21:38 +05:30
Bernhard Posselt 841daf4845 Merge pull request #2062 from owncloud/shareType 
Sanitize shareWith
 2013-03-03 16:27:51 -08:00