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

960 commits

Author SHA1 Message Date
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
Jörn Friedrich Dreyer
68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Bjoern Schiessle
e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Morris Jobke
404e9c0053 fix style of public share page 2013-10-29 16:08:11 +01:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Thomas Müller
f91a4c89ca adding storage_mtime handling to SharedCache 2013-10-25 12:39:21 +02:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Bjoern Schiessle
2221aa9ca4 run first getUsersItemShared() with the owner 2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43 update etags for user we haven't checked yet 2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946 keep a list of users we already checked to avoid loops 2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8 fix infinite loop while updating etags, fix for #4365 2013-10-23 16:33:28 +02:00
Thomas Müller
e23433f771 display the original file name - this will change in case of renames 2013-10-22 14:02:44 +02:00
Vincent Petry
a1038c271c Merge pull request #5424 from owncloud/sharing-directlink 
Added direct link in public share page
 2013-10-21 08:26:51 -07:00
Jan-Christoph Borchardt
5ac4ec3a84 unbold the 'Direct link' label 2013-10-21 00:12:38 +03:00