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

1057 commits

Author SHA1 Message Date
Thomas Müller
f950ce82ae Merge branch 'master' into mobile-style 
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
 2014-01-23 00:39:11 +01:00
Bjoern Schiessle
eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Morris Jobke
cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar 
Fix public upload progress bar
 2014-01-22 02:28:28 -08:00
Thomas Müller
9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller
23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Thomas Müller
9fd4cb1b66 adding password protection check to getShareByToken() 2014-01-21 10:42:47 +01:00
Thomas Müller
4ec6debe2b remove unused variable 2014-01-20 17:27:03 +01:00
Robin Appelman
3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Vincent Petry
f4c198b907 Fixed isPreviewAvailable warnings in log 
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
 2014-01-17 14:22:05 +01:00
Pellaeon Lin
4726a2021b Add $freeSpace and $uploadLimit to files_sharing 2014-01-17 17:10:42 +08:00
raghunayyar
12e5d0f68d Fixes typos, adds ; wherever not present. 2014-01-16 21:06:14 +05:30
Jan-Christoph Borchardt
d463edaf09 on mobile, show single shared image at full width without margin 2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt
5cdab5fff3 show publicly shared image on full width, without margin 2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt
c0590676a0 fix public share download button width 2014-01-16 15:28:39 +01:00
raghunayyar
775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
Myles McNamara
62040fe2d2 change em to px 2014-01-15 17:06:48 -05:00
Jan-Christoph Borchardt
3e7cf4110d tweak color and position of username in public share 2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt
db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
Thomas Müller
50ae2ab14c add download button on single file share page 2014-01-15 15:31:27 +01:00
Thomas Müller
b3a6683784 remove unused js code and css rules 2014-01-15 15:22:40 +01:00
Thomas Müller
807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Robin Appelman
d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +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
Bjoern Schiessle
fa7f53e89d it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 13:38:41 +01:00
Andreas Fischer
cb071a9f35 Merge pull request #6755 from owncloud/remove-ru_RU-master 
remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex
 2014-01-14 00:44:34 +01:00
Bjoern Schiessle
d1b47021f1 don't unshare on delete 2014-01-13 16:49:16 +01:00
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Myles McNamara
97be32e2e8 modify js to move upload wrapper, modify css to match core values 2014-01-10 14:07:20 -05:00
Myles McNamara
9ebffd6635 remove extra upload controls 2014-01-10 14:03:55 -05:00
Myles McNamara
0802b662be fix upload button layout 2014-01-10 12:20:31 -05:00
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +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
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
Jan-Christoph Borchardt
8a643ac5bc reduce width of direct link input field 2013-10-21 00:09:45 +03:00
Jenkins for ownCloud
6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Vincent Petry
7abfe2bd4f Added direct link in public share page 
Fixes #1167
 2013-10-18 17:40:41 +02:00
Frank Karlitschek
05523e7a70 Merge pull request #3219 from owncloud/disabled-links-ui 
Disabled links UI fixes
 2013-10-18 05:02:06 -07:00