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

23790 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
8906158d3b Merge pull request #15123 from owncloud/fix_14098 
offset needs to be considered in computed limit
 2015-03-23 17:50:24 +01:00
Vincent Petry
eb894e6625 Soft fail in CustomPropertiesBackend whenever storage not available 
When a storage is not available, it will not fail the whole call any
more but still return a usable file list.
 2015-03-23 17:41:32 +01:00
Lukas Reschke
02c0fe8d43 Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox 
Show message if upload of folder isn't allowed
 2015-03-23 17:18:46 +01:00
Morris Jobke
0adcb99110 Merge pull request #14862 from owncloud/introduce-shipped.json-master 
shipped apps are now defined in core/shipped.json - the shipped tag in i...
 2015-03-23 17:17:33 +01:00
Jan-Christoph Borchardt
fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Arthur Schiwon
7520d0fb3d offset needs to be considered in computed limit 2015-03-23 16:51:40 +01:00
Jan-Christoph Borchardt
c93e4c806a Merge pull request #15114 from owncloud/sharing-labels 
combine labels with inputs in sharing dialog, fix #14796
 2015-03-23 16:46:53 +01:00
Morris Jobke
7f2b06dfa0 Merge pull request #15120 from owncloud/ldap-occ-fix-warnings 
fix PHP warnings when using occ with some LDAP commands
 2015-03-23 16:29:27 +01:00
Jan-Christoph Borchardt
fe5597b76e Merge pull request #15118 from owncloud/user-mgmt-groups 
fix long group names overlapping in the sidebar, fix #12649
 2015-03-23 16:15:24 +01:00
dratini0
c432b52c74 Changed the disputed while loop to a single if. 2015-03-23 16:12:03 +01:00
Thomas Müller
79f012d262 remove unneeded status element from json response on /categories - fixes 15056 2015-03-23 15:20:06 +01:00
Arthur Schiwon
468fc675a4 fix PHP warnings when using occ with some LDAP commands 2015-03-23 15:19:41 +01:00
Thomas Müller
33cd60ab9a adding enterprise apps to shipped.json 2015-03-23 15:11:16 +01:00
Joas Schilling
1a26263123 Do not walk over the users directory, but over the list of tagged objects 
Way quicker
 2015-03-23 15:10:58 +01:00
Jan-Christoph Borchardt
23396a52cd fix long group names overlapping in the sidebar, fix #12649 2015-03-23 14:57:07 +01:00
Jan-Christoph Borchardt
5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Clark Tomlinson
0e4ba618cf Merge pull request #14383 from jknockaert/newbranch 
make encryption stream wrapper seekable
 2015-03-23 09:22:36 -04:00
Morris Jobke
98e770b68e Merge pull request #15107 from owncloud/user-mgmt-header 
fix first user mgmt header jumping around, fix #8873
 2015-03-23 14:22:16 +01:00
Thomas Müller
f64ddad29d Merge pull request #15108 from owncloud/issue/15049-iran-timezone 
The iran timezone removed the DST handling which breaks the timezone lib
 2015-03-23 14:21:47 +01:00
Joas Schilling
1686653fdd The iran timezone removed the DST handling which breaks the timezone lib 2015-03-23 14:08:47 +01:00
Morris Jobke
5ec547a05f Merge pull request #15103 from owncloud/link-personal 
link back to top on Personal page
 2015-03-23 14:03:57 +01:00
Jan-Christoph Borchardt
7079b1b434 fix first user mgmt header jumping around, fix #8873 2015-03-23 13:46:05 +01:00
Jan-Christoph Borchardt
f899d77ba5 fix capitalization in Personal settings 2015-03-23 13:42:33 +01:00
Jan-Christoph Borchardt
731c90a033 link back to top on Personal page, fix #14519 2015-03-23 13:41:40 +01:00
Jenkins for ownCloud
a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Morris Jobke
21bc8e0c81 Merge pull request #15088 from oparoz/3d-support 
Introducing 3D images support (media type)
 2015-03-22 23:14:02 +01:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Roeland Jago Douma
bdde2156da Added extra unit test 2015-03-21 09:47:07 +01:00
Roeland Jago Douma
9ce8e1ddc7 OCS API should return fancy OC url 
* Also use the URLGenerator
 2015-03-21 09:47:06 +01:00
Volker E
599ee5ce4e fixing #15023, getting comments out of HTML output 2015-03-21 07:10:46 +01:00
Jenkins for ownCloud
e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Olivier Paroz
f3fe46685b Introducing 3D images support (media type) 
So that people with 3D images can at least see a 2D picture
Full 3D support is possible via an app
 2015-03-20 22:11:42 +01:00
Jan-Christoph Borchardt
6c98925621 Merge pull request #14737 from owncloud/app-descriptions-collapsible 
collapse app descriptions by default, make expandable, fix #13112
 2015-03-20 17:51:51 +01:00
Thomas Müller
83e35412e6 Merge pull request #15069 from owncloud/enable-oci-testing-on-pr-master 
Adding magic file to enable oci on pull request testing on ci.owncloud.o...
 2015-03-20 17:01:04 +01:00
Thomas Müller
afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager 
Preview provider registration in manager
 2015-03-20 16:34:22 +01:00
Thomas Müller
4477053818 Adding magic file to enable oci on pull request testing on ci.owncloud.org 2015-03-20 15:00:51 +01:00
Morris Jobke
a45e45df1e Merge pull request #14941 from AdamWill/pipeline-apps 
fall back to absolute path for pipelined assets (#14940)
 2015-03-20 14:56:02 +01:00
Vincent Petry
e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework 
Cleanup ext storage CRUD code, introduce storage config id
 2015-03-20 14:17:32 +01:00
Thomas Müller
0b1c4bfc3b Merge pull request #15062 from owncloud/fix-15053-master 
Handle session initialization errors and display error page
 2015-03-20 14:07:15 +01:00
Morris Jobke
7ea5c47b3c Merge pull request #15063 from owncloud/share-readonlyfile-permissions 
Do not automatically add "update" permission to shared mounts
 2015-03-20 14:06:55 +01:00
Morris Jobke
b0cd1b0975 Merge pull request #14938 from owncloud/test-oracle-in-docker 
Oracle 11 XE is now fired up in a docker image - looks like we get back ...
 2015-03-20 13:02:33 +01:00
Vincent Petry
67160e0861 Do not automatically add "update" permission to shared mounts 
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.

Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
 2015-03-20 12:33:59 +01:00
Thomas Müller
843fef0490 Handle session initialization errors and display error page - fixes #15053 2015-03-20 12:21:03 +01:00
Thomas Müller
a87cc90d1e Merge pull request #14993 from owncloud/stop-on-missing-deps 
Stop executing, when 3rdparty is missing or apps directory is invalid
 2015-03-20 11:36:02 +01:00
Vincent Petry
eef5851a67 Fix share permission related unit tests 2015-03-20 11:30:51 +01:00
Robin McCorkell
c37913b1d5 Introduce async status checking 2015-03-20 09:48:14 +00:00
Thomas Müller
d039e4fd25 Now using a special docker where the database for testing is already available 2015-03-20 10:33:21 +01:00
Thomas Müller
cce303ff5c Merge pull request #15047 from owncloud/connect-failed-exception-message 
be a little more verbose in the exception message when we cant connect to...
 2015-03-20 10:06:06 +01:00
Robin McCorkell
8e536c6762 Merge pull request #15050 from owncloud/user-create-exists 
show a better error message when trying to create a user that already exists
 2015-03-20 08:54:16 +00:00
Joas Schilling
7776e088d6 Group sharing activities by user/group and file respectively 2015-03-20 09:49:33 +01:00