Morris Jobke
b6aeea8c0b
simplify formula and add comment
2014-07-02 17:20:56 +02:00
Jan-Christoph Borchardt
053b0a4063
shade color for modified dates again, fix #9363
2014-07-02 16:37:15 +02:00
Jan-Christoph Borchardt
2a9fb130ec
make sure table header is white instead of slightly grey
2014-07-02 15:40:52 +02:00
Bjoern Schiessle
ea31ab7b5c
rename mount point of children if parent was renamed
2014-07-02 15:39:38 +02:00
Morris Jobke
d2f3ff5c34
Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
...
drop unneeded code
2014-07-02 15:34:57 +02:00
Robin Appelman
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
Robin Appelman
0008db9995
Fix unit test
2014-07-02 14:39:45 +02:00
Morris Jobke
59629e688c
Merge pull request #9341 from owncloud/sharing-fileactions-fix
...
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Morris Jobke
456770fde9
Merge pull request #9344 from owncloud/files-scrollissue
...
Fix files list scroll behavior
2014-07-02 13:26:23 +02:00
Morris Jobke
5e986271ef
Merge pull request #9336 from owncloud/fix-version-dropdown
...
increase width of version dropdown - fixes #9270
2014-07-02 12:04:04 +02:00
Jenkins for ownCloud
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
Vincent Petry
32d2457e58
Fix files list scroll behavior
...
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
2014-07-01 21:48:06 +02:00
Vincent Petry
025b71d068
Use fileActionsReady to re-render sharing icons
...
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.
Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Jan-Christoph Borchardt
7760fd4bef
add ellipsizing to restore string if text is too long
2014-07-01 20:37:14 +02:00
Bjoern Schiessle
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
Vincent Petry
509cdebab7
Fix fileActionsReady event after deferred file actions update
2014-07-01 18:50:54 +02:00
Vincent Petry
fd68034357
Fixed remote share password param detection
2014-07-01 17:34:01 +02:00
Morris Jobke
eaf9d6eccc
increase width of version dropdown - fixes #9270
2014-07-01 16:17:00 +02:00
Robin Appelman
8339618ead
More error catching in list.php
2014-07-01 14:58:17 +02:00
Robin Appelman
8061a4ccc0
Remove external shares if the share is invalid
2014-07-01 14:58:07 +02:00
Vincent Petry
577d06ea4d
Merge pull request #9328 from owncloud/extstorage-annoyingwarnings
...
Fix warnings when personal is not set
2014-07-01 14:51:01 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
blizzz
16ce23d19d
Merge pull request #9006 from owncloud/ldap_fix_bgjob
...
LDAP: fix background job, fixes #8995
2014-07-01 14:28:04 +02:00
Jörn Friedrich Dreyer
12420d08e2
change order of registering api and capabilities to fix file version previews
2014-07-01 14:09:48 +02:00
Vincent Petry
5e6f6da786
Fix warnings when personal is not set
2014-07-01 13:32:57 +02:00
Jörn Friedrich Dreyer
abc521dbf7
add missing backticks
2014-07-01 12:29:30 +02:00
Morris Jobke
08e49e9b07
Merge pull request #9313 from owncloud/design-icon-cancel
...
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
2014-07-01 11:00:17 +02:00
Vincent Petry
19ab6165e7
Merge pull request #9300 from owncloud/extstorage-listfilterfix
...
Use filtered list for ext storage list mounts API
2014-07-01 09:56:47 +02:00
Jenkins for ownCloud
a878b42b42
[tx-robot] updated from transifex
2014-07-01 01:54:43 -04:00
Björn Schießle
f3973c1c20
Merge pull request #9240 from owncloud/enc_check_if_file_exists
...
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Jan-Christoph Borchardt
07ba9442db
Merge pull request #9305 from owncloud/design-share-fixes
...
Design share fixes
2014-06-30 18:46:37 +02:00
Jan-Christoph Borchardt
24277f0dd6
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
2014-06-30 18:20:35 +02:00
Bjoern Schiessle
618c9fd033
improved error message
2014-06-30 16:28:40 +02:00
Robin Appelman
30c240a145
If loading a directory fails, navigate back to the previous directory
2014-06-30 16:27:31 +02:00
Robin Appelman
4526bc0ba6
Handle StorageNotAvailableException in ajax/list.php
2014-06-30 16:12:12 +02:00
Jörn Friedrich Dreyer
f35f14aa37
Merge pull request #9303 from owncloud/issue/8841
...
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00
Joas Schilling
5e4ac548bb
Use attr() instead of data() so the item ids work as intended
...
Fix #8841
2014-06-30 14:21:27 +02:00
Jan-Christoph Borchardt
a4c693dd75
remove obsolete CSS, fix visual bug in share dialog #9255
2014-06-30 14:00:43 +02:00
Bjoern Schiessle
372d58544f
no longer check if the external storage app is enabled, we use no the webdav implementation from core
2014-06-30 12:34:49 +02:00
Vincent Petry
8977a68548
Use filtered list for ext storage list mounts API
...
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.
Since that call was missing the backend name which is important for the
UI, this one was added as well.
2014-06-30 12:33:11 +02:00
Jenkins for ownCloud
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
Jenkins for ownCloud
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
Volkan Gezer
d918e5a68c
Merge pull request #9278 from owncloud/l10n-servershare-dialog
...
fix server share dialog title
2014-06-28 14:44:37 +02:00
Morris Jobke
d5462fdb50
Merge pull request #9265 from owncloud/fix-whitespace
...
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Morris Jobke
cec20d5049
Merge pull request #9020 from owncloud/l10n-external-errors-fix
...
some strings to localize external mount api responses. fix #8094
2014-06-28 11:40:32 +02:00
Jenkins for ownCloud
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
Volkan Gezer
11788c9579
fix server share dialog title
2014-06-28 01:54:51 +02:00
Bjoern Schiessle
1004836fd3
unit tests
2014-06-27 23:09:31 +02:00
Bjoern Schiessle
e4c45b5e26
check if file exists before deleting keys, and add debug output for every
...
delete operation
2014-06-27 23:09:31 +02:00
Bjoern Schiessle
706a8ace58
normalize path before comparison to make sure that we always find the mount point
2014-06-27 22:53:26 +02:00
Arthur Schiwon
fe0b75ccab
also adapt result check from readAttribute
2014-06-27 20:09:16 +02:00
icewind1991
1a3e698294
Merge pull request #9263 from owncloud/remote-share-update
...
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Arthur Schiwon
ef7ab856f6
fix instantiation of Access class
2014-06-27 18:49:11 +02:00
Arthur Schiwon
df7678f01e
specify no attribute for group exists check, as done with users
2014-06-27 18:49:11 +02:00
Jan-Christoph Borchardt
b7cb4f5a63
fix trailing whitespace noted by Scrutinizer
2014-06-27 18:25:56 +02:00
Vincent Petry
7a1b45c43b
Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage
...
Allow late registration of file actions in public page
2014-06-27 18:00:32 +02:00
Jan-Christoph Borchardt
a18658fa7f
Merge pull request #9256 from owncloud/design-mobile-shared
...
show share action of shared items darker to distinguish from non-shared,...
2014-06-27 17:59:48 +02:00
Morris Jobke
44e1bfb0ea
Merge pull request #9259 from owncloud/fix-rename-icon
...
fix rename icon, fix #9257
2014-06-27 17:41:23 +02:00
Robin Appelman
1bb1504d24
Improve comment
2014-06-27 17:31:51 +02:00
Robin Appelman
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
Vincent Petry
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
Vincent Petry
0ff30a7d5e
Remove missed console.log in file list
2014-06-27 16:10:37 +02:00
Vincent Petry
13b7937381
Allow late registration of file actions in public page
2014-06-27 16:10:20 +02:00
Jan-Christoph Borchardt
e33fa226cd
fix rename icon, fix #9257
2014-06-27 15:53:32 +02:00
Jan-Christoph Borchardt
b86b7fd143
show share action of shared items darker to distinguish from non-shared, fix #8898
2014-06-27 15:39:54 +02:00
Morris Jobke
3b2fd5e4e6
Merge pull request #9254 from owncloud/fileactions-deferred
...
Sync file list with file actions
2014-06-27 15:03:21 +02:00
Jan-Christoph Borchardt
b975f0e718
Merge pull request #9174 from owncloud/breadcrumbfix
...
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Vincent Petry
586b3a9683
Sync file list with file actions
...
Whenever file actions are registered later, now the file lists are
automatically notified.
Added FileActions.addUpdateListener() to be able to receive such
notifications.
This removes the need for apps to manually call FileActions.display()
after registering new actions.
This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
Thomas Müller
4d6019b73f
Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
...
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Vincent Petry
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
Vincent Petry
ec4cf96f0d
Breadcrumb width calculation fix
...
Rewrote the breadcrumb calculation to be more readable.
Breadcrumb now has a setMaxWidth() method to set the maximum allowed
width which is used to fit the breadcrumbs.
The breadcrumb width is now based on the container width, passed through
setMaxWidth() by the FileList class.
Now using fixed widths for the test crumbs to simulate consistent
widths across browsers which rendering engines might usually yield
different results.
2014-06-27 11:11:34 +02:00
Thomas Müller
ef4057d382
remove pointless require - we should kill all require_once like that in our tests
2014-06-27 09:30:42 +02:00
Thomas Müller
171475b95a
fix autoloader
2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543
Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies
2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
Morris Jobke
d9aa8c9f0e
drop unneeded code
2014-06-27 00:30:14 +02:00
Frank Karlitschek
2daffbc44e
Merge pull request #9051 from owncloud/Bagera-master
...
Fix delete action height
2014-06-26 17:48:55 -04:00
icewind1991
1b1bebdcb2
Merge pull request #9236 from owncloud/sharing-settingswording
...
Fix wording for remote shares in settings page
2014-06-26 22:56:46 +02:00
Vincent Petry
c6b89cc55a
Fix wording for remote shares in settings page
2014-06-26 19:35:57 +02:00
Raghu Nayyar
5b189315b5
Merge pull request #9234 from owncloud/fix-ellipsis-for-folders
...
Fix ellipsis for folders on mobile screens
2014-06-26 22:45:40 +05:30
Vincent Petry
8526556110
Merge pull request #9206 from owncloud/occ-scan-user
...
Prevent running the files:scan command as the wrong user
2014-06-26 17:03:23 +02:00
icewind1991
46adf8cb19
Merge pull request #9223 from owncloud/occ-scan-arguments
...
Add error message when no users specified to files:scan command
2014-06-26 17:01:39 +02:00
Morris Jobke
cbd5e31d33
fix padding for last cell in summary of trashbin
2014-06-26 16:58:49 +02:00
Morris Jobke
9eb7ed4925
Fix ellipsis for folders on mobile screens
...
* fixes #9162
2014-06-26 16:37:34 +02:00
Björn Schießle
aabee3e4b0
Merge pull request #9171 from owncloud/enc_always_use_oc_view
...
[encryption] always use oc view
2014-06-26 15:11:08 +02:00
Vincent Petry
fd04b3070f
Add error message when no users specified to files:scan command
2014-06-26 11:58:38 +02:00
Björn Schießle
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Jenkins for ownCloud
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
Vincent Petry
93a6792da7
Merge pull request #9205 from owncloud/remoteshare-fixurlpath
...
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Vincent Petry
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
Jörn Friedrich Dreyer
42e9d49d72
update files_external swift to php-opencloud v1.9.2
2014-06-25 17:15:59 +02:00
Morris Jobke
a9d0e9a5d5
Merge pull request #9202 from owncloud/urlhashfix
...
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
Robin Appelman
9a2ed86672
Prevent running the files:scan command as the wrong user
2014-06-25 15:22:49 +02:00
Bjoern Schiessle
38ff8173ab
make sure that hooks are registered for the tests
2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c
Fix parsing of remote URL when mounting remote shares
...
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud ".
Such URLs are now parsed correctly.
Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
icewind1991
c94c69aea1
Merge pull request #9189 from owncloud/sharing_fix_permissions
...
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Jörn Friedrich Dreyer
e792d38c11
remove rackspace opencloud libs from files_external 3rdparty
2014-06-25 14:54:43 +02:00
Bjoern Schiessle
d3d1955ef4
fix unit tests
2014-06-25 12:38:26 +02:00
Jenkins for ownCloud
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
Bjoern Schiessle
3d0805f27d
always use a \OC\Files\View
2014-06-25 12:27:30 +02:00
Bjoern Schiessle
709691548d
always use oc filesystem for rename operation
2014-06-25 12:27:30 +02:00
Vincent Petry
363f8f3205
Do not clear URL hash when no external mount params given
...
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.
In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9
Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00
Bjoern Schiessle
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
Arthur Schiwon
89f2691515
adjust access constructor to master
2014-06-25 11:46:21 +02:00
Arthur Schiwon
452efa5fab
Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002
...
fix PHPdoc
Conflicts:
apps/user_ldap/lib/connection.php
add method to count groups on LDAP
Conflicts:
apps/user_ldap/lib/access.php
LDAP Wizard: count users and groups with the power of paged search
Conflicts:
apps/user_ldap/lib/wizard.php
consolidate requirement check
fix PHPdoc
Conflicts:
apps/user_ldap/lib/access.php
Wizard: get really all groups from LDAP by power of Paged Search
Conflicts:
apps/user_ldap/lib/wizard.php
make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state.
Conflicts:
apps/user_ldap/lib/connection.php
simplify two methods a bit, because they are not used for group search anymore
Conflicts:
apps/user_ldap/lib/wizard.php
remove unused vars; increase scrutinizer happiness
2014-06-25 11:45:55 +02:00
Vincent Petry
dd2ef47ed3
Merge pull request #9168 from owncloud/files-phpwarningondelete
...
Remove warning when deleting all entries
2014-06-24 18:18:14 +02:00
Robin Appelman
544963f414
Allow adding object stores with the files_external mount config
2014-06-24 14:36:57 +02:00
Bjoern Schiessle
3fc7357ade
add/update unit tests
2014-06-24 14:00:15 +02:00
Bjoern Schiessle
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
Bjoern Schiessle
9c45a3196b
add unit tests
2014-06-24 10:43:07 +02:00
Bjoern Schiessle
6b85fe819c
always use '/' as directory seperator
2014-06-24 09:29:11 +02:00
Jenkins for ownCloud
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
Morris Jobke
cc559c5b4b
Merge pull request #9074 from geez0x1/master
...
Update the modified date in UI on file reversion
2014-06-23 23:20:04 +02:00
Lukas Reschke
e070e292bf
Merge pull request #9170 from owncloud/files-renamevalidationblur
...
Fix blurring of invalid file name on rename
2014-06-23 22:48:46 +02:00
Joas Schilling
c98b7fe7fc
Merge if statements
2014-06-23 18:10:08 +02:00
Vincent Petry
536a190846
Merge pull request #9124 from owncloud/move-permissions
...
Fix moving files into read only public shares
2014-06-23 17:05:35 +02:00
Vincent Petry
7d4747ea16
Fix blurring of invalid file name on rename
...
When renaming to an existing file name, blurring the field should not
remove it.
This fix keeps the field until escape is pressed instead of replacing it
with a broken empty space.
2014-06-23 16:35:11 +02:00
Vincent Petry
909e505c2e
Remove warning when deleting all entries
...
When deleting all entries, only "allfiles" is defined but not "file" or
"files", which caused a PHP warning to be logged.
2014-06-23 15:57:45 +02:00
Vincent Petry
6850d0c6d7
Merge pull request #8931 from owncloud/filelist-usepathforaction
...
[master] Use actual file path on rename/delete
2014-06-23 15:53:23 +02:00
icewind1991
4d216e8e2a
Merge pull request #9153 from owncloud/files-unselectafterdelete
...
Clear file selection when list is repopulated
2014-06-23 14:42:00 +02:00
Robin Appelman
d24c0f4d42
Dont allow opening writable streams on a read only dav mount
2014-06-23 14:35:19 +02:00
Vincent Petry
074d3a8f07
Clear file selection when list is repopulated
...
When calling FileList.setFiles() the current selection needs to be
cleared.
2014-06-23 12:55:42 +02:00
Vincent Petry
9b001ed903
Setup the external share manager in a hook
...
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
2014-06-23 11:57:43 +02:00
Jenkins for ownCloud
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
Jenkins for ownCloud
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -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
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
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
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
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
Bjoern Schiessle
b486f48fbc
fix trash bin expire operation and add unit tests
2014-06-17 22:36:30 +02:00
geez0x1
7576dde0a3
Update the modified date in UI on file reversion
2014-06-17 22:22:03 +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
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
Robin Appelman
3ed4e5b26b
Prevent warning
2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626
Fix setupFromToken when a password is set
2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007
Fix multiple users having the same external share mountpoint
2014-06-16 15:57:01 +02:00
Bagera
bc65b25303
Aligning in the table header as well
...
Aligning the columns and in the rows
2014-06-16 14:15:55 +02:00
Bagera
28f420b337
Aligning with line height
...
Remove "top:" in favour of setting "line-height" and fixing the
resulting problem with the input field being positioned wrongly.
2014-06-16 14:11:58 +02:00
Bagera
e11abccded
Fix delete action height
...
Fix #8530 and align the all actions in the row
2014-06-16 14:11:55 +02:00
Morris Jobke
b75fe439e7
fix CSS for upload button - fixes #8939
2014-06-16 13:51:49 +02:00
Robin Appelman
5b1b6572f7
Make testremote more robust
2014-06-16 13:21:00 +02:00
Robin Appelman
6e06e1da0e
Add route which went missing during rebase
2014-06-16 13:20:39 +02:00
Morris Jobke
4fbab3c12d
Merge pull request #9040 from owncloud/fix-xss
...
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Morris Jobke
3069091e61
Merge pull request #9030 from owncloud/default-allow-user-mount-backends
...
AllowUserMount defaults now to all backends fixes #7958
2014-06-16 13:10:01 +02:00
Robin Appelman
a469efb1f1
Add some safety checks
2014-06-16 12:42:28 +02:00
Morris Jobke
0a2c676cda
fix camelCase and avoiud re-wrapping $()
2014-06-16 11:35:48 +02:00
Morris Jobke
78b6f59523
fix typo - Backups -> Backends
2014-06-16 11:33:51 +02:00
Vincent Petry
d21845557e
Merge pull request #9027 from owncloud/fix-password-saved-share-layout
...
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
Jenkins for ownCloud
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
Lukas Reschke
1066f4ec9a
Sanitize name of sharee
...
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68
Fix path
2014-06-14 15:26:27 +02:00
Robin Appelman
9670d3e98b
Always send a POST body
2014-06-14 10:22:38 +02:00
Robin Appelman
be93b0d01d
Fix permissions functions for webdav external storages
2014-06-14 10:22:38 +02:00
Robin Appelman
4bc8a2550d
Fix public share webdav permissions
2014-06-14 10:22:38 +02:00
Robin Appelman
49f9b7ea8e
fix modified date for external shares
2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48
Fix undefined index error
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5
block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d
add settings to disable server to server sharing
2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd
Properly expose read only public shares as read only
2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
Robin Appelman
decb51aee6
Fix deleting of external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
3f2cb39aba
Properly set read permissions for webdav storages
2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168
generate better storage ids
2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8
Use the movable mount system for external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
790d51ea1e
Fix checking for external share in encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
277f25222a
if file doesn't exist, check parent folder
2014-06-14 10:14:07 +02:00
Robin Appelman
2005c162bd
Fix prompting for password
2014-06-14 10:14:07 +02:00
Robin Appelman
64ced76beb
Save mountpoints relative to the user
2014-06-14 10:14:07 +02:00
Robin Appelman
43c56fcd07
Generate a unique name
2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890
Update for changes in master
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
c580aeb455
exclude mounted server-to-server shares from encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56
Scan the entire remote share at once by requesting the full file tree from the remote server
2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c
Improve detection of whether we're in the files app
2014-06-14 10:13:24 +02:00
Robin Appelman
21ced89beb
Dont return false for internalPath
2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f
Support path lengths up to 4000 chars
2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103
Add interface for adding a public share to a different ownCloud instance
2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
86e1d8ca54
AllowUserMount defaults now to all backends fixes #7958
2014-06-13 18:14:41 +02:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
Morris Jobke
b91db84050
Merge pull request #8714 from owncloud/minor-fixes
...
fix some minor issues
2014-06-13 08:30:57 +02:00
Jenkins for ownCloud
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
Volkan Gezer
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
Volkan Gezer
565f0b281c
some strings to localize external mount api responses. fix #8094
2014-06-12 20:31:07 +02:00
Jörn Friedrich Dreyer
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
Jenkins for ownCloud
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
Vincent Petry
452b45ed1d
Merge pull request #8986 from owncloud/disable_tests
...
disable failing tests
2014-06-11 18:34:35 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Bjoern Schiessle
4cef7f9d4b
disable failing tests
2014-06-11 17:21:57 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bjoern Schiessle
f4a183e753
wwe no longer have a versions table
2014-06-10 14:47:32 +02:00
Bjoern Schiessle
1d9b4aadbf
no need to prepare a statement twice
2014-06-10 14:46:47 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
jbtbnl
b2c86b7a07
Merge pull request #8928 from owncloud/too-long-filename-fix-v2
...
Ellipcises too long filenames
2014-06-09 13:09:18 +02:00
Robin Appelman
a978607011
Use &=
2014-06-09 12:47:00 +02:00
Thomas Müller
961e4e5c7c
adjust unit test assert values
2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31
adding PHPDoc
2014-06-09 12:34:35 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Morris Jobke
e3429b63a2
improve ellipsis of filename for different screen sizes
2014-06-08 17:48:53 +02:00
raghunayyar
f3a605230a
@jancborchardt's commit for cross browser compatibility of extension.
2014-06-08 15:06:01 +05:30
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
raghunayyar
09206f8a49
Adds class name to span element inside filename.
2014-06-07 23:54:21 +05:30
raghunayyar
d71bb7dbe4
Adds multiple media queries for filename.
2014-06-07 14:23:49 +05:30
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Vincent Petry
506f7adb12
Merge pull request #8925 from owncloud/extstorage-sidebar
...
Added external storage list in files app
2014-06-06 18:59:37 +02:00
Thomas Müller
647dcce514
Merge pull request #8253 from owncloud/pk-on-all-tables-master
...
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Vincent Petry
e39e6a5584
Fixed delete button CSS in ext storage list
2014-06-06 15:33:33 +02:00
Vincent Petry
d3d0035a9a
Use actual file path on rename/delete
...
When renaming or deleting a file that is in a subdirectory, performing
the action from the sharing overview or another file list view, the
actual directory of the file must be used instead of the current
directory.
2014-06-06 15:17:55 +02:00
Vincent Petry
710d017eec
Added more columns to ext storage list
...
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry
a47ef52ae2
Fixed ext storage list sorting
2014-06-06 15:06:26 +02:00
Vincent Petry
01c2c3107a
Added external storage list in files app
2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt
933c05566e
Merge pull request #8922 from owncloud/design-controls-transparency
...
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt
1a519b851d
Merge pull request #8923 from owncloud/app-settings-input
...
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
raghunayyar
1d1f958bea
Ellipcises too long filenames
2014-06-06 17:30:18 +05:30
Thomas Müller
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt
08b5f787cc
app settings: display input fields at full width
2014-06-06 13:01:24 +02:00
Jörn Friedrich Dreyer
7af67eb630
increase version number of files and migration trigger
2014-06-06 12:28:36 +02:00
Jan-Christoph Borchardt
23c83c076c
unify controls bar, remove duplicate from user management
2014-06-06 12:22:09 +02:00
Jörn Friedrich Dreyer
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
icewind1991
c47d4ebbac
Merge pull request #8666 from owncloud/mount-remove
...
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Thomas Müller
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer
2801f0f222
use non static access to search
2014-06-06 11:02:05 +02:00
Vincent Petry
b2bae9313d
Fixed viewer mode for sidebar swipe
2014-06-06 10:04:28 +02:00
Bjoern Schiessle
0b2ae314c7
check if permissions exists
2014-06-06 09:56:02 +02:00
Robin Appelman
60ea4388ed
Limit permissions to share permissions
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
09970e1816
update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
574de2d91b
the mount point always have delete permissions to allow unmount
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ca6631a710
add some tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ad5d8d7980
nake sure ti create new db entry when user renames a group share
2014-06-06 09:56:01 +02:00
Robin Appelman
ea07f0a18e
Fix unit test
2014-06-06 09:56:01 +02:00
Robin Appelman
28615cca9c
Fix unit tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
a5752a8463
fix db query
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
501f98f084
update share API tests, file shares never have delete permissions
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
9a48e87253
make sure that we have a path relative to data/user/files to work with
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
0ce07bb6c4
update mount point if file_target changed
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6
add additional unit tests
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
cf5eb0fef5
remove unused variable
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
24f3f6823e
get unique_name value directly from the share array
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
5132ae5e69
fix mount point move up if the parent no longer exists
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
884b9a0ecf
bring back updateFileTarget() got lost during last rebase
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
1b0b977678
remove share mount
2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244
Fix folder name for storage root
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
a66c2e6a47
Fix the removeMount for personal mounts
2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8
Move shared mount moving from the storage to the mount
2014-06-06 09:55:59 +02:00
Robin Appelman
cabe2873c4
Make personal external mount points (re)movable from the files app
2014-06-06 09:55:59 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Jan-Christoph Borchardt
9063a25bb4
slightly widen sidebar to 250px, works better with apps and on mobile
2014-06-05 21:19:28 +02:00
Jörn Friedrich Dreyer
9b63f945e3
decode filename for scrollto
2014-06-05 19:23:44 +02:00
Jan-Christoph Borchardt
990405d6ee
fix position of sidebar toggle, fix Files controls position problems
2014-06-05 17:21:49 +02:00
Thomas Müller
e9011a8c55
adding unit tests for encryption data migration
2014-06-05 16:54:04 +02:00
Bjoern Schiessle
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
Arthur Schiwon
928945ec7e
fix typo in var name
2014-06-05 16:16:08 +02:00
Jan-Christoph Borchardt
dca5a03f8b
fix files multiselect bar now that the app list is gone
2014-06-05 13:23:08 +02:00
Thomas Müller
e34b51124b
Merge pull request #8894 from owncloud/public-share-js-overwrite
...
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
Thomas Müller
f955209a5a
Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
...
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
Robin Appelman
690e0b5070
Dont overwrite OCA.Sharing
2014-06-05 12:52:08 +02:00
Thomas Müller
d0eb8f8668
Merge pull request #8880 from owncloud/webdav-read-permissions
...
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Bernhard Posselt
844c6c3328
use slide toggle for files app
2014-06-05 11:26:24 +02:00
Vincent Petry
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Thomas Müller
6fcd135d0e
table files_trashsizes was still used in some locations -> removed
2014-06-05 10:44:32 +02:00
icewind1991
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Robin Appelman
9eb177e8bc
Use the permissions exposed by ownCloud for webdav external storages
2014-06-04 18:19:52 +02:00
Thomas Müller
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt
411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
Thomas Müller
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt
e2e05c4798
adjust controls bar position for removed nav bar
2014-06-04 14:29:46 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry
816db7aef1
Fixed wording to "Shared by link"
2014-06-04 11:32:30 +02:00
Vincent Petry
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry
b3fdda1751
Added "Shared with link" sidebar section in files app
...
Added section to only show link shares.
Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Thomas Müller
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
Thomas Müller
9e31118675
Merge pull request #8842 from owncloud/ldap_cli_methods
...
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Thomas Müller
86623358f0
Merge pull request #8849 from owncloud/trash_expire_fix
...
get files in trash from file cache
2014-06-04 09:36:40 +02:00
Thomas Müller
9f3fcf036c
fixing typo
2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Thomas Müller
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
Bjoern Schiessle
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
Bjoern Schiessle
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Thomas Müller
70ae7fa091
Fix casing and PHPDoc
2014-06-03 19:10:18 +02:00
blizzz
21d1e5eccc
Merge pull request #7930 from owncloud/fix_7785_master
...
LDAP: put out fetching of user meta data into a fully tested class of it...
2014-06-03 19:09:33 +02:00
Thomas Müller
8ee15025f0
Fix merge conflict
2014-06-03 19:05:21 +02:00
Jörn Friedrich Dreyer
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
Morris Jobke
f87a91fa00
Merge pull request #8837 from owncloud/issue/8720
...
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
Bjoern Schiessle
05cf34ea1f
get files in trash from file cache
2014-06-03 16:45:11 +02:00
Thomas Müller
cfc1d5623e
Merge pull request #8840 from owncloud/share_settings
...
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt
4ef94ddd2e
infield label removal: remove last occurences of infield labels
2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
69e5d5b8c0
remove specific sidebar size from Files app
2014-06-03 13:24:44 +02:00
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