summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* group: only pass backends that hold that specific group to the group constructorRobin Appelman2013-07-184-11/+13
|
* reneme id to gidRobin Appelman2013-07-101-15/+15
|
* more consistent namingRobin Appelman2013-07-103-8/+8
|
* consistent namingRobin Appelman2013-07-101-6/+6
|
* search parameter is not optionalRobin Appelman2013-07-101-2/+2
|
* add test case for getting group after deleting itRobin Appelman2013-07-101-0/+16
|
* more consitency in hook namesRobin Appelman2013-07-102-9/+9
|
* cant use private members from closure in php <5.4Robin Appelman2013-07-101-3/+3
|
* use new group api as backend for the old apiRobin Appelman2013-07-102-173/+160
|
* update group managementRobin Appelman2013-07-107-3/+1024
|
* Merge pull request #3977 from owncloud/enable_oracle_in_autotestsThomas Müller2013-07-082-3/+2
|\ | | | | enable oracle testing by default
| * requires fixes in 3rdparty mdb2Jörn Friedrich Dreyer2013-07-081-0/+0
| |
| * enable oracle testing by defaultJörn Friedrich Dreyer2013-07-081-3/+2
| |
* | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-083-147/+161
|\ \ | | | | | | Move the upgrade logic to \OC\Updater
| * | fix typoRobin Appelman2013-07-081-2/+2
| | |
| * | Updater: pass update url as argument to update checkRobin Appelman2013-07-062-6/+6
| | |
| * | split upgrade logic from ajax fileRobin Appelman2013-07-063-146/+160
| | |
* | | Merge pull request #3979 from owncloud/permissions-hookJörn Friedrich Dreyer2013-07-081-0/+9
|\ \ \ | |_|/ |/| | Add update permissions hook to sharing
| * | Add update permissions hook to sharingMichael Gapczynski2013-07-081-0/+9
|/ /
* | Merge pull request #3954 from owncloud/update_insertifnotexist_and_testThomas Müller2013-07-082-20/+17
|\ \ | | | | | | fix insertIfNotExist return value, update doc and corresponding test
| * | update commentJörn Friedrich Dreyer2013-07-051-1/+1
| | |
| * | fix insertIfNotExist return value, update doc and corresponding testJörn Friedrich Dreyer2013-07-052-19/+16
| | |
* | | Merge pull request #3757 from owncloud/icon-cleanupJan-Christoph Borchardt2013-07-0818-29/+27
|\ \ \ | | | | | | | | Icon cleanup
| * | | change delete from entry forbidden sign to proper iconJan-Christoph Borchardt2013-07-052-3/+10
| | | |
| * | | Optimize pictures with optipng and scourkondou2013-06-215-217/+9
| | | |
| * | | use history icon in Deleted Files template as wellJan-Christoph Borchardt2013-06-172-2/+2
| | | |
| * | | standardize on 32px loading spinner, decrease size in CSS where neededJan-Christoph Borchardt2013-06-173-0/+7
| | | |
| * | | use proper style for add iconJan-Christoph Borchardt2013-06-172-8/+60
| | | |
| * | | remove unused loading spinners, just have oneJan-Christoph Borchardt2013-06-173-2/+2
| | | |
| * | | remove unused big imagesJan-Christoph Borchardt2013-06-172-0/+0
| | | |
| * | | use mail icon consistent with Mail app iconJan-Christoph Borchardt2013-06-172-6/+94
| | | |
| * | | transparent background for lock iconJan-Christoph Borchardt2013-06-171-0/+0
| | | |
| * | | use consistent icon for 'restore'/versions/history, also SVGJan-Christoph Borchardt2013-06-172-1/+1
| | | |
| * | | differentiate delete from close iconJan-Christoph Borchardt2013-06-175-11/+63
| | | |
* | | | Merge pull request #3946 from owncloud/fixing-3942-masterThomas Müller2013-07-084-44/+40
|\ \ \ \ | | | | | | | | | | handle anonymous upload to reshared folder
| * | | | fixing check if public share is a folder or notThomas Müller2013-07-061-1/+1
| | | | |
| * | | | removing unused getSharedItem()Thomas Müller2013-07-061-11/+0
| | | | |
| * | | | Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-0616-173/+287
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php
| * | | | | on reshares we now recursively move to the root of all reshares - therefore ↵Thomas Müller2013-07-053-31/+39
| | | | | | | | | | | | | | | | | | | | | | | | some code has been refactured and added as a new public function
| * | | | | fixing Notice: Undefined index: isPublicThomas Müller2013-07-051-0/+1
| | | | | |
| * | | | | handle anonymous upload to reshared folderThomas Müller2013-07-051-0/+5
| | | | | |
* | | | | | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-084-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit eed4b49cebcbcc252a75ed85097730b73213b0da Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:03:23 2013 +0200 initialize OC_Defaults only once commit bf6f07ccc8fb87535a069ca341789a590cb187ee Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:02:48 2013 +0200 link to doc in error messages commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2 Merge: e41af3d 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:56 2013 +0200 Merge branch 'master' into better-messages commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:41 2013 +0200 move to non-static defaults.php commit 9e4258b1905244bdf34943a825421f041cbed43d Author: Björn Schießle <schiessle@owncloud.com> Date: Tue Jul 2 10:32:13 2013 +0200 no sprintf here, lets t() handle it commit fe1df349e248667a137f70d78b04225e5b42a111 Merge: d8f6859 cb5811b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:13:38 2013 +0200 Merge branch 'master' into better-messages commit d8f68595df2dc0e0917d916cbde511ec5333010b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:10:57 2013 +0200 use document base url from defaults.php commit 6c5403748a45717125a2aa375550f05646317d72 Merge: bea6b1c 7b0e3e6 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:00:15 2013 +0200 Merge branch 'master' into better-messages commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:21:12 2013 +0200 link to docs in WebDAV message, ref #3791 commit 3119b364a1094769e711283d1ce9014505f64ab9 Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:10:21 2013 +0200 link to docs in error messages, fix #3819
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-08550-1138/+1184
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-07544-1227/+1335
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-06693-4714/+7173
| |/ / / |/| | |
* | | | Merge pull request #3951 from owncloud/fixing-3936-masterThomas Müller2013-07-052-5/+23
|\ \ \ \ | | | | | | | | | | get the real physical folder name for anonymous upload
| * | | | proper fix for getting the shared item if no user is logged inThomas Müller2013-07-052-5/+17
| | | | |
| * | | | php 5.3 compliant nowThomas Müller2013-07-051-1/+2
| | | | |
| * | | | get the real physical folder name for anonymous uploadThomas Müller2013-07-051-2/+7
| | | | |
* | | | | Merge pull request #3955 from owncloud/cache-scanner-testThomas Müller2013-07-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Scanner test: ensure mtime in the cache is the same as on the storage to...