Lukas Reschke
0a5c5d9b03
Replace OC_Defaults with \OC::$server->getThemingDefaults()
2016-06-27 10:34:08 +02:00
Jan-Christoph Borchardt
261396019d
design and layout fixes for Theming app
2016-06-27 10:26:24 +02:00
Bjoern Schiessle
24144b16d0
make sure that the preview gets updated every time a new image gets uploaded
2016-06-27 10:26:24 +02:00
Bjoern Schiessle
79269427d7
scale preview image
2016-06-27 10:26:24 +02:00
Lukas Reschke
433e8ea123
Disable drop zone
...
Otherwise dropping something somewhere can by mistake upload the file and make it available
2016-06-27 10:26:23 +02:00
Lukas Reschke
a0e92b5fb0
Fix indentation
2016-06-27 10:26:23 +02:00
Lukas Reschke
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Bjoern Schiessle
cc321bc140
add some visual feedback if the operation was succesful or not
2016-06-27 10:26:22 +02:00
Bjoern Schiessle
10f6ca20bc
write theme settings to database
2016-06-27 10:26:22 +02:00
Jan-Christoph Borchardt
363b76faee
basic information architecture for the theming app
2016-06-27 10:26:22 +02:00
Bjoern Schiessle
20d250a674
initial commit for the theming app
2016-06-27 10:26:22 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
52eab2a61a
[tx-robot] updated from transifex
2016-06-26 01:55:53 -04:00
Jenkins for ownCloud
3d65979f0a
[tx-robot] updated from transifex
2016-06-25 01:56:48 -04:00
Christoph Wurst
c295523ae2
Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists
...
Fix search result link for file results outside default list
2016-06-24 17:12:02 +02:00
Christoph Wurst
e9a0a6d83a
Merge pull request #25257 from owncloud/comments-showerroronsave
...
Show error message when posting an invalid comment
2016-06-24 17:11:20 +02:00
Vincent Petry
39b533d0d8
Hide search results after switching directory
...
When clicking on a folder result in the search result list, the result
box for "results in another folder" must disappear.
2016-06-24 11:32:14 +02:00
Vincent Petry
bf3ee69d86
Fix search result link for file results outside default list
...
When outside the "All files" list, the search result link must properly
redirect to the "All files" list.
2016-06-24 11:31:29 +02:00
Vincent Petry
04e3da0cf5
Merge pull request #25171 from owncloud/files_external-list-all
...
Add option to `occ files_external:list` to show all configured mounts
2016-06-24 10:18:14 +02:00
Vincent Petry
56ad4cdfec
Show error message when posting an invalid comment
...
When an internal server error occurs while creating or updating a
comment, display a proper error notification in the UI.
2016-06-24 10:17:12 +02:00
Jenkins for ownCloud
29068d3845
[tx-robot] updated from transifex
2016-06-24 01:56:13 -04:00
Vincent Petry
cc2aec11af
Merge pull request #25238 from owncloud/files-trashlistnamecorruption
...
Fix trashed file name corruption when rerendering trashbin list
2016-06-23 15:36:14 +02:00
Robin Appelman
bac1a3a623
Add option to `occ files_external:list` to show all configured mounts
2016-06-23 13:12:03 +02:00
Vincent Petry
508c580e67
Fix trashed file name corruption when rerendering trashbin list
...
The trashbin code does some gymnastics with the file data at render
time. This fix makes sure that the modifications done on the file data
are only local to the rendering code and doesn't affect the actual file
data from the file list.
2016-06-23 11:51:23 +02:00
Vincent Chan
0552933770
changes emptycontent icon to drag-accept on file-drag
2016-06-23 11:25:03 +02:00
Vincent Petry
ae50e7236f
Merge pull request #25225 from owncloud/enc-revertversionsize
...
Rollback version must also adjust cached size
2016-06-22 16:39:49 +02:00
Vincent Petry
d5f4328842
Merge pull request #25223 from owncloud/external-list-default-options
...
Hide more default options in occ files_external:list
2016-06-22 15:53:20 +02:00
Vincent Petry
fa3dc909a4
Rollback version must also adjust cached size
2016-06-22 14:16:16 +02:00
Robin Appelman
eed1c52aec
Hide more default options in occ files_external:list
2016-06-22 13:34:55 +02:00
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Jörn Friedrich Dreyer
704a993e37
Fix null pointer exception in user_ldap ( #25062 )
2016-06-21 16:30:48 +02:00
Vincent Petry
755c86e3a2
Merge pull request #24505 from owncloud/ceph-wait-for-http
...
Don't rely on the notify socket but on the service responding
2016-06-21 16:21:11 +02:00
Georg Ehrke
1452b74de7
Contacts API: replace raw image data with url ( #25081 )
...
* add uri to AddressBookImpl array
* Introduce ImageExportPlugin for CardDav
* add plugin to v1 routes
* replace binary contact photo with link
* update tests
* Adding unit tests
2016-06-21 15:25:44 +02:00
Robin Appelman
6affbdc6e7
Add "Global Auth" option to external storage
...
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93
from https://github.com/owncloud/core/pull/22468 .
This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.
![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png )
2016-06-21 14:16:45 +02:00
Thomas Müller
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
Vincent Petry
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Robin Appelman
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
Vincent Petry
dcee528482
Don't send activity to non-admins when assigning invisible tags ( #25192 )
2016-06-20 22:06:34 +02:00
Vincent Petry
ef5217d6e8
Merge pull request #25173 from owncloud/fix_conversion_issues
...
Fix conversion issues
2016-06-20 17:15:45 +02:00
Vincent Petry
88b9f5a357
Merge pull request #25162 from owncloud/password-login-forbidden-hint
...
Password login forbidden hint
2016-06-20 17:05:20 +02:00
Juan Pablo Villafáñez
bb24e40bf4
Fix conversion issues
...
Change to phpdoc type for automatic conversion
2016-06-20 14:51:36 +02:00
Bjoern Schiessle
548b8848ee
no need to mention ownCloud explicitely
2016-06-20 14:46:13 +02:00
Björn Schießle
61a3daa55d
Merge pull request #165 from nextcloud/fix-owncloud-references-federated
...
fix references to ownCloud in the federated files sharing app
2016-06-20 14:40:33 +02:00
Bjoern Schiessle
9eaccaf2b1
s/ownCloud/Nextcloud
2016-06-20 14:20:48 +02:00
Morris Jobke
22fd33137f
Merge pull request #162 from nextcloud/fix-owncloud-reference
...
Fix references
2016-06-20 14:19:30 +02:00
Vincent Petry
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
Morris Jobke
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00