Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | group: only pass backends that hold that specific group to the group constructor | Robin Appelman | 2013-07-18 | 4 | -11/+13 |
| | |||||
* | reneme id to gid | Robin Appelman | 2013-07-10 | 1 | -15/+15 |
| | |||||
* | more consistent naming | Robin Appelman | 2013-07-10 | 3 | -8/+8 |
| | |||||
* | consistent naming | Robin Appelman | 2013-07-10 | 1 | -6/+6 |
| | |||||
* | search parameter is not optional | Robin Appelman | 2013-07-10 | 1 | -2/+2 |
| | |||||
* | add test case for getting group after deleting it | Robin Appelman | 2013-07-10 | 1 | -0/+16 |
| | |||||
* | more consitency in hook names | Robin Appelman | 2013-07-10 | 2 | -9/+9 |
| | |||||
* | cant use private members from closure in php <5.4 | Robin Appelman | 2013-07-10 | 1 | -3/+3 |
| | |||||
* | use new group api as backend for the old api | Robin Appelman | 2013-07-10 | 2 | -173/+160 |
| | |||||
* | update group management | Robin Appelman | 2013-07-10 | 7 | -3/+1024 |
| | |||||
* | Merge pull request #3977 from owncloud/enable_oracle_in_autotests | Thomas Müller | 2013-07-08 | 2 | -3/+2 |
|\ | | | | | enable oracle testing by default | ||||
| * | requires fixes in 3rdparty mdb2 | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -0/+0 |
| | | |||||
| * | enable oracle testing by default | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -3/+2 |
| | | |||||
* | | Merge pull request #3963 from owncloud/update-logic-split | icewind1991 | 2013-07-08 | 3 | -147/+161 |
|\ \ | | | | | | | Move the upgrade logic to \OC\Updater | ||||
| * | | fix typo | Robin Appelman | 2013-07-08 | 1 | -2/+2 |
| | | | |||||
| * | | Updater: pass update url as argument to update check | Robin Appelman | 2013-07-06 | 2 | -6/+6 |
| | | | |||||
| * | | split upgrade logic from ajax file | Robin Appelman | 2013-07-06 | 3 | -146/+160 |
| | | | |||||
* | | | Merge pull request #3979 from owncloud/permissions-hook | Jörn Friedrich Dreyer | 2013-07-08 | 1 | -0/+9 |
|\ \ \ | |_|/ |/| | | Add update permissions hook to sharing | ||||
| * | | Add update permissions hook to sharing | Michael Gapczynski | 2013-07-08 | 1 | -0/+9 |
|/ / | |||||
* | | Merge pull request #3954 from owncloud/update_insertifnotexist_and_test | Thomas Müller | 2013-07-08 | 2 | -20/+17 |
|\ \ | | | | | | | fix insertIfNotExist return value, update doc and corresponding test | ||||
| * | | update comment | Jörn Friedrich Dreyer | 2013-07-05 | 1 | -1/+1 |
| | | | |||||
| * | | fix insertIfNotExist return value, update doc and corresponding test | Jörn Friedrich Dreyer | 2013-07-05 | 2 | -19/+16 |
| | | | |||||
* | | | Merge pull request #3757 from owncloud/icon-cleanup | Jan-Christoph Borchardt | 2013-07-08 | 18 | -29/+27 |
|\ \ \ | | | | | | | | | Icon cleanup | ||||
| * | | | change delete from entry forbidden sign to proper icon | Jan-Christoph Borchardt | 2013-07-05 | 2 | -3/+10 |
| | | | | |||||
| * | | | Optimize pictures with optipng and scour | kondou | 2013-06-21 | 5 | -217/+9 |
| | | | | |||||
| * | | | use history icon in Deleted Files template as well | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
| | | | | |||||
| * | | | standardize on 32px loading spinner, decrease size in CSS where needed | Jan-Christoph Borchardt | 2013-06-17 | 3 | -0/+7 |
| | | | | |||||
| * | | | use proper style for add icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -8/+60 |
| | | | | |||||
| * | | | remove unused loading spinners, just have one | Jan-Christoph Borchardt | 2013-06-17 | 3 | -2/+2 |
| | | | | |||||
| * | | | remove unused big images | Jan-Christoph Borchardt | 2013-06-17 | 2 | -0/+0 |
| | | | | |||||
| * | | | use mail icon consistent with Mail app icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -6/+94 |
| | | | | |||||
| * | | | transparent background for lock icon | Jan-Christoph Borchardt | 2013-06-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | use consistent icon for 'restore'/versions/history, also SVG | Jan-Christoph Borchardt | 2013-06-17 | 2 | -1/+1 |
| | | | | |||||
| * | | | differentiate delete from close icon | Jan-Christoph Borchardt | 2013-06-17 | 5 | -11/+63 |
| | | | | |||||
* | | | | Merge pull request #3946 from owncloud/fixing-3942-master | Thomas Müller | 2013-07-08 | 4 | -44/+40 |
|\ \ \ \ | | | | | | | | | | | handle anonymous upload to reshared folder | ||||
| * | | | | fixing check if public share is a folder or not | Thomas Müller | 2013-07-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | removing unused getSharedItem() | Thomas Müller | 2013-07-06 | 1 | -11/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 16 | -173/+287 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php | ||||
| * | | | | | on reshares we now recursively move to the root of all reshares - therefore ↵ | Thomas Müller | 2013-07-05 | 3 | -31/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | some code has been refactured and added as a new public function | ||||
| * | | | | | fixing Notice: Undefined index: isPublic | Thomas Müller | 2013-07-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | handle anonymous upload to reshared folder | Thomas Müller | 2013-07-05 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 4 | -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 transifex | Jenkins for ownCloud | 2013-07-08 | 550 | -1138/+1184 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-07 | 544 | -1227/+1335 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-06 | 693 | -4714/+7173 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3951 from owncloud/fixing-3936-master | Thomas Müller | 2013-07-05 | 2 | -5/+23 |
|\ \ \ \ | | | | | | | | | | | get the real physical folder name for anonymous upload | ||||
| * | | | | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 2 | -5/+17 |
| | | | | | |||||
| * | | | | php 5.3 compliant now | Thomas Müller | 2013-07-05 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | get the real physical folder name for anonymous upload | Thomas Müller | 2013-07-05 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Merge pull request #3955 from owncloud/cache-scanner-test | Thomas Müller | 2013-07-05 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Scanner test: ensure mtime in the cache is the same as on the storage to... |