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

21954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörn Friedrich Dreyer
891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css 
make sure styles and scripts are only loaded once
 2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer
49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated 
first step to drop \OCP\Config:: in favour of IConfig
 2014-12-18 23:01:49 +01:00
Thomas Müller
5327b80430 Merge pull request #12870 from owncloud/send-mail-new-user 
Send mail for new users
 2014-12-18 22:32:37 +01:00
Jan-Christoph Borchardt
8b467ffa6e Merge pull request #12947 from owncloud/fix-spinner-file-upload-ie89 
show spinner on file upload in IE8, 9
 2014-12-18 22:27:36 +01:00
Morris Jobke
7798ea0cd7 show spinner on file upload in IE8, 9 2014-12-18 22:24:07 +01:00
Morris Jobke
609e10238f Merge pull request #12945 from owncloud/hhvm-image 
HHVM: Do not call filesize(null), this function expects a string.
 2014-12-18 22:20:56 +01:00
Andreas Fischer
3ebb69944b Do not call filesize(null), this function expects a string. 
filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
 2014-12-18 20:57:19 +01:00
Morris Jobke
85301c8b85 Merge pull request #12940 from drarko/master 
Fix extra quotes in custom tags in header
 2014-12-18 18:44:44 +01:00
drarko
faaa1a89cb Fix extra quotes in custom tags in header 
Fix #12939
 2014-12-18 12:40:08 -03:00
Robin Appelman
1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share 
Fix deleting invalid s2s shares
 2014-12-18 16:38:13 +01:00
Vincent Petry
10a0fc2856 Merge pull request #12925 from owncloud/fix-js-unit-tests 
be more explicit in JS unit tests - caused by accessibility issues
 2014-12-18 12:10:11 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Robin McCorkell
a341f96f91 Merge pull request #12820 from owncloud/user-management-on-large-screens 
fix initial loading limit of user management on large screens
 2014-12-18 00:47:17 +00:00
Robin McCorkell
619dcae7af Merge pull request #12901 from owncloud/move-ldap-check-to-manager 
Move the Null-Byte LDAP check to the user manager
 2014-12-18 00:28:00 +00:00
Morris Jobke
ec0401f97b be more explicit in JS unit tests - caused by accessibility issues 2014-12-18 01:27:58 +01:00
Robin McCorkell
d83fdd7f9d Merge pull request #12913 from owncloud/hhvm-memcached-clear 
HHVM: Add workaround for missing Memcached::deleteMulti()
 2014-12-18 00:27:07 +00:00
Thomas Müller
82f8726903 Merge pull request #12900 from owncloud/more-accessibility 
More accessibility fixes for Files
 2014-12-18 01:21:01 +01:00
Thomas Müller
a581dcaadb Merge pull request #12924 from owncloud/improve-emptystates 
Improve empty states
 2014-12-18 01:10:13 +01:00
Morris Jobke
232d4385f4 Merge pull request #12917 from owncloud/fix-ocs-12915-api 
Move basic auth login out of `isLoggedIn`
 2014-12-18 00:57:22 +01:00
Thomas Müller
0132a619e7 Merge pull request #12168 from owncloud/docker-webdav 
Setup a docker container that holds a webdav instance to test files_exte...
 2014-12-17 22:12:01 +01:00
Jan-Christoph Borchardt
0bda42b8e3 add empty state for external storages 2014-12-17 21:57:31 +01:00
Morris Jobke
7c1b9aedd5 Setup a docker container that holds a webdav instance to test files_external 
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
 2014-12-17 21:50:35 +01:00
Jan-Christoph Borchardt
59dec3834f wording fix for Files app empty state 2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt
38931176df apply empty state for 'Deleted files' 2014-12-17 21:45:34 +01:00
Lukas Reschke
058324b80e Check basic auth header only for not-logged-in users 2014-12-17 21:42:07 +01:00
Morris Jobke
3d006207d1 Merge pull request #12892 from owncloud/is-addmin 
Add isAdmin and isInGroup methods for the group manager
 2014-12-17 21:40:26 +01:00
Jan-Christoph Borchardt
ab2ae91b11 improve empty state of 'All files' 2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt
16c62a346c improve empty states for sharing and shared links as well 2014-12-17 21:22:28 +01:00
Morris Jobke
a3700513d6 Merge pull request #12911 from owncloud/hhvm-infoparser 
HHVM: Call libxml_use_internal_errors() instead of surpressing errors.
 2014-12-17 21:14:41 +01:00
Jan-Christoph Borchardt
e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt
2be66044cc even better empty state for Favorites, and general Empty State style 2014-12-17 20:59:26 +01:00
Lukas Reschke
a02b00445e Store result of authentication 2014-12-17 20:22:51 +01:00
Lukas Reschke
b91a435ed4 Move basic auth login out of isLoggedIn 
Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs...

Please test very carefully, this includes:

- Testing from OCS via cURL (as in #12915)
- Testing from OCS via browser (Open the "Von Dir geteilt" shares overview)
- WebDAV
- CalDAV
- CardDAV
 2014-12-17 20:12:14 +01:00
Robin McCorkell
c20be24559 Merge pull request #12793 from owncloud/mountconfig-store-id 
Add the storage id to the mount config
 2014-12-17 17:53:11 +00:00
Andreas Fischer
fcf3c5197f HHVM: Add workaround for missing Memcached::deleteMulti() 2014-12-17 18:10:11 +01:00
Bernhard Posselt
6779bf113d add isAdmin and isInGroup methods for the group manager 2014-12-17 17:41:57 +01:00
Bernhard Posselt
0f535e3866 fix tests 2014-12-17 17:40:52 +01:00
Bernhard Posselt
0939c3147e use two tests instead of one 2014-12-17 17:40:52 +01:00
Bernhard Posselt
236632702c add a isLoggedIn method to the usersession and deprecate the isLoggedIn method on the api 2014-12-17 17:40:52 +01:00
Morris Jobke
a641bb7592 Merge pull request #12902 from owncloud/fix-filelist-thumbnails 
Propertly restore thumbnail on cancel/rename/move
 2014-12-17 17:13:21 +01:00
Andreas Fischer
8c509c3437 HHVM: Call libxml_use_internal_errors() instead of surpressing errors. 
In contrast to the previous solution, this also works on HHVM.
 2014-12-17 17:00:10 +01:00
Robin Appelman
e656af4c83 Root always exists 2014-12-17 16:09:41 +01:00
Robin Appelman
9ddd5033d4 Movable mountpoints are always deletable 2014-12-17 16:09:28 +01:00
Jan-Christoph Borchardt
0c764bc39f add label for search field for screen readers 2014-12-17 14:49:13 +01:00
Robin Appelman
d075b1d743 Add the storage id to the mount config 2014-12-17 14:22:03 +01:00
Jan-Christoph Borchardt
6f4ed59883 use method to only visually hide elements, show only for screen reader 2014-12-17 14:12:13 +01:00
Jan-Christoph Borchardt
532ba99f1c Merge pull request #12895 from owncloud/favorites-polish 
polish the Favorites design
 2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt
e2977ff4c1 fix favorite star flickering on empty state page 2014-12-17 13:40:57 +01:00
Vincent Petry
ab35459cac Propertly restore thumbnail on cancel/rename/move 
Since the thumbnail is now in a div, the code that tries to change the
thumbnail have been adapted here as well.
 2014-12-17 13:12:57 +01:00
Lukas Reschke
f6820406b6 Move the Null-Byte LDAP check to the user manager 
The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here.

Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
 2014-12-17 12:47:00 +01:00