Thomas Müller
4b31b349b8
Merge pull request #19595 from owncloud/fix-versions-log-entry
...
Reset to auto if not set
2015-10-06 13:45:35 +02:00
Thomas Müller
0385a62363
Merge pull request #19597 from owncloud/update-license-headers
...
update licence headers via script
2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767
deduplicate @xenopathic
2015-10-06 09:52:19 +02:00
Thomas Müller
1525ef43f9
Merge pull request #18484 from owncloud/fix-17964
...
Remove whitespace from base-DNs
2015-10-06 09:23:24 +02:00
Jenkins for ownCloud
3ff60cc2e3
[tx-robot] updated from transifex
2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Victor Dubiniuk
99f1112e33
Reset to auto if not set
2015-10-05 20:52:25 +03:00
Vincent Petry
c17d60165a
Fix tooltip placement on rename error
2015-10-05 17:44:25 +02:00
Arthur Schiwon
fc273ac88c
trim by default, add unit tests
2015-10-05 13:42:20 +02:00
Lennart Rosam
70ffa2f9f8
Spaces -> Tabs, Update PHP-Doc and function logic
2015-10-05 13:42:20 +02:00
Lennart Rosam
b47d15cd20
Remove whitespace from base-DNs
2015-10-05 13:42:20 +02:00
Bjoern Schiessle
bf82015254
add some output to explain the pre-conditions for decrypt-all
2015-10-05 12:41:05 +02:00
Thomas Müller
710b7dd81c
Merge pull request #19487 from owncloud/split_share_middleware
...
Split files_sharing middelware
2015-10-05 10:57:11 +02:00
Thomas Müller
28919faff5
Merge pull request #19552 from owncloud/inline_fileactions_alttext
...
If an inline files action provides an alt text show it
2015-10-05 10:24:48 +02:00
Thomas Müller
681ab05e4d
Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter
...
Fix filelist size issues, breadcrumb, multiselect
2015-10-05 09:48:31 +02:00
Thomas Müller
09fe808d48
Merge pull request #19547 from owncloud/fix-16154
...
LDAP Wizard: do not be picky about credentials when only looking for …
2015-10-05 09:48:13 +02:00
Jenkins for ownCloud
bc593f7921
[tx-robot] updated from transifex
2015-10-05 01:54:55 -04:00
Jenkins for ownCloud
2ffb1c2135
[tx-robot] updated from transifex
2015-10-04 01:55:02 -04:00
Roeland Jago Douma
6bf6ff9564
If an inline files action provides an alt text show it
...
* Added unit tests for icon display
* Added unit tests for icon alt text display
2015-10-03 15:47:20 +02:00
Jenkins for ownCloud
e0084059b9
[tx-robot] updated from transifex
2015-10-03 01:56:20 -04:00
Arthur Schiwon
6d06d1c5a4
LDAP Wizard: do not be picky about credentials when only looking for the port
2015-10-03 00:35:24 +02:00
Thomas Müller
94013ffb82
Merge pull request #19534 from owncloud/fix_19532
...
if the mountpoint is accessible for all user the array should contain 'all'
2015-10-02 18:40:50 +02:00
Vincent Petry
f135128664
Fix filelist size issues, breadcrumb, multiselect
...
- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
2015-10-02 18:03:48 +02:00
Robin Appelman
943c5069d4
Lock files when rolling back version
2015-10-02 17:08:39 +02:00
Bjoern Schiessle
0ce28a574a
if mountpoint is applicable to all users the old API expects a array with 'all'
2015-10-02 16:17:28 +02:00
Thomas Müller
54e19d7ca3
Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you
...
List remote shares in shared with you
2015-10-02 14:48:12 +02:00
Thomas Müller
594a3e4e22
Merge pull request #19523 from owncloud/fix-seconds-ago
...
Fix moment.js "a few seconds ago" with "seconds ago"
2015-10-02 14:11:46 +02:00
Roeland Jago Douma
4adc78b78b
Fix and extend unit tests
2015-10-02 12:45:52 +02:00
Roeland Jago Douma
40dd2d9dbe
More fileinfo
2015-10-02 12:45:52 +02:00
Roeland Jago Douma
eeafccb3a6
Start to show remote shares in shared with you section
2015-10-02 12:45:47 +02:00
Thomas Müller
4fb2ef3bac
Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke
...
[IE8] Fix dangling Delete action when multiselect is enabled
2015-10-02 12:16:31 +02:00
Thomas Müller
2912d0e3e3
Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert
...
Reload versions list after revert
2015-10-02 12:16:10 +02:00
Thomas Müller
f9093688cc
Merge pull request #19500 from owncloud/fix_trash_with_encryption2
...
[trashbin] fix broken versions on restore
2015-10-02 12:15:58 +02:00
Thomas Müller
3564a837d8
Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise
...
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 12:15:44 +02:00
Thomas Müller
ccbdcf0ab3
Merge pull request #19522 from owncloud/activity-395-less-sidebar-text
...
Activity 395 less sidebar text
2015-10-02 12:13:53 +02:00
Thomas Müller
daf9a63d43
Merge pull request #19386 from owncloud/ocs_shareapi_extenstion
...
OCS endpoint to list remote shares
2015-10-02 12:13:36 +02:00
Roeland Jago Douma
3d2acb5003
sharingcheckmiddleware now handles externalshares as well
...
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired
By default both are required for all functions in the
externalSharesController.
A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.
Unit tests added and updated
2015-10-02 12:03:53 +02:00
Roeland Jago Douma
dc38e674a5
Split files_sharing middelware
...
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.
This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.
TODO: add checks for federated sharing as well
2015-10-02 11:56:11 +02:00
Morris Jobke
4b3a5a257f
Fix moment.js "a few seconds ago" with "seconds ago"
...
* fixes #18627
2015-10-02 10:51:51 +02:00
Joas Schilling
e478d925c3
Fix intendation
2015-10-02 10:01:33 +02:00
Joas Schilling
17ab8e6c39
Use shorter text on the sidebar for files_sharing activities
2015-10-02 10:01:33 +02:00
Vincent Petry
5dff9d88cb
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 09:55:43 +02:00
Joas Schilling
f3864c5444
Use shorter text on the sidebar for files activities
2015-10-02 09:54:07 +02:00
Jörn Friedrich Dreyer
3dec30d0e0
Merge pull request #19484 from owncloud/ie8-checkbox-rage
...
[IE8] Fix checkboxes in login page and file list
2015-10-02 08:58:16 +02:00
Jörn Friedrich Dreyer
bf4c3ce134
Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness
...
[IE8] Remove non-working ellipsis support
2015-10-02 08:57:51 +02:00
Roeland Jago Douma
c924b6740a
Do not return unneeded info
2015-10-02 08:11:50 +02:00
Jenkins for ownCloud
3b4592718a
[tx-robot] updated from transifex
2015-10-02 01:54:51 -04:00
Roeland Jago Douma
c3e7d324c5
Extend share info
...
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.
This allows endpoints using this to actually show usefull information.
The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
2015-10-02 07:41:57 +02:00
Roeland Jago Douma
0d3009951f
Made routes remote_shares only again
...
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.
* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
2015-10-02 07:40:53 +02:00
Roeland Jago Douma
7310c4166a
Added '../remote_shares' endpoint
...
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
2015-10-02 07:40:04 +02:00