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

8009 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Arthur Schiwon
4cb760a924 LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn (#631) 2012-12-03 12:55:42 +01:00
Björn Schießle
171e669dda Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_master 
fix regression in file versioning for shared files
 2012-12-03 02:45:39 -08:00
Thomas Müller
cee92bde20 Merge pull request #682 from VicDeo/master 
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
 2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6 [tx-robot] updated from transifex 2012-12-03 00:05:40 +01:00
Victor Dubiniuk
6a211f3fa1 Check if we have an array with data. Fix #487 2012-12-02 23:54:54 +03:00
Victor Dubiniuk
3d5ffebb52 Clean KB entries processing code 2012-12-02 23:54:53 +03:00
Björn Schießle
b6396bc07b rebase on latest master 2012-12-02 12:51:57 +01:00
Björn Schießle
f66ebea5ca fix typo in variable name 2012-12-02 12:50:07 +01:00
Björn Schießle
bafb78ac94 fix regression in file versioning for shared files 2012-12-02 12:46:07 +01:00
Thomas Müller
475fe281a4 Merge pull request #654 from butonic/checkstyle_fixes 
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
 2012-12-02 03:14:30 -08:00
Thomas Mueller
18663100d9 fixing syntax error + reformat the code 2012-12-02 12:12:20 +01:00
icewind1991
87003e4608 Merge pull request #672 from irosenb/patch-1 
Update lib/image.php
 2012-12-01 19:05:36 -08:00
Robin Appelman
01eb5d2790 fix some edge cases while scanning the root of a storage 2012-12-02 03:43:51 +01:00
Isaac Rosenberg
d3ea7feb6b Update lib/image.php 
Corrected simple typo
 2012-12-01 21:13:08 -05:00
Robin Appelman
72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +01:00
Robin Appelman
702444b242 fail gracefully when no old filecache is present during upgrade 2012-12-01 00:59:49 +01:00
Jenkins for ownCloud
c7c5e2a2e2 [tx-robot] updated from transifex 2012-12-01 00:03:27 +01:00
Jörn Friedrich Dreyer
92df70b6e5 fix checkstyle for files_external app, add whitespace for readability 2012-11-30 16:27:11 +01:00
Jörn Friedrich Dreyer
df21ebeaf7 fix checkstyle for files_encryption app, add whitespace for readability 2012-11-30 16:26:04 +01:00
Bart Visscher
a3f18d4b5a Merge pull request #603 from owncloud/store_plain_groupname 
Group name doesn't need to be sanitized before storing it in the database
 2012-11-30 04:13:36 -08:00
Bart Visscher
8aba5874db Merge pull request #644 from butonic/checkstyle_fixes 
fix checkstyle for files app
 2012-11-30 04:10:31 -08:00
Björn Schießle
d527bb6c54 fix regression in file versioning for shared files 2012-11-30 13:04:15 +01:00
Bart Visscher
f820596825 Merge pull request #605 from owncloud/fix_false_positive_share_2 
Sharing: Fix false positived v. 2
 2012-11-30 04:02:18 -08:00
Bart Visscher
4db53f9d8e Merge pull request #619 from samtuke/versions_cache 
OC_FSV->copy now only caches files which are copied from data/user/files
 2012-11-30 03:25:06 -08:00
Robin Appelman
dbbb357f62 add upgrade path from old cache to preserve file id's 2012-11-30 01:41:30 +01:00
Robin Appelman
d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jenkins for ownCloud
16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Thomas Müller
9b709fa95d Merge pull request #635 from owncloud/ob_end 
provide a safe way to end output buffering
 2012-11-29 13:50:49 -08:00
Jörn Friedrich Dreyer
3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Robin Appelman
bcb27c81d4 use new obEnd function instead of ob_end_clean 2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7 add function to safely end output buffering 2012-11-29 17:58:24 +01:00
Georg Ehrke
c38a75e03f Merge pull request #620 from owncloud/fix_600 
Fix #600
 2012-11-29 05:39:45 -08:00
Georg Ehrke
e5af24d084 use attr instead of data 2012-11-29 13:56:07 +01:00
Georg Ehrke
1d1ab2a911 Revert "fix group and subadmin managing for 'ajax-loaded' users" 
This reverts commit a5774229a1.
 2012-11-29 13:37:37 +01:00
blizzz
77ad5dc92e Merge pull request #617 from samtuke/fix_docblocks 
Cleaned up docblock comments
 2012-11-29 01:53:07 -08:00
Jenkins for ownCloud
6c3f43b061 [tx-robot] updated from transifex 2012-11-29 00:04:57 +01:00
Thomas Müller
1ac6d885e6 Merge pull request #540 from Raydiation/master 
More tests for lib/group.php
 2012-11-28 14:29:23 -08:00
Georg Ehrke
4c83a4c918 add a client side check 2012-11-28 18:40:58 +01:00
Georg Ehrke
a5774229a1 fix group and subadmin managing for 'ajax-loaded' users 2012-11-28 18:40:00 +01:00
Bernhard Posselt
37e524dc6d added more unittests for the group file 2012-11-28 18:30:47 +01:00
Georg Ehrke
ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher
9717cdb42e Merge pull request #601 from butonic/add_drag_shadow_in_firefox 
show drag shadow in firefox by using helper:'clone'
 2012-11-28 09:00:12 -08:00
Sam Tuke
6975c5537b OC_FSV->copy now only caches files which are copied from data/user/files 
Added contextual comments
 2012-11-28 16:57:44 +00:00
Sam Tuke
60f4ea8ddc Cleaned up docblock comments 2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer
eaa625c9bc Merge pull request #401 from owncloud/share_hooks 
Create functions to install standard hooks
 2012-11-28 04:35:52 -08:00
Jenkins for ownCloud
1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Thomas Tanghus
5c9faf396a Sharing: Fix false positived v. 2 2012-11-27 23:01:26 +01:00
Bart Visscher
80d1037e42 Group name does't need to be sanitized before storing it in the database 
It should only be sanitized before display
 2012-11-27 20:22:45 +01:00