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

14928 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
a90cefcea2 avoid usage of brand name 'ownCloud' 2013-10-28 21:42:48 +01:00
Vincent Petry
e41ea20ce4 Fixed clicking on the "Home" breadcrumb in the trash app 
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
 2013-10-28 20:24:06 +01:00
Frank Karlitschek
be9a5dc316 Merge branch 'master' of https://github.com/owncloud/core 2013-10-28 19:15:36 +01:00
Thomas Müller
ffc3bc1914 Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift 
Reworking \OC\Files\Storage\Swift
 2013-10-29 13:49:24 -07:00
Thomas Müller
2e731e845b Merge pull request #5609 from owncloud/fix_delete_user2 
use getHome() to delete users data
 2013-10-29 13:46:42 -07:00
Bjoern Schiessle
db0fa6c529 use getHome() to delete users data 2013-10-29 18:01:37 +01:00
Thomas Müller
8ab5da0833 Merge pull request #5592 from owncloud/lost_password_screen 
Fixing lost password-screen
 2013-10-29 09:50:32 -07:00
Morris Jobke
ffbcfef614 fix lost password screen - reuse available CSS rules 2013-10-29 13:42:39 +01:00
Christian Berendt
70276ca520 settings tags for optional parameters 2013-10-29 10:21:50 +01:00
Christian Berendt
235bf5269d extended parameter descriptions for Swift 2013-10-29 09:19:43 +01:00
Julian Müller
776346b503 Fixing the lost Password Screen 2013-10-29 01:33:12 +01:00
Julian Müller
e9caaa933c Fixing the Lost Password Screen 2013-10-29 01:29:38 +01:00
Frank Karlitschek
c3b48c69db beta 2 2013-10-28 19:05:31 +01:00
Vincent Petry
efbd79198b Fixed preview URL + size while dragging an existing file 2013-10-28 15:41:52 +01:00
ringmaster
a24cbb50af Move all upgrade routines into the command-line tool. 2013-10-28 10:15:56 -04:00
Jörn Friedrich Dreyer
682d6e8a80 use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace 2013-10-28 14:18:20 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Morris Jobke
4750fbc226 Merge pull request #5550 from owncloud/fix-4716-master 
'Update to' is shown when there is no update
 2013-10-28 03:33:27 -07:00
Morris Jobke
78971c61e6 update documentation for app update 2013-10-28 11:27:51 +01:00
Morris Jobke
c61d328ab9 Merge pull request #3889 from owncloud/apps_preload 
Don't load the apps when we need to upgrade
 2013-10-28 03:17:52 -07:00
Jenkins for ownCloud
8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Lukas Reschke
300cb22d24 Merge pull request #5566 from owncloud/fix-double-not 
Fix double not in newfile/newfolder language.
 2013-10-27 03:58:09 -07:00
Andreas Fischer
eb2d66d1a0 Fix double not in newfile/newfolder language. 2013-10-27 11:53:14 +01:00
Thomas Müller
aa06983345 Merge pull request #5552 from owncloud/admin-warninghomeexistsfix 
Fixed user dir existence check when creating new user
 2013-10-27 03:11:11 -07:00
Thomas Müller
a50e215c9e Merge pull request #5537 from owncloud/autotest-syntaxhelp 
Added syntax help for autotest.sh
 2013-10-27 02:42:40 -07:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Thomas Müller
9e9b2afe50 Merge pull request #5561 from owncloud/fix5401 
local user backend shall search for both username and displayname, fixes...
 2013-10-26 13:56:32 -07:00
Thomas Müller
5fca709e94 Merge pull request #5562 from owncloud/fix5560 
Fix broken users page when a username consists of digits only, fixes #55...
 2013-10-26 12:12:28 -07:00
Arthur Schiwon
3248b0e2be Fix broken users page when a username consists of digits only, fixes #5560 2013-10-25 22:00:32 +02:00
Arthur Schiwon
466b6c1ee0 local user backend shall search for both username and displayname, fixes #5401 2013-10-25 21:57:12 +02:00
Vincent Petry
1ee4b680f6 Fixed user dir existence check when creating new user 
The check was done too later. It turns out that createUser() had already
created the dir, which caused the warning message to be shown every
time.
 2013-10-25 16:23:29 +02:00
Björn Schießle
e0f5fa9ea7 Merge pull request #5542 from owncloud/quotastream-fseektoendfix 
Fixes for quota stream fseek
 2013-10-25 07:15:54 -07:00
Vincent Petry
ebcd9ae628 Added comment for clarification about fseek() call in quota.php 2013-10-25 16:15:01 +02:00
Bart Visscher
b6c67c4c63 'Update to' is shown when there is no update 
See #4716
 2013-10-25 15:41:59 +02:00
Vincent Petry
e246e2b669 Fixed encryption migration when entry is missing in DB 
When resetting the DB and some users still have encrypted files, the
migration state isn't read properly becaue the migration entries are
missing. This causes the wrong file size to be returned.

This fix inserts the missing migration entry when this condition is met.

Fixes #5541
 2013-10-25 15:38:35 +02:00
Bart Visscher
310c8400df When updating an appstore app, execute a database update 
See #5202
 2013-10-25 15:38:08 +02:00
Arthur Schiwon
81dbe7dab7 Port PR #5457 to master 2013-10-25 14:15:05 +02:00
Thomas Müller
c455cb989b add header 'OC-FileId' on PUT 2013-10-25 13:20:59 +02:00
Thomas Müller
3bca1519ee switch instance id and file id 2013-10-25 13:20:29 +02:00
Thomas Müller
8253994262 using array_diff_assoc to detect diffs in values as well 2013-10-25 12:40:31 +02:00
Thomas Müller
f619f59f1c cast storage_mtime to int 2013-10-25 12:39:50 +02:00
Thomas Müller
f91a4c89ca adding storage_mtime handling to SharedCache 2013-10-25 12:39:21 +02:00
Vincent Petry
c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b Fixed quota stream's fseek method 
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
 2013-10-25 12:09:46 +02:00
Vincent Petry
7de1b3f28e Added syntax help for autotest.sh 
autotest.sh now checks for the validity of the db config name argument.
If the db config name is not known, it show syntax info.

This should save some time to people to understand how to use this
script. Before this fix, an invalid argument would return a big HTML
page in the output.
 2013-10-25 11:31:10 +02:00
Donald Buczek
3fc232370e make sure the shared ldap connection is rebound to the configured user after being used for password checking. 2013-10-25 11:12:18 +02:00
Thomas Müller
5fd1f552a3 Merge pull request #5532 from owncloud/ldap_fixes 
Ldap fixes
 2013-10-24 23:24:39 -07:00
Arthur Schiwon
c48157e3b8 LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 2013-10-24 20:26:05 +02:00
ringmaster
29a21466f3 Add occ upgrade command. 2013-10-24 13:59:39 -04:00
Thomas Müller
3917d18980 Merge pull request #5528 from frisco82/changeUpadateNotification 
Changed update message to be more instructive
 2013-10-24 10:28:17 -07:00