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

33254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
51646bb3f6 Use stream instead of rename 2016-06-27 10:47:44 +02:00
Morris Jobke
b9edcd78bf Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnect 
Remove tooltip when disconnecting token
 2016-06-27 10:42:35 +02:00
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
b7e91c5c3a Adjust integration test 
The app is now enabled by default
 2016-06-27 10:26:23 +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
89e889c832 Check if server is installed 
AppManager has a dependency on Nc being installed
 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
Vincent Petry
93f29f57c5 Merge pull request #25129 from owncloud/remove-ie 
Remove ie8+9 support
 2016-06-27 10:20:47 +02:00
Vincent Petry
f65787ffdc Merge pull request #25247 from owncloud/fed-unshare-fail 
Remove a fed share from the local table before trying to notify the remote server
 2016-06-27 09:58:13 +02:00
Vincent Petry
3a7b9fc41d Merge pull request #25251 from owncloud/authtoken-assetpipelinefix 
Use OC.Backbone instead of Backbone directly in authtoken JS code
 2016-06-27 09:56:37 +02:00
Vincent Petry
723d0cdfbc Merge pull request #25154 from owncloud/token-login-check-loginname 
check login name when authenticating via token and basic auth
 2016-06-27 09:54:37 +02:00
Jenkins for ownCloud
ee90bef50a [tx-robot] updated from transifex 2016-06-27 01:55:57 -04:00
Lukas Reschke
db6361ef03 Merge pull request #226 from nextcloud/master-upstream-sync 
[Master] upstream sync
 2016-06-26 14:51:00 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Lukas Reschke
03449dcb9a Merge pull request #209 from nextcloud/select2-css 
Makes select2 in settings/admin look the same like everywhere else
 2016-06-26 12:52:41 +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
Christoph Wurst
1454b4515c fix layout 2016-06-24 17:00:59 +02:00
Vincent Petry
f062b62f03 Keep encryption enabled if decrypting for single user 
When decrypting all files of a single user, the admin usually does not
intend encryption to be suddenly disabled for everyone. This fix
reenables encryption after decrypting for a single user.

Decrypting for all users will still disable encryption globally.
 2016-06-24 16:46:25 +02:00
Robin Appelman
ee674844f2 better detect errors in fed sharing response 2016-06-24 15:56:33 +02:00
Christoph Wurst
26aacb4e62 show which login name to use for the new app password 2016-06-24 15:31:48 +02:00
Christoph Wurst
89198e62e8 check login name when authenticating with client token 2016-06-24 13:57:09 +02:00
Vincent Petry
b4cf297758 Prerender file list pages to include search results 
When filtering the file list, if a result is on an unrendered page,
make sure to call _nextPage() to prerender the pages in order to
display all matching results.
 2016-06-24 13:55:14 +02:00
Marius Blüm
5387b942c4 Merge pull request #214 from floeschie/master 
Replace occurence of "ownCloud" by "Nextcloud"
 2016-06-24 12:49:14 +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
Florian Auer
426a5c97cf Replace occurences of "ownCloud" by "Nextcloud" 2016-06-24 10:44:28 +02:00
Vincent Petry
e677ad56fd Make code integrity check work when OC is not installed yet 2016-06-24 10:24:41 +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
Vincent Petry
0ad065cb8d Repair step to adjust link share delete permissions 2016-06-24 09:48:48 +02:00
Vincent Petry
955635c7aa Add explicit delete permission to link shares 
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.

This fix makes sure we include delete permissions in the share
permissions, which now become 15.

In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
 2016-06-24 09:48:48 +02:00
Vincent Petry
dc78d26f2a Merge pull request #25239 from owncloud/setupchecks-preventreload 
Don't reload page in case of auth errors during setup checks
 2016-06-24 09:47:55 +02:00
Vincent Petry
0501d8daac Prevent negative or non-number values in quota input 2016-06-24 09:20:13 +02:00
Jenkins for ownCloud
29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Vincent Petry
9092d7f5ea Fix "Other" value handling in quota dropdown in users page 
Prevents "other" value to be deleted.
When appending custom value, put it above the "other" entry.
 2016-06-23 18:42:11 +02:00
Vincent Petry
9524115c2c Remove tooltip when disconnecting token 2016-06-23 18:30:45 +02:00
Vincent Petry
da4ba82b83 Use OC.Backbone instead of Backbone directly in authtoken JS code 
Fixes asset pipeline issue with the auth token in personal page
 2016-06-23 18:26:01 +02:00
Morris Jobke
865efa5740 fix mysql error handling 2016-06-23 17:05:31 +02: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