summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6297 from leo-b/fix_ldap_errorsblizzz2014-04-233-5/+10
|\
| * "reset" ldap pagedSearch control by setting it to a high valueAlexander Bergolth2014-03-061-1/+1
| * "reset" ldap pagedSearch control by setting it to a high valueroot2014-03-061-1/+1
| * only check ldap_errno if an ldap_* function actually failsroot2014-03-063-6/+11
* | Merge pull request #8233 from owncloud/fix-newdialog-ieThomas Müller2014-04-231-1/+1
|\ \
| * | fix shift of icons in 'New' menu in IE8/9, fix #7987Jan-Christoph Borchardt2014-04-161-1/+1
* | | Merge pull request #8284 from owncloud/fix_8280Thomas Müller2014-04-231-1/+2
|\ \ \
| * | | Adjust renaming of directories, fixes #8280Robin McCorkell2014-04-231-1/+2
|/ / /
* | | Merge pull request #8324 from owncloud/expired-link-erroricewind19912014-04-231-0/+3
|\ \ \
| * | | Fix error when viewing expired linkRobin Appelman2014-04-231-0/+3
* | | | Merge pull request #8009 from owncloud/feature/add-sharing-targetJoas Schilling2014-04-232-14/+56
|\ \ \ \
| * | | | Do not query when the list is emptyJoas Schilling2014-04-091-14/+16
| * | | | Add option to getUsersSharingFile() to get the paths for the shared usersJoas Schilling2014-04-092-14/+54
* | | | | Merge pull request #7617 from nishiki/cache_userThomas Müller2014-04-231-43/+60
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove cache all useradrien2014-03-211-70/+22
| * | | | fix remove cache when deleteadrien2014-03-111-6/+3
| * | | | remove static variable, add limit and offsetadrien2014-03-111-29/+51
| * | | | fix cache when remove an useradrien2014-03-101-1/+8
| * | | | fix undifined uidnishiki2014-03-091-1/+2
| * | | | add query result (boolean) for update or deletenishiki2014-03-091-9/+6
| * | | | minor clean codenishiki2014-03-091-1/+1
| * | | | fix undefined in loadUsersadrien2014-03-071-8/+10
| * | | | update the cache when add useradrien2014-03-061-13/+16
| * | | | upgrade the cache useradrien2014-03-061-14/+38
| * | | | add cache for single usersadrien2014-03-061-33/+45
* | | | | Merge pull request #8164 from owncloud/fix-6651blizzz2014-04-233-79/+122
|\ \ \ \ \
| * | | | | fixing some JSHint warningsThomas Müller2014-04-232-17/+18
| * | | | | Give hint when composing filter failedArthur Schiwon2014-04-111-1/+2
| * | | | | fix comparison in determineMode, fixes problems with restoring the filter mod...Arthur Schiwon2014-04-111-1/+4
| * | | | | Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651Arthur Schiwon2014-04-113-74/+112
| |\ \ \ \ \
| | * | | | | Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation.ben-denham2014-03-141-3/+3
| | * | | | | Moved LdapFilter into a separate js file in user_ldap.ben-denham2014-03-073-102/+96
| | * | | | | Added improved version of patch by @blizzz in https://github.com/owncloud/cor...ben-denham2014-03-071-74/+118
* | | | | | | Merge pull request #8213 from cbojar/masterThomas Müller2014-04-231-25/+19
|\ \ \ \ \ \ \
| * | | | | | | Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.cbojar2014-04-161-26/+20
* | | | | | | | Merge pull request #8068 from wakeup/fix-share.php-string-extractionThomas Müller2014-04-231-63/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | Make lib/** share.php strings extractable for translationVolkan Gezer2014-04-221-63/+89
* | | | | | | | | Merge pull request #8315 from owncloud/fix-8294Thomas Müller2014-04-232-0/+10321
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add uncompressed jquery files - fixes #8294Volkan Gezer2014-04-232-0/+10321
* | | | | | | | | | Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignoreThomas Müller2014-04-231-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add new jquery files to exclude listVolkan Gezer2014-04-231-0/+2
| |/ / / / / / / / /
* / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-04-23516-5695/+12295
|/ / / / / / / / /
* | | | | | | | | add additional comments, PHPdoc and check whether it's really applicableArthur Schiwon2014-04-221-3/+12
* | | | | | | | | LDAP: cache display names immediately on retrieval, saves tens of unecessary ...Arthur Schiwon2014-04-221-0/+6
* | | | | | | | | Merge pull request #8297 from owncloud/fix-text-masterVolkan Gezer2014-04-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix spelling 'Allow user ...' -> 'Allow users ...'Thomas Müller2014-04-221-1/+1
* | | | | | | | | | Merge pull request #8263 from LEDfan/add-key-to-contactsThomas Müller2014-04-221-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change key to addressbook-keyTobia De Koninck2014-04-221-1/+1
| * | | | | | | | | | Add key to every contactLEDfan2014-04-181-1/+6
* | | | | | | | | | | Merge pull request #8255 from owncloud/fix-public-download-buttonRaghu Nayyar2014-04-221-0/+13
|\ \ \ \ \ \ \ \ \ \ \