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

23714 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Robin McCorkell
b6676c32d6 Merge pull request #15046 from owncloud/exception-show-type 
show exception type in debug mode
 2015-03-20 08:48:22 +00:00
Morris Jobke
1de6fa19de Merge pull request #15035 from owncloud/assocmapper 
If the execute method on the mapper receives an assoc array, it binds by...
 2015-03-20 08:53:14 +01:00
Jenkins for ownCloud
e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Robin Appelman
da4ad1c0a2 show a better error message when trying to create a user that already exists 2015-03-20 04:24:50 +01:00
Robin Appelman
bd1d7107bb round width and height when cropping avatar 2015-03-20 04:08:24 +01:00
Robin Appelman
faa4918355 be a little more verbose in the exception message when we cant connect to the db 2015-03-20 03:56:38 +01:00
Robin Appelman
2df20aaffb show exception type in debug mode 2015-03-20 03:51:21 +01:00
Vincent Petry
70115d5b03 Update 3rd party ref for sabre 2.1.3 2015-03-19 18:28:06 +01:00
Morris Jobke
2a8c3798a8 Merge pull request #14947 from oparoz/repairmimetypes-sql 
Make repairmimetypes compatible with case sensitive SQL backends
 2015-03-19 17:22:25 +01:00
Thomas Müller
c57fb62029 Merge pull request #14946 from owncloud/dropbox-root-fix 
Fix root request path for Dropbox
 2015-03-19 17:19:57 +01:00
Bernhard Posselt
df24a014b8 If the execute method on the mapper receives an assoc array, it binds by value instead of index 2015-03-19 17:08:46 +01:00
Thomas Müller
857b22c61b Merge pull request #15025 from rullzer/ocs_respect_enforced_date 
Ocs respect enforced date
 2015-03-19 17:06:04 +01:00
Thomas Müller
3765af4edf Merge pull request #14986 from owncloud/fixmapperbackw 
Fix backwards compatibility for mapper execute method
 2015-03-19 17:04:01 +01:00
Jan-Christoph Borchardt
bdb4089139 collapse app descriptions by default, make expandable, fix #13112 2015-03-19 16:30:47 +01:00
Robin Appelman
73874ca27f Merge pull request #14704 from owncloud/storage-wrapper-mount 
pass mountpoint to storage wrapper callback
 2015-03-19 16:20:38 +01:00
Robin Appelman
be6edd465a Merge pull request #14537 from owncloud/oci-external-share 
Fix external shares without password on oracle
 2015-03-19 16:20:12 +01:00
Thomas Müller
0868e49663 Merge pull request #14980 from owncloud/fix-fileglobalgc 
Fix fileglobalgc unlink parameter warnings
 2015-03-19 14:17:20 +01:00
Roeland Jago Douma
dd3307dd19 Added unit test 
Tests added to make sure that removing an expire date when this is
enforced is not allowed.
 2015-03-19 10:47:09 +01:00
Roeland Jago Douma
3c39658a1c When the expiration date is enforced respect this 
Make sure that we do not allow removing of the expiration date when this
is enforced in the settings.
 2015-03-19 10:07:17 +01:00
Volker E
0e4d52f9d2 fixing #15027, cleaning up obsolete IE5-7 workaround code 2015-03-19 09:10:58 +01:00