summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into webdav-injectionRobin Appelman2014-04-15304-3404/+6150
|\
| * Merge pull request #7780 from owncloud/share-file-existsBjörn Schießle2014-04-151-0/+23
| |\
| | * add tests for sharing files the users doesn't have access toRobin Appelman2014-04-031-0/+23
| * | Merge pull request #8059 from owncloud/countUsersInGroupLukas Reschke2014-04-143-1/+208
| |\ \
| | * | add tests for LDAPArthur Schiwon2014-04-081-0/+115
| | * | fix return value when a search string was passed to return integer instead of...Arthur Schiwon2014-04-081-1/+2
| | * | implement countUsersInGroup in LDAP group backendArthur Schiwon2014-04-082-1/+92
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-143-0/+13
| * | | Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-131-0/+6
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1311-0/+15
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1245-63/+18
| * | | Merge pull request #7807 from sarciszewski/patch-1Lukas Reschke2014-04-111-2/+2
| |\ \ \
| | * | | Update crypt.phpScott Arciszewski2014-03-241-2/+2
| | * | | Update crypt.phpScott Arciszewski2014-03-191-2/+2
| * | | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr...Björn Schießle2014-04-111-3/+3
| |\ \ \ \
| | * | | | Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-051-3/+3
| * | | | | Typo fix.Volkan Gezer2014-04-111-1/+1
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1110-6/+32
| * | | | | Merge pull request #8076 from owncloud/enable-dav-browserLukas Reschke2014-04-101-0/+1
| |\ \ \ \ \
| | * | | | | Re-enable the sabredav browser pluginRobin Appelman2014-04-061-0/+1
| | |/ / / /
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1014-0/+49
| * | | | | Merge pull request #8049 from owncloud/filepickersvgMorris Jobke2014-04-093-23/+10
| |\ \ \ \ \
| | * | | | | Moved code to replace svg with png to OC.UtilVincent Petry2014-04-043-23/+10
| * | | | | | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_jsVincent Petry2014-04-091-5/+0
| |\ \ \ \ \ \
| | * | | | | | remove obsolete codeJörn Friedrich Dreyer2014-04-091-5/+0
| * | | | | | | Merge pull request #7837 from owncloud/fix_7530blizzz2014-04-092-7/+237
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | add comment to clearify when a skip in the foreach happensArthur Schiwon2014-04-091-0/+1
| | * | | | | | define varArthur Schiwon2014-03-211-0/+1
| | * | | | | | make tests work on systems without php5_ldapArthur Schiwon2014-03-211-0/+12
| | * | | | | | add tests for cumulativeSearchOnAttributeArthur Schiwon2014-03-211-0/+198
| | * | | | | | fix potential infinite loop when the DN of the first entry was already read.Arthur Schiwon2014-03-201-1/+1
| | * | | | | | Use the LDAP wrapper for checking resources, needs for proper testingArthur Schiwon2014-03-201-1/+1
| | * | | | | | Fix wildcard handling and check even less DNs per filter, enough will be look...Arthur Schiwon2014-03-201-4/+7
| | * | | | | | LDAP Wizard: when determining objectclasses, we realy do not need to look at ...Arthur Schiwon2014-03-201-4/+19
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0958-126/+73
| * | | | | | | Disable sharing in trashbin appVincent Petry2014-04-081-0/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #8032 from owncloud/fs-backend-registrationThomas Müller2014-04-0810-166/+462
| |\ \ \ \ \ \
| | * | | | | | unit tests for dynamic backend registrationThomas Müller2014-04-072-14/+141
| | * | | | | | remove duplicate method checkDependencies()Thomas Müller2014-04-031-12/+0
| | * | | | | | use command -v to detect if smbclient existsThomas Müller2014-04-031-1/+1
| | * | | | | | Merge branch 'master' into fs-backend-registrationThomas Müller2014-04-032-144/+152
| | |\ \ \ \ \ \
| | * | | | | | | Update backends and their configurationsThomas Müller2014-04-031-19/+72
| | * | | | | | | Moved dependency checks to end of class filesPhilipp Kapfer2014-04-039-248/+296
| | * | | | | | | Added cURL dependency for Amazon S3, Dropbox and SWIFTPhilipp Kapfer2014-04-034-3/+42
| | * | | | | | | Changed dependency check messages from warnings to notesPhilipp Kapfer2014-04-035-8/+41
| | * | | | | | | Added cURL dependency check to Google Drive and WebDAV backendPhilipp Kapfer2014-04-034-4/+33
| | * | | | | | | Modified app to dynamically register backends instead of hard-coding themPhilipp Kapfer2014-04-034-158/+129
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-089-3/+51
| * | | | | | | | Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_jsThomas Müller2014-04-071-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix copy conflict dialog translationJörn Friedrich Dreyer2014-04-071-2/+2