Commit graph

15513 commits

Author SHA1 Message Date
ganomi
f723bf744a Merge pull request #6090 from ganomi/summaryfix
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
Morris Jobke
3a31f7eb4a Merge pull request #6097 from owncloud/extstorage-ftptrailingslash
Add trailing slash in FTP root path when missing
2013-11-28 04:52:08 -08:00
Morris Jobke
603613e6e6 Merge pull request #6098 from owncloud/files-renamediriconfix
Fixed directory icon after rename
2013-11-28 04:50:17 -08:00
Morris Jobke
b87e88b48a Merge pull request #6100 from owncloud/fix_loginnameusage
loginname is not necessarily username
2013-11-28 04:46:54 -08:00
Bjoern Schiessle
eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Arthur Schiwon
ee78d48186 loginname is not necessarily username 2013-11-28 13:26:31 +01:00
Vincent Petry
da1a89fd15 Fixed directory icon after rename 2013-11-28 13:15:20 +01:00
Frank Karlitschek
f361036cf8 ownCloud 6 RC1 2013-11-28 13:00:02 +01:00
Frank Karlitschek
dab3629ff5 Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Vincent Petry
30b2ed588b Merge pull request #6096 from owncloud/files-txtextfornewfiles
New file box now has default file name + extension
2013-11-28 03:38:58 -08:00
Andreas Fischer
93b0bd0a9e Use getLastError() everywhere. 2013-11-28 12:05:46 +01:00
Andreas Fischer
904573d0d0 Add getLastError() 2013-11-28 12:04:28 +01:00
Vincent Petry
84f3dd15a6 Add trailing slash in FTP root path when missing
Fixes #6093
2013-11-28 11:45:26 +01:00
Andreas Fischer
955127231a No function as oci_last_error. It's oci_error. 2013-11-28 11:37:29 +01:00
Andreas Fischer
fcf332abbf There is no property such as dbusername. It's 'dbuser'. 2013-11-28 11:33:49 +01:00
Andreas Fischer
b90f88f939 Correct property name. It's 'dbpassword', with the 'db' prefix. 2013-11-28 11:33:43 +01:00
Andreas Fischer
005c98e46c Correct property name. It's just 'tableprefix', without the 'db' prefix. 2013-11-28 11:23:45 +01:00
Frank Karlitschek
6c16d45dc7 Merge pull request #6070 from ganomi/showstars
Show stars as password placeholder for sharing
2013-11-28 02:16:44 -08:00
Frank Karlitschek
d2567129a1 Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
on mssql the schema migration sometimes fails due to an already existing...
2013-11-28 02:16:16 -08:00
Vincent Petry
69a3327f47 Moved new file extension out of the translated string 2013-11-28 10:52:59 +01:00
Vincent Petry
a1d2f0f516 Merge pull request #6094 from owncloud/enc_fix_reshares
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
Vincent Petry
24a08c686d New file box now has default file name + extension
Whenever a user creates a file or folder in the web UI, the input field
will contain a default file name, pre-selected up to the extension for
easier typing.

The purpose is mostly to prevent users creating text files without an
extension.

Fixes #6045
2013-11-28 10:18:31 +01:00
Thomas Müller
f23d641b82 Merge pull request #6084 from owncloud/fix-app-routing
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
Bjoern Schiessle
efe7c4075a fix path reconstruction for reshares 2013-11-27 23:26:04 +01:00
Vincent Petry
bc64931cd0 Fixed unit tests for ajax rename 2013-11-27 23:19:57 +01:00
Morris Jobke
54b24ca88d Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
show a message at the log-in screen if inital encryption take place
2013-11-27 14:10:11 -08:00
Morris Jobke
55d7cf8ffd improve encryption message 2013-11-27 23:07:19 +01:00
Bjoern Schiessle
d9729168f9 some small js fixes 2013-11-27 22:42:03 +01:00
Bjoern Schiessle
0219b8b3b9 add spinner to the template so that it can be loaded in time 2013-11-27 22:36:47 +01:00
Bjoern Schiessle
e0924a5f07 switch to large spinner 2013-11-27 21:58:38 +01:00
Vincent Petry
68f610a90e Update file list entry on rename
Whenever a file is renamed, if the extension changes, the mime type and
preview might change. This fix passes the updated info to the client
that updates it.
2013-11-27 21:35:00 +01:00
Vincent Petry
43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
Robin Appelman
885d04bc86 Fix getRawPathInfo for the '/' edge case 2013-11-27 21:28:54 +01:00
Björn Schießle
5295993144 Merge pull request #6088 from owncloud/fix_public_previews
fix public preview creation if a user is logged in
2013-11-27 11:05:27 -08:00
Björn Schießle
34a8c3c4cd Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
move files to owners trash
2013-11-27 10:24:55 -08:00
ganomi
f94180a996 Fix filellist/rename/summary problem
Fixes #6055
This contribution is MIT licensed!
2013-11-27 19:09:49 +01:00
Bjoern Schiessle
aee7781f22 fix public preview creation if a user ios logged in 2013-11-27 18:44:01 +01:00
Morris Jobke
39f9e16f20 Merge pull request #6086 from owncloud/incognito_mode
return false if user is in incognito mode
2013-11-27 09:11:18 -08:00
Jenkins for ownCloud
4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Vincent Petry
d2840a045d Fixed sharing hook to not remove the share before the trashbin
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
Bjoern Schiessle
1536c7ea58 switch from "name" attribute to "id" 2013-11-27 17:01:21 +01:00
Bjoern Schiessle
6deda1b9f6 return false if user is in incognito mode 2013-11-27 16:52:30 +01:00
Morris Jobke
6b3b3d8af4 Fix for IE - an ugly horizontal scrollbar appears
* for IE9 the nav bar was too narrow
 * for other IEs the width of each app element was to wide and
   cause the horizontal scoll bar - now this content is hidden like
   before this PR
2013-11-27 16:45:04 +01:00
Bjoern Schiessle
1065c33543 Merge branch 'master' into encryption_initial_enc_indicator 2013-11-27 16:44:06 +01:00
Vincent Petry
40231c08cf Merge pull request #5977 from owncloud/encryption_enable_public_upload
Encryption enable public upload
2013-11-27 07:39:03 -08:00
Morris Jobke
41c6752030 fix navbar 2013-11-27 16:10:49 +01:00
Jan-Christoph Borchardt
3360719bbf prevent shift of app names caused by scrollbar, part 2 2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
f9f123c6f6 prevent shift of app titles caused by scrollbar 2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
457a7d4baa always show app navigation scrollbar when too many apps in there 2013-11-27 16:10:48 +01:00
Robin Appelman
c47e46fda0 fix custom routes defined by apps 2013-11-27 15:35:49 +01:00