Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 304 | -3404/+6150 |
|\ | |||||
| * | 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 |
| | * | | | | | | make tests work on systems without php5_ldap | Arthur Schiwon | 2014-03-21 | 1 | -0/+12 |
| | * | | | | | | add tests for cumulativeSearchOnAttribute | Arthur Schiwon | 2014-03-21 | 1 | -0/+198 |
| | * | | | | | | fix potential infinite loop when the DN of the first entry was already read. | Arthur Schiwon | 2014-03-20 | 1 | -1/+1 |
| | * | | | | | | Use the LDAP wrapper for checking resources, needs for proper testing | Arthur Schiwon | 2014-03-20 | 1 | -1/+1 |
| | * | | | | | | Fix wildcard handling and check even less DNs per filter, enough will be look... | Arthur Schiwon | 2014-03-20 | 1 | -4/+7 |
| | * | | | | | | LDAP Wizard: when determining objectclasses, we realy do not need to look at ... | Arthur Schiwon | 2014-03-20 | 1 | -4/+19 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-09 | 58 | -126/+73 |
| * | | | | | | | Disable sharing in trashbin app | Vincent Petry | 2014-04-08 | 1 | -0/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge pull request #8032 from owncloud/fs-backend-registration | Thomas Müller | 2014-04-08 | 10 | -166/+462 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | unit tests for dynamic backend registration | Thomas Müller | 2014-04-07 | 2 | -14/+141 |
| | * | | | | | | remove duplicate method checkDependencies() | Thomas Müller | 2014-04-03 | 1 | -12/+0 |
| | * | | | | | | use command -v to detect if smbclient exists | Thomas Müller | 2014-04-03 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'master' into fs-backend-registration | Thomas Müller | 2014-04-03 | 2 | -144/+152 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Update backends and their configurations | Thomas Müller | 2014-04-03 | 1 | -19/+72 |
| | * | | | | | | | Moved dependency checks to end of class files | Philipp Kapfer | 2014-04-03 | 9 | -248/+296 |
| | * | | | | | | | Added cURL dependency for Amazon S3, Dropbox and SWIFT | Philipp Kapfer | 2014-04-03 | 4 | -3/+42 |
| | * | | | | | | | Changed dependency check messages from warnings to notes | Philipp Kapfer | 2014-04-03 | 5 | -8/+41 |
| | * | | | | | | | Added cURL dependency check to Google Drive and WebDAV backend | Philipp Kapfer | 2014-04-03 | 4 | -4/+33 |
| | * | | | | | | | Modified app to dynamically register backends instead of hard-coding them | Philipp Kapfer | 2014-04-03 | 4 | -158/+129 |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-08 | 9 | -3/+51 |
| * | | | | | | | | Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js | Thomas Müller | 2014-04-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix copy conflict dialog translation | Jörn Friedrich Dreyer | 2014-04-07 | 1 | -2/+2 |