Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7815 from owncloud/ldap_fix_usercount_master | blizzz | 2014-04-16 | 1 | -15/+40 |
|\ | |||||
| * | replace hardcoded limit of 400 with user controlled ldapPagingSize value | Arthur Schiwon | 2014-04-09 | 1 | -2/+1 |
| * | Put inner loop into own method, let's see whether it makes scrutinizer happier | Arthur Schiwon | 2014-04-09 | 1 | -9/+18 |
| * | var count is assigned in the inner loop so it must be checked inside there to... | Arthur Schiwon | 2014-04-09 | 1 | -1/+5 |
| * | initialize variable | Arthur Schiwon | 2014-04-09 | 1 | -0/+1 |
| * | LDAP: fix user report i.e. count for LDAP servers with really many users | Arthur Schiwon | 2014-04-09 | 1 | -13/+25 |
| * | LDAP: make sure cache key for paged result cookie matches when limit or offse... | Arthur Schiwon | 2014-04-09 | 1 | -2/+2 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-16 | 50 | -96/+106 |
* | | Merge pull request #8104 from owncloud/lukepolo-master | Thomas Müller | 2014-04-15 | 5 | -75/+134 |
|\ \ | |||||
| * | | add link to further discussion about that folder check | Thomas Müller | 2014-04-15 | 1 | -0/+1 |
| * | | drop folder support on public shared folders | Thomas Müller | 2014-04-11 | 1 | -1/+7 |
| * | | fix single file upload in firefox | Thomas Müller | 2014-04-10 | 1 | -1/+5 |
| * | | In cases folder drag and drop is not supported a proper message is displayed | Thomas Müller | 2014-04-09 | 1 | -5/+12 |
| * | | use FileList.findFileEl | Thomas Müller | 2014-04-09 | 1 | -1/+2 |
| * | | Merge branch 'master' into lukepolo-master | Thomas Müller | 2014-04-09 | 79 | -329/+833 |
| |\ \ | |||||
| * | | | js style fixes according to our jshintrc rules | Thomas Müller | 2014-04-07 | 1 | -58/+56 |
| * | | | fix folder upload in js | Thomas Müller | 2014-04-07 | 1 | -16/+21 |
| * | | | adding parentId to file info array | Thomas Müller | 2014-04-07 | 1 | -1/+2 |
| * | | | remove unused exit() | Thomas Müller | 2014-04-07 | 1 | -1/+0 |
| * | | | Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master | Thomas Müller | 2014-04-07 | 3 | -13/+50 |
| |\ \ \ | |||||
| | * | | | Fixed issue with drag and drop not in the root directory, for folders and files | Luke Policinski | 2014-02-20 | 1 | -6/+7 |
| | * | | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 2 | -8/+8 |
| | * | | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 3 | -13/+48 |
* | | | | | Merge pull request #7780 from owncloud/share-file-exists | Björn Schießle | 2014-04-15 | 1 | -0/+23 |
|\ \ \ \ \ | |||||
| * | | | | | add tests for sharing files the users doesn't have access to | Robin Appelman | 2014-04-03 | 1 | -0/+23 |
* | | | | | | Merge pull request #8059 from owncloud/countUsersInGroup | Lukas Reschke | 2014-04-14 | 3 | -1/+208 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add tests for LDAP | Arthur Schiwon | 2014-04-08 | 1 | -0/+115 |
| * | | | | | | fix return value when a search string was passed to return integer instead of... | Arthur Schiwon | 2014-04-08 | 1 | -1/+2 |
| * | | | | | | implement countUsersInGroup in LDAP group backend | Arthur Schiwon | 2014-04-08 | 2 | -1/+92 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-14 | 3 | -0/+13 |
* | | | | | | | Check whether the user has permissions to add personal storage backends | Lukas Reschke | 2014-04-13 | 1 | -0/+6 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-13 | 11 | -0/+15 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-12 | 45 | -63/+18 |
* | | | | | | | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 |
| * | | | | | | | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr... | Björn Schießle | 2014-04-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix some localization issues with file encryption/decription strings | Volkan Gezer | 2014-04-05 | 1 | -3/+3 |
* | | | | | | | | | Typo fix. | Volkan Gezer | 2014-04-11 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-11 | 10 | -6/+32 |
* | | | | | | | | | Merge pull request #8076 from owncloud/enable-dav-browser | Lukas Reschke | 2014-04-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Re-enable the sabredav browser plugin | Robin Appelman | 2014-04-06 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-10 | 14 | -0/+49 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #8049 from owncloud/filepickersvg | Morris Jobke | 2014-04-09 | 3 | -23/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Moved code to replace svg with png to OC.Util | Vincent Petry | 2014-04-04 | 3 | -23/+10 |
* | | | | | | | | | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js | Vincent Petry | 2014-04-09 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove obsolete code | Jörn Friedrich Dreyer | 2014-04-09 | 1 | -5/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #7837 from owncloud/fix_7530 | blizzz | 2014-04-09 | 2 | -7/+237 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | add comment to clearify when a skip in the foreach happens | Arthur Schiwon | 2014-04-09 | 1 | -0/+1 |
| * | | | | | | | | define var | Arthur Schiwon | 2014-03-21 | 1 | -0/+1 |