Thomas Müller
807b885a0e
reuse file upload as used within files app - remove public upload button
2014-01-15 14:36:18 +01:00
Jan-Christoph Borchardt
2bdd014f83
first mobile style rules, hide extra columns in files view and scroll header
2014-01-14 22:14:06 +01:00
Vincent Petry
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Jenkins for ownCloud
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
Jenkins for ownCloud
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Thomas Müller
6523960de9
Merge pull request #6554 from owncloud/fix_5982
...
fix preview for reshared file
2013-12-24 04:03:20 -08:00
Jenkins for ownCloud
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
Georg Ehrke
c90e3e4f5b
fix preview for reshared file
2013-12-22 20:27:38 +01:00
Jenkins for ownCloud
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
Vincent Petry
963ee31efb
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Jan-Christoph Borchardt
ee2ecbe543
Merge pull request #6366 from owncloud/fix-6335
...
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
Jenkins for ownCloud
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
ringmaster
e2197c7108
Bump the footer down 20px to avoid overlap.
...
Fixes #6335 .
2013-12-12 13:06:57 -05:00
Vincent Petry
e9255e5d57
Added unit test for sharing permissions
2013-12-10 11:19:09 +01:00
Vincent Petry
89eb3759a8
Fixed sharing results to include the correct permissions
...
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.
Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.
Fixes #6265
2013-12-09 18:14:58 +01:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Bjoern Schiessle
ace1d40ed6
get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
2013-12-05 17:25:01 +01:00
Morris Jobke
62827376b8
fix trashbin and pbulic page controls
2013-12-03 10:59:22 +01:00
Morris Jobke
a6f10a59fc
fix and cleanup CSS for public page
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
5e9ac2f20f
change different shades of grey for public share page to white
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
7867604e22
remove app specific code
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
d673dd066a
fix details for buttons in header and controls bar
2013-12-03 10:54:18 +01:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05: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
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
Bjoern Schiessle
aee7781f22
fix public preview creation if a user ios logged in
2013-11-27 18:44:01 +01: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
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Bjoern Schiessle
9d16353e09
disable trahs in files_sharing/public.php
2013-11-21 12:06:35 +01:00
Bjoern Schiessle
c9646ddc4c
fix undefined index errors if public share view
2013-11-21 12:03:27 +01:00
Bjoern Schiessle
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Jörn Friedrich Dreyer
11425d142d
readd sharing token to public template
...
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Robin Appelman
a2015ee065
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-11 17:58:20 +01:00
Morris Jobke
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Vincent Petry
da126f1692
Fixed unit tests for files sharing watcher
2013-11-06 09:39:52 +01:00
Vincent Petry
9f4fd0161e
Added unit tests for shared files watcher
...
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
propagation
2013-11-05 19:30:52 +01:00
Vincent Petry
eb6fc14f84
Removed unused method
2013-11-05 17:14:19 +01:00
Vincent Petry
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Thomas Müller
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
Thomas Müller
a7cb16aab1
use ===
2013-11-04 21:23:10 +01:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
Jörn Friedrich Dreyer
fdaac99526
Merge pull request #5626 from owncloud/fix_search_in_shared_files
...
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 09:02:39 -07:00
