Vincent Petry
53ad15e0e3
Merge pull request #9138 from owncloud/fix-documentation
...
Add explanation about the current implementation of updateApp
2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea
Add explanation about the current implementation of updateApp
2014-06-22 12:45:59 +02:00
Jenkins for ownCloud
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
Frank Karlitschek
e30dac9afb
7.0.0 alpha 2
2014-06-21 18:52:47 -04:00
Morris Jobke
436d022316
Merge pull request #9120 from owncloud/fileactions-filelistfallback
...
Fixed file actions fallback
2014-06-21 11:28:11 +02:00
Jenkins for ownCloud
da0e4b0af0
[tx-robot] updated from transifex
2014-06-21 01:54:37 -04:00
Morris Jobke
1f17814e40
Merge pull request #9121 from owncloud/filepicker-avoidtwice
...
Prevent showing the file picker twice
2014-06-20 22:41:57 +02:00
Morris Jobke
0c2447e487
Merge pull request #9102 from owncloud/viewermode-controls
...
Fixed controls bar in viewer mode
2014-06-20 22:37:26 +02:00
Arthur Schiwon
93edacb357
Backport subset of #4179 , re-established Oracle compatibility for LDAP
...
Conflicts:
apps/user_ldap/lib/access.php
2014-06-20 20:49:34 +02:00
Morris Jobke
d5819a5ecd
Merge pull request #9108 from owncloud/uploadintofolderfix
...
Fix many issues with drag and drop upload
2014-06-20 19:01:05 +02:00
Vincent Petry
763d9ded1d
Prevent showing the file picker twice
...
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +02:00
Vincent Petry
502573eb2e
Fixed file actions fallback
...
Some apps are calling FileActions.display() directly but omit the new
fileList argument.
This fix makes the fileList argument correctly fall back to the default
file list (the one from the "All files" section)
2014-06-20 12:58:04 +02:00
Jenkins for ownCloud
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
Vincent Petry
8ae2468345
Fix appending of rows after upload
...
When uploading files or folders, they only need to be appended or
updated when their path or a section of their path is inside the current
directory (which happens for folder upload)
Fixes issue where file was appended when dragging on a parent directory
onto the breadcrumb.
Fixes appending issue when uploading folders.
2014-06-19 18:21:42 +02:00
Vincent Petry
9ef7410abe
Fixed uploading by drag and drop into folder
2014-06-19 16:14:10 +02:00
Morris Jobke
e8e53c81f8
Merge pull request #9105 from owncloud/fix_8874
...
Make sure last seen tooltip always appears even after searching and filt...
2014-06-19 15:16:33 +02:00
Arthur Schiwon
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
Jenkins for ownCloud
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
Morris Jobke
ed10f56994
Merge pull request #9071 from owncloud/extstorage-list-unittests
...
Added JS unit tests for ext storage
2014-06-19 01:21:21 +02:00
Morris Jobke
1973fdb11d
Merge pull request #9093 from owncloud/remove_unused_code
...
remove unused code
2014-06-19 01:17:36 +02:00
Vincent Petry
1236eb2afa
Fixed controls bar in viewer mode
2014-06-18 20:10:28 +02:00
Björn Schießle
edbc6b5db1
Merge pull request #9068 from owncloud/trashbin_unittests_master
...
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
Bjoern Schiessle
bcc88be4c7
adjust encryption tests to the trash bin changes
2014-06-18 14:41:16 +02:00
Bjoern Schiessle
05cd150fd2
add additional tests for the trash bin
2014-06-18 14:41:16 +02:00
Bjoern Schiessle
e06fa200b3
make sure that we always use the right user
2014-06-18 14:41:16 +02:00
Bjoern Schiessle
e20bb71a42
remove unused code
2014-06-18 13:26:42 +02:00
Bjoern Schiessle
8052d2901d
initialize array
2014-06-18 13:23:53 +02:00
Bjoern Schiessle
a921ad8925
fix rename of encryption keys
2014-06-18 12:19:33 +02:00
Jenkins for ownCloud
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
Lukas Reschke
d4bdcb7a9b
Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
...
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
Bjoern Schiessle
b486f48fbc
fix trash bin expire operation and add unit tests
2014-06-17 22:36:30 +02:00
Vincent Petry
58c204abb4
Added JS unit tests for ext storage
...
Added JS unit tests for the external storage file list extension.
2014-06-17 18:29:07 +02:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad
Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
...
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry
c5e33f5172
Merge pull request #9067 from owncloud/pass-db-hostname
...
Obviously have to pass the hostname as is when there is no ':' in the hostname
2014-06-17 15:56:52 +02:00
Björn Schießle
a548de3611
Merge pull request #9029 from owncloud/table-to-paragraph-layout-for-share
...
Migrate table layout to p layout for share settings
2014-06-17 15:46:24 +02:00
Vincent Petry
ffdc1c2fcf
Added unit test for checkMigrate with primary key + autoinc
...
Added unit test to make sure that checkMigrate() works when adding a
primary key and autoincrement column to a table schema.
2014-06-17 15:23:18 +02:00
Vincent Petry
7aa11b4361
Do not rename primary key index when renaming table
...
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
2014-06-17 15:23:18 +02:00
Andreas Fischer
9db0a82a26
We obviously have to pass the hostname as is when there is no ':' in the hostname.
...
This reverts commit 73062040e6
.
2014-06-17 14:48:32 +02:00
Morris Jobke
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Robin Appelman
2219087df6
organize js a bit better
2014-06-17 13:47:36 +02:00
Robin Appelman
f2ebac5c76
Better error handeling in testremote
2014-06-17 13:15:34 +02:00
Robin Appelman
361607c72d
testremote is for public access
2014-06-17 13:08:24 +02:00
Morris Jobke
e7365c9507
fix broken buttons for IE8-11
2014-06-17 11:45:55 +02:00
Morris Jobke
17685adb87
fixing layout issue - mostly alignment
2014-06-17 11:24:39 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Volkan Gezer
dd2dd7eaae
Merge pull request #9059 from owncloud/simplify-warning-layout
...
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
Lukas Reschke
bd4f3849a3
That file was accidentally commited. Partially revert f2fc214ce0
2014-06-16 20:38:21 +02:00