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

8177 commits

Author SHA1 Message Date
Arthur Schiwon
e962999896 get rid of @read in PHP doc after rebase 2014-06-03 13:01:14 +02:00
Arthur Schiwon
ba82d80f32 adjust group tests 2014-06-03 12:59:11 +02:00
Arthur Schiwon
3fed96af0e clean up 2014-06-03 12:59:11 +02:00
Arthur Schiwon
f9a9085faf class descriptions 2014-06-03 12:59:10 +02:00
Arthur Schiwon
5336e9a156 newlines 2014-06-03 12:59:10 +02:00
Arthur Schiwon
d52fbd7e55 adjust test to changed convention in storing quota 2014-06-03 12:59:10 +02:00
Arthur Schiwon
342e1fd3bf port of PR #8038 2014-06-03 12:59:10 +02:00
Arthur Schiwon
11f7823e1b precaution: lowercase string for comparison 2014-06-03 12:59:10 +02:00
Arthur Schiwon
e07ebdd7d0 adjust user backend test 2014-06-03 12:59:10 +02:00
Arthur Schiwon
e32fa3de4a fix parameter order 2014-06-03 12:59:10 +02:00
Arthur Schiwon
b0d1b2557c adjust Access test 2014-06-03 12:59:09 +02:00
Arthur Schiwon
6d64d7ec3f LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master 2014-06-03 12:59:09 +02:00
Arthur Schiwon
75d320cc91 fix description texts 2014-06-03 12:36:42 +02:00
Arthur Schiwon
4bfb162558 command line tools to see, modify and test existing LDAP configurations 2014-06-03 12:35:18 +02:00
Thomas Müller
d3e830e938 Merge pull request #8729 from owncloud/add-phpseclib-master 
use phpseclib from 3rdparty
 2014-06-03 12:19:04 +02:00
Thomas Müller
17cbfc714a use phpseclib from 3rdparty 
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
 2014-06-03 12:18:30 +02:00
Joas Schilling
1d0ac9a2c5 Fix tests 2014-06-03 11:45:53 +02:00
Bjoern Schiessle
8e583f55dc set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app 2014-06-03 11:29:28 +02:00
Vincent Petry
1297b2b883 Multiple fixes to sharing overview 
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
 2014-06-03 11:04:57 +02:00
Joas Schilling
74e2a4b154 Use active instead of hover for active sidebar option 
Fix #8720
 2014-06-03 09:57:18 +02:00
Joas Schilling
74c647bb6a Do not overwrite cursor in sidebar 2014-06-03 09:55:50 +02:00
Morris Jobke
7ad7f59162 fix empty file handling option 2014-06-03 09:38:19 +02:00
Jan-Christoph Borchardt
6270902650 Merge pull request #8821 from owncloud/kill-zip-download-restriction 
drop allowZIPdownload and maxZIPSize as options
 2014-06-03 01:47:40 +02:00
Frank Karlitschek
f12a5248a3 Merge pull request #8820 from owncloud/design-details 
Design details
 2014-06-02 21:26:43 +02:00
Bjoern Schiessle
916f859377 check if it is a share storage 2014-06-02 20:39:20 +02:00
Thomas Müller
2a10e78c58 no need to empty array in a special way 2014-06-02 20:17:40 +02:00
Bjoern Schiessle
e0a5f3b570 get permissions directly from share storage to avoid additional db calls 2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer
37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
Thomas Müller
2bb902d028 use OC_DB::dropTable() 2014-06-02 18:57:53 +02:00
Bjoern Schiessle
a7f6a051ad return size '0' if the trashbin folder doesn't exists yet 2014-06-02 18:56:04 +02:00
Bjoern Schiessle
7ad0fee0b5 let file cache handle the versions size 2014-06-02 18:55:13 +02:00
Vincent Petry
640fbc016d Now using shareOwner for the share owner 
Makes it consistent with the regular file list fileData
 2014-06-02 18:52:31 +02:00
Morris Jobke
da090099f4 fix unit tests 2014-06-02 18:39:52 +02:00
Morris Jobke
9a67986473 add OCP\Config:deleteSystemValue 2014-06-02 18:31:43 +02:00
Morris Jobke
390d8e53b4 Merge pull request #8676 from owncloud/encryption_improvements 
cleanup encryption code, improved return codes
 2014-06-02 18:28:18 +02:00
Vincent Petry
0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Morris Jobke
dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment 
Improve aligment of file size
 2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt
cd61fb06eb move Deleted Files to bottom of sidebar 2014-06-02 17:33:42 +02:00
Morris Jobke
bdfad3440c fix success status symbol to a circle 2014-06-02 17:25:08 +02:00
Morris Jobke
079b709f28 bump version 2014-06-02 16:47:15 +02:00
Morris Jobke
57ef089aac drop allowZIPdownload and maxZIPSize as options 2014-06-02 16:29:03 +02:00
Jan-Christoph Borchardt
3b4004f9e5 more subtle hover effect on sortable column, text instead of background 2014-06-02 16:23:22 +02:00
Vincent Petry
d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Jan-Christoph Borchardt
a447caf8d3 fix misalignment of modified dates, shift to right 2014-06-02 15:55:49 +02:00
Frank Karlitschek
51602f67e0 Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav 
fully translatable user_webdav
 2014-06-02 15:53:18 +02:00
Jan-Christoph Borchardt
708758f34e remove unused table sizing CSS 2014-06-02 15:52:57 +02:00
Morris Jobke
5d457dafc1 display "<1 kB" for really small files 
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
 2014-06-02 15:33:09 +02:00
Bjoern Schiessle
b16b17f920 ceanup encryption code, improved return codes 2014-06-02 13:15:11 +02:00
Vincent Petry
7961d4a87e Update share action text to display owner/recipients 
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
 2014-06-02 12:12:57 +02:00
Arthur Schiwon
f0e69b2b99 Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579 
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs

get the correct version number for compare -.-

bump version and don't overwrite values on next update if not necessary

simpler and better readable assignment
 2014-06-02 12:08:01 +02:00
Jenkins for ownCloud
d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Jenkins for ownCloud
cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller
5dd3e34f57 Merge pull request #8444 from owncloud/cleanup-list-code 
Cleanup code of files_sharing/ajax/ a little bit
 2014-05-30 22:40:28 +02:00
Lukas Reschke
b7f163a701 Merge pull request #8695 from owncloud/jserrorfixes 
Fixed undefined object error that appears after a delay
 2014-05-30 17:20:09 +02:00
Vincent Petry
c8a19adc3a Merge pull request #8779 from owncloud/sel-webdav-onclick 
select webdav address on click
 2014-05-30 17:18:54 +02:00
Lukas Reschke
756b158230 Merge pull request #8663 from owncloud/files-dndissue 
Fixed drag and drop from external files, added tests
 2014-05-30 16:28:20 +02:00
Volkan Gezer
d7e63d8fab select webdav address on click 2014-05-30 15:39:25 +02:00
icewind1991
2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof 
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
 2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9 Fixed warning when file_target is not set 
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
 2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446 Removed "Share with" column 2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e Added owner display name in action 2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3 Sharing overview fixes and unit tests 
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
 2014-05-30 10:06:29 +02:00
Vincent Petry
6fbf4d8548 Fix table header colors 
Table headers should be 999 even when using links (introduced by the
sorting feature)

When selecting with checkboxes, they must appear black.
 2014-05-30 10:06:29 +02:00
Vincent Petry
0879a63320 Mimetype for sharing overview 2014-05-30 10:06:29 +02:00
Vincent Petry
ef59c69dc8 Distinguish legacy file actions from regular file actions 
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.

New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.

Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
 2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84 Small fixes to sharing overview 
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
 2014-05-30 10:06:29 +02:00
Vincent Petry
06e53b359a Added "dir" in file actions handler context and fixed versions 
Added "dir" in file actions handler context so that handlers can know
what the path of the file was without having to look it up from the file
list.

Fixed versions app to use the context.dir instead of the old $('#dir')
element. This makes the versions popup work in the sharing overview.
 2014-05-30 10:06:29 +02:00
Vincent Petry
d21b8108c8 Fixed navigation order 2014-05-30 10:06:29 +02:00
Vincent Petry
89ff2857fc Add unit tests for fileActionsReady 2014-05-30 10:06:29 +02:00
Vincent Petry
8bdce6698c Added unit test for file action context argument 2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747 Removed selection checkboxes 2014-05-30 10:06:29 +02:00
Vincent Petry
85648def56 Fixed sharing permissions 2014-05-30 10:06:29 +02:00
Vincent Petry
60bcdc550e Fixed file actions for sharing views 
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.

Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
 2014-05-30 10:06:29 +02:00
Vincent Petry
279ede33af Improved FileActions with context 
A context hash is now passed to file action handlers which makes it
possible to have file list specific file actions.
 2014-05-30 10:06:29 +02:00
Vincent Petry
9baf47c2b4 Group shares by type 2014-05-30 10:06:29 +02:00
Vincent Petry
6ebc436505 Added sharing overview page (WIP) 
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
 2014-05-30 10:06:29 +02:00
Bjoern Schiessle
dbbb6c5945 extend OCS Share API to allow the user to ask for files shared with him 2014-05-30 10:06:28 +02:00
Jenkins for ownCloud
929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke
b14564480e Merge pull request #8773 from owncloud/l10n-tipsy-delete 
show delete hint text on hovering trash
 2014-05-29 21:30:50 +02:00
Robin McCorkell
32a50563d3 Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager 
get mount point from mount manager
 2014-05-29 17:52:28 +01:00
Robin Appelman
99d46af0b4 Use instanceOfStorage instead of instanceof 2014-05-29 13:52:58 +02:00
Jenkins for ownCloud
368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Volkan Gezer
b713f15b99 document always links to the current version of OC 2014-05-29 01:30:24 +02:00
Volkan Gezer
43c6ece31a fully translatable user_webdav 2014-05-29 00:23:23 +02:00
Volkan Gezer
f7cc07ba41 show delete hint text on hovering trash 2014-05-28 20:27:28 +02:00
Bjoern Schiessle
9ed5083efd get mount point from mount manager 2014-05-28 17:28:31 +02:00
Jenkins for ownCloud
80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Thomas Müller
4e2cdb2f8a Merge pull request #8713 from owncloud/typo-files-encr 
fix grammar
 2014-05-27 23:03:32 +02:00
Volkan Gezer
8eee8e76d1 forgotten infobox messages translations 2014-05-27 16:39:22 +02:00
Vincent Petry
a9661962fe Merge pull request #8736 from owncloud/appinfo-newrequirefields 
App info new fields "requiremin" and "requiremax"
 2014-05-27 14:28:47 +02:00
Vincent Petry
d38f867055 Merge pull request #8721 from owncloud/sharing_don_lose_filesize 
don't lose file size during rename
 2014-05-27 12:25:55 +02:00
Vincent Petry
c64e920b4d Adjust core apps to use "requiremin" instead of "require" 
Also added a few missing authors.
 2014-05-27 11:54:44 +02:00
Vincent Petry
a79f3fd1c0 Merge pull request #8728 from owncloud/sharing_fix_reshare 
allow resharing of files with only share permissions
 2014-05-27 09:02:52 +02:00
Jenkins for ownCloud
a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Bjoern Schiessle
36f63ea990 allow resharing of files with only share permissions 2014-05-26 20:32:24 +02:00
Bjoern Schiessle
95bd7fee9c don't lose file size during rename 2014-05-26 14:11:33 +02:00
Jenkins for ownCloud
790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer
59125cb796 fix grammar 2014-05-25 20:42:52 +02:00
Volkan Gezer
f880734827 make user_ldap fully translatable 2014-05-25 14:41:59 +02:00
Thomas Müller
3348019bfa Merge pull request #8705 from wakeup/master 
fix typo
 2014-05-25 11:00:34 +02:00
Jenkins for ownCloud
3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Volkan Gezer
426f492f57 fix typo 
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
 2014-05-24 14:36:10 +02:00
Lukas Reschke
1b215b0131 Merge pull request #8688 from owncloud/public-image-positioning 
Show less whitespace above publicly shared images
 2014-05-24 12:49:12 +02:00
Jenkins for ownCloud
2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Björn Schießle
864cd2455c Merge pull request #8699 from owncloud/sharing_improvements 
fix share label creation
 2014-05-23 20:53:32 +02:00
Bjoern Schiessle
ff4bb3a9e6 fix share label creation 2014-05-23 16:21:15 +02:00
Vincent Petry
caf283615d Fixed undefined object error that appears after a delay 
Now binding properly with the file list instance object.
 2014-05-23 16:13:35 +02:00
Jan-Christoph Borchardt
7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Robin Appelman
10c1fc8d24 Show less whitespace above publicly shared images 2014-05-23 13:36:16 +02:00
Björn Schießle
71e1d919de Merge pull request #8675 from owncloud/sharing-improvements 
Sharing improvements
 2014-05-23 06:41:34 -04:00
Vincent Petry
0b0e038b8b Merge pull request #8671 from owncloud/log-upload-errors 
php upload errors are written to log
 2014-05-23 11:33:14 +02:00
Bjoern Schiessle
3b279c9056 prevent default action when clicking on the share notification 2014-05-23 11:17:13 +02:00
Thomas Müller
6ffb139a46 Merge pull request #8658 from realriot/master 
Changed access mode for Dropbox to 'auto'
 2014-05-23 10:14:09 +02:00
Robin Appelman
157b139b57 Dont scale up the preview for publicly shared images 2014-05-22 16:45:51 +02:00
Bjoern Schiessle
11aa2cf74b always check for unique filename, if a file gets added from outside the mount 
point should be adjusted to ne unique again
 2014-05-22 14:31:22 +02:00
Bjoern Schiessle
1166d62d9b fileList needs be be declared before the if-statement 2014-05-22 14:31:16 +02:00
Björn Schießle
050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups 
allow admin to disable sharing for specific groups of users
 2014-05-22 08:19:27 -04:00
Thomas Müller
201cc59fe0 php upload errors are written to log 2014-05-22 12:20:27 +02:00
Vincent Petry
d6e1643a0e Fix dropping files below the table 2014-05-22 11:16:42 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Robin McCorkell
856c48bc25 Use default priority of 100 if backend default is not set 2014-05-21 22:31:18 +01:00
Robin McCorkell
da03ef25d9 Add priority overriding comments 2014-05-21 22:29:16 +01:00
Robin McCorkell
0a8a319915 Fix priority merging logic and add unit test 2014-05-21 22:18:22 +01:00
Robin McCorkell
eae45dca71 Add unit tests 2014-05-21 22:18:22 +01:00
Robin McCorkell
2254678a0c Use constants for priority type and add comments 2014-05-21 22:17:21 +01:00
Robin McCorkell
a0ccb060fa Use more strict type comparisons 2014-05-21 22:17:21 +01:00
Robin McCorkell
e4d3ee7866 Preserve priority if already set 2014-05-21 22:17:21 +01:00
Robin McCorkell
9151d72507 Treat 'all users' as 'global' 
A mount applicable to all users is as good a definition of global as can be
 2014-05-21 22:17:21 +01:00
Robin McCorkell
05642733a3 Add storage priority support 
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.

The priority order is as follows:
 * Personal
 * User
 * Group
 * Global

Within each mount type, the mount with the highest priority is active.

The storage backend defaults were chosen to be the following:
 * Local - 150
 * Remote storage - 100
 * SMB / CIFS with OC login - 90
 2014-05-21 22:17:21 +01:00
Björn Schießle
14a953fbe0 Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible 
[sharing] move the mount point up if the parent folder no longer exists
 2014-05-21 14:07:49 -04:00
Vincent Petry
542b395858 Fixed drag and drop from external files, added tests 
- Fixed detection whether the drop zone is inside the currently visible
  table
- Now dragging outside the table does nothing instead of uploading,
  because the user might drop on the sidebar
- Added unit tests for the drop handler
 2014-05-21 17:38:09 +02:00
Bjoern Schiessle
5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Björn Schießle
88d26aac7b Merge pull request #8612 from owncloud/share-updateshareiconsafterrename 
[master] Fixed issues with renaming
 2014-05-21 06:27:07 -04:00
Björn Schießle
319942bccb Merge pull request #8646 from owncloud/publicshare-fixes 
[master] Fixed for public link page
 2014-05-21 05:41:35 -04:00
Vincent Petry
9b23a210c9 Merge pull request #8637 from owncloud/enc_improved_error_handling 
[encryption] improved error handling during password change
 2014-05-21 09:57:45 +02:00
Sascha Schmidt
4b2888cd9a Changed access mode for Dropbox to 'auto' 2014-05-21 09:40:03 +02:00
Vincent Petry
7d98bcf9a2 Fixed JS issues in public page 
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
 2014-05-20 13:37:58 +02:00
Vincent Petry
160a2bc36f Fixed download URL in public page 2014-05-20 13:24:52 +02:00
Jenkins for ownCloud
40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Thomas Müller
51a6764f31 Merge branch 'master' into cleanup-list-code 
Conflicts:
	apps/files_sharing/ajax/list.php
 2014-05-19 20:52:25 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc 
* test case added to avoid adding them later
 2014-05-19 17:50:53 +02:00
Thomas Müller
95741f3936 Merge pull request #8435 from owncloud/fix-8322-master 
Expose permission via WebDAV
 2014-05-19 16:52:03 +02:00
Bjoern Schiessle
d9f715bdad only start migration if the encryption was initialized; allow to overwrite keys if no files exists 2014-05-19 15:53:50 +02:00
Andreas Fischer
6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps 
PHPDoc improvements /apps

* owncloud/phpdoc-improvements-apps:
  Fix whitespace issues
  Reduce double-space with single-space.
  Remove spaces around | operator in doc block.
  Fix more missing or broken PHPDoc
  PHPDoc fixes for user_ldap
  Fix PHPDoc in /apps
 2014-05-19 14:08:42 +02:00
Jenkins for ownCloud
d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Jenkins for ownCloud
a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Robin McCorkell
e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Andreas Fischer
5b1ffd7611 Reduce double-space with single-space. 2014-05-16 22:21:57 +01:00