Commit graph

15500 commits

Author SHA1 Message Date
Morris Jobke
2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
Thomas Mueller
4fbc2774ef on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.'
The solution is to simple reconnect to the database to start with a fresh connection
2013-11-26 22:39:01 +01:00
Andreas Fischer
0013e2e6a8 Fix spacing. 2013-11-26 22:16:14 +01:00
Andreas Fischer
68986f5272 db-doc: privatedata description 2013-11-26 22:13:01 +01:00
Andreas Fischer
2714a22ba8 db-doc: vcategory* descriptions 2013-11-26 22:06:20 +01:00
Andreas Fischer
ab773650cd db-doc: users description 2013-11-26 21:53:55 +01:00
Andreas Fischer
bc77ba1d4c db-doc: jobs description 2013-11-26 21:52:30 +01:00
Andreas Fischer
8cde5e80f6 db-doc: share description 2013-11-26 21:48:31 +01:00
Andreas Fischer
f4031d4320 db-doc: properties description 2013-11-26 21:23:57 +01:00
Andreas Fischer
035199acab db-doc: preferences description 2013-11-26 21:18:42 +01:00
Andreas Fischer
5450d166b0 db-doc: locks description 2013-11-26 21:15:23 +01:00
Andreas Fischer
466e8985a8 db-doc: groups description 2013-11-26 21:14:52 +01:00
blizzz
4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Andreas Fischer
43f0e30315 db-doc: group_admin reduction note 2013-11-26 20:55:19 +01:00
Andreas Fischer
790155e574 db-doc: group_admin description 2013-11-26 20:55:08 +01:00
Andreas Fischer
46e32b08c0 db-doc: group_user description 2013-11-26 20:50:21 +01:00
Andreas Fischer
6da5b05176 Remove the dbprefix from comments. It has no information. 2013-11-26 20:42:15 +01:00
Andreas Fischer
d083108e72 db-doc: permissions description 2013-11-26 20:41:05 +01:00
Andreas Fischer
ea26282493 Prettier ASCII lists. ^^ 2013-11-26 20:27:51 +01:00
Andreas Fischer
421a1e69dc db-doc: filecache description 2013-11-26 20:27:18 +01:00
ganomi
33e77d34f4 Show stars as placeholder 2013-11-26 20:17:13 +01:00
Andreas Fischer
ad603388ca db-doc: mimetypes description 2013-11-26 19:30:59 +01:00
Bjoern Schiessle
7240d349da Merge branch 'master' into encryption_initial_enc_indicator 2013-11-26 19:15:53 +01:00
Björn Schießle
1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Andreas Fischer
7d1f67b7a9 db-doc: storages description 2013-11-26 18:57:39 +01:00
Andreas Fischer
a018dacac2 db-doc: appconfig description 2013-11-26 18:39:19 +01:00
Vincent Petry
e2ca88af5e Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename
Fixed SFTP storage to overwrite on rename
2013-11-26 09:01:41 -08:00
Bjoern Schiessle
c7e1fe50c2 added a small version of the dark loading gif, looks nicer on the blue background 2013-11-26 17:14:16 +01:00
Thomas Müller
52941341fd fixing failing unit test 2013-11-26 16:52:33 +01:00
Jenkins for ownCloud
fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Thomas Müller
d9a98b126e Merge pull request #6065 from owncloud/l10n-update
Translate reload message after update
2013-11-26 07:45:22 -08:00
Vincent Petry
30e086fb53 Fixed SFTP storage to overwrite on rename 2013-11-26 16:32:44 +01:00
Morris Jobke
81f6be92ef Translate reload message after update
fixes #6064
2013-11-26 16:22:01 +01:00
Vincent Petry
2653d914d9 Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
Morris Jobke
dbd8128c07 Merge pull request #6059 from owncloud/occ-repair
Add a (currently) empty system for running common repair steps
2013-11-26 06:09:45 -08:00
Thomas Müller
2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Robin Appelman
10d84f6e9b Add a (currently) empty system for running common repair steps 2013-11-26 14:12:48 +01:00
Morris Jobke
eca9f69282 Merge pull request #6053 from owncloud/remove_passwords_from_log
remove passwords from logfile
2013-11-26 04:53:02 -08:00
Morris Jobke
16ce56553c Merge pull request #6056 from owncloud/check_login
check if user is logged in
2013-11-26 04:50:43 -08:00
Morris Jobke
a48fc120d0 Merge pull request #6054 from owncloud/extstorage-dropboxfixes
Fixed various Dropbox issues + unit tests
2013-11-26 04:48:54 -08:00
Morris Jobke
5cb1ce4a28 Merge pull request #6057 from owncloud/extstorage-touchoperation
Return true when touch succeeds
2013-11-26 04:40:25 -08:00
Bjoern Schiessle
5d2299eab8 only create complete share key if we know the exact path 2013-11-26 13:30:59 +01:00
Arthur Schiwon
69518b9013 Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder 2013-11-26 12:57:39 +01:00
Vincent Petry
712b47757a Updated unit tests for SMB
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
Bjoern Schiessle
2556647a10 check if user is logged in 2013-11-26 12:47:59 +01:00
Vincent Petry
e102eec89a Return true when touch succeeds 2013-11-26 12:47:00 +01:00
Bjoern Schiessle
62afe7fe7a remove passwords from logfile 2013-11-26 12:26:32 +01:00
Andreas Fischer
06df3822a0 Timestamp test is no longer necessary as we rely on Doctrine and DateTime. 2013-11-26 12:22:08 +01:00
Andreas Fischer
3bbaba1eca Use the Doctrine to convert date string to DateTime object. 2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b Use DateTime object instead of fixed format date string.
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00