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

32980 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
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
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
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
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
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
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
William Bargent
3f2b3a3aab Merge pull request #208 from nextcloud/drag-accept-icon-for-emptycontent 
changes emptycontent icon to drag-accept on file-drag
 2016-06-23 11:56:40 +01:00
Vincent Chan
75cd7df4fb select css changes in setting/admin 2016-06-23 12:37:58 +02:00
Vincent Petry
97f1813695
Don't reload page in case of auth errors during setup checks 
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
 2016-06-23 11:54:49 +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
Jenkins for ownCloud
1e1903e4fe [tx-robot] updated from transifex 2016-06-23 02:09:38 -04:00
Morris Jobke
77c1175894 Merge pull request #204 from JSoko/master 
de language files changed to Nextcloud
 2016-06-22 22:14:40 +02:00
Morris Jobke
d47262ea46 Merge pull request #25233 from owncloud/iedavclient-nullheaders 
Init the headers in iedavclient.js
 2016-06-22 22:13:12 +02:00
Joachim Sokolowski
d7d7b49647 to Nextcloud 2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js 2016-06-22 16:58:06 +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
963d8a8565 Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares 
Add timeouts to make the UI usable again when a remote share is unrea…
 2016-06-22 15:52:44 +02:00
Vincent Petry
fa3dc909a4
Rollback version must also adjust cached size 2016-06-22 14:16:16 +02:00
Vincent Petry
3db5de95bd Merge pull request #25172 from owncloud/token-login-validation 
Token login validation
 2016-06-22 13:58:56 +02:00
Vincent Petry
293ae8a8cf Merge pull request #25134 from owncloud/app-passwords 
app passwords/device tokens wording
 2016-06-22 13:50:11 +02:00
Robin Appelman
eed1c52aec Hide more default options in occ files_external:list 2016-06-22 13:34:55 +02:00
VicDeo
854352d9a0 occ web executor (#24957) 
* Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
 2016-06-22 13:12:36 +02:00
Joachim Sokolowski
553a151fc6 Merge remote-tracking branch 'refs/remotes/origin/master' into nextcloud/master 2016-06-22 13:10:40 +02:00