Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8233 from owncloud/fix-newdialog-ie | Thomas Müller | 2014-04-23 | 1 | -1/+1 |
|\ | | | | | fix shift of icons in 'New' menu in IE8/9, fix #7987 | ||||
| * | fix shift of icons in 'New' menu in IE8/9, fix #7987 | Jan-Christoph Borchardt | 2014-04-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8284 from owncloud/fix_8280 | Thomas Müller | 2014-04-23 | 1 | -1/+2 |
|\ \ | | | | | | | Adjust renaming of directories with a dot in name | ||||
| * | | Adjust renaming of directories, fixes #8280 | Robin McCorkell | 2014-04-23 | 1 | -1/+2 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | Directories will not be considered to have an extension, even if a dot is found. Stop Scrutinizer being annoyed But the spaced version looked good! Stop jsHint being annoyed These code quality tools are really pestering | ||||
* | | Merge pull request #8324 from owncloud/expired-link-error | icewind1991 | 2014-04-23 | 1 | -0/+3 |
|\ \ | | | | | | | Fix error when viewing expired link | ||||
| * | | Fix error when viewing expired link | Robin Appelman | 2014-04-23 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #8009 from owncloud/feature/add-sharing-target | Joas Schilling | 2014-04-23 | 2 | -14/+56 |
|\ \ \ | | | | | | | | | Add option to getUsersSharingFile() to get the paths for the shared users | ||||
| * | | | Do not query when the list is empty | Joas Schilling | 2014-04-09 | 1 | -14/+16 |
| | | | | |||||
| * | | | Add option to getUsersSharingFile() to get the paths for the shared users | Joas Schilling | 2014-04-09 | 2 | -14/+54 |
| | | | | |||||
* | | | | Merge pull request #7617 from nishiki/cache_user | Thomas Müller | 2014-04-23 | 1 | -43/+60 |
|\ \ \ \ | |_|/ / |/| | | | Cache user | ||||
| * | | | remove cache all user | adrien | 2014-03-21 | 1 | -70/+22 |
| | | | | |||||
| * | | | fix remove cache when delete | adrien | 2014-03-11 | 1 | -6/+3 |
| | | | | |||||
| * | | | remove static variable, add limit and offset | adrien | 2014-03-11 | 1 | -29/+51 |
| | | | | |||||
| * | | | fix cache when remove an user | adrien | 2014-03-10 | 1 | -1/+8 |
| | | | | |||||
| * | | | fix undifined uid | nishiki | 2014-03-09 | 1 | -1/+2 |
| | | | | |||||
| * | | | add query result (boolean) for update or delete | nishiki | 2014-03-09 | 1 | -9/+6 |
| | | | | |||||
| * | | | minor clean code | nishiki | 2014-03-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix undefined in loadUsers | adrien | 2014-03-07 | 1 | -8/+10 |
| | | | | |||||
| * | | | update the cache when add user | adrien | 2014-03-06 | 1 | -13/+16 |
| | | | | |||||
| * | | | upgrade the cache user | adrien | 2014-03-06 | 1 | -14/+38 |
| | | | | |||||
| * | | | add cache for single users | adrien | 2014-03-06 | 1 | -33/+45 |
| | | | | |||||
* | | | | Merge pull request #8164 from owncloud/fix-6651 | blizzz | 2014-04-23 | 3 | -79/+122 |
|\ \ \ \ | | | | | | | | | | | LDAP: fix random resets of filter | ||||
| * | | | | fixing some JSHint warnings | Thomas Müller | 2014-04-23 | 2 | -17/+18 |
| | | | | | |||||
| * | | | | Give hint when composing filter failed | Arthur Schiwon | 2014-04-11 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | fix comparison in determineMode, fixes problems with restoring the filter ↵ | Arthur Schiwon | 2014-04-11 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | mode (assisted or manually) on page refresh | ||||
| * | | | | Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651 | Arthur Schiwon | 2014-04-11 | 3 | -74/+112 |
| |\ \ \ \ | |||||
| | * | | | | Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. | ben-denham | 2014-03-14 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Moved LdapFilter into a separate js file in user_ldap. | ben-denham | 2014-03-07 | 3 | -102/+96 |
| | | | | | | |||||
| | * | | | | Added improved version of patch by @blizzz in ↵ | ben-denham | 2014-03-07 | 1 | -74/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. | ||||
* | | | | | | Merge pull request #8213 from cbojar/master | Thomas Müller | 2014-04-23 | 1 | -25/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean up js.js along suggestions from scrutinizer-ci, fixes #8204. | ||||
| * | | | | | | Clean up js.js along suggestions from scrutinizer-ci, fixes #8204. | cbojar | 2014-04-16 | 1 | -26/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also used JSHint.com to find a few other issues. -Strict comparisons (===) -Fixed regex escaping errors -Refactored OC.buildQueryString to use jQuery.map -Missing semicolons -Braces around if block Left some of the mixed spaces/tabs as they are for alignment in comments. | ||||
* | | | | | | | Merge pull request #8068 from wakeup/fix-share.php-string-extraction | Thomas Müller | 2014-04-23 | 1 | -63/+89 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make lib/** share.php strings extractable for translation | ||||
| * | | | | | | | Make lib/** share.php strings extractable for translation | Volkan Gezer | 2014-04-22 | 1 | -63/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were not ready for translation as they had no placeholders and/nor wrapper function to be translated This should fix: #8011 | ||||
* | | | | | | | | Merge pull request #8315 from owncloud/fix-8294 | Thomas Müller | 2014-04-23 | 2 | -0/+10321 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add uncompressed jquery files - fixes #8294 | ||||
| * | | | | | | | | add uncompressed jquery files - fixes #8294 | Volkan Gezer | 2014-04-23 | 2 | -0/+10321 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore | Thomas Müller | 2014-04-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add new jquery files to exclude list | ||||
| * | | | | | | | | | Add new jquery files to exclude list | Volkan Gezer | 2014-04-23 | 1 | -0/+2 |
| |/ / / / / / / / | |||||
* / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-23 | 516 | -5695/+12295 |
|/ / / / / / / / | |||||
* | | | | | | | | add additional comments, PHPdoc and check whether it's really applicable | Arthur Schiwon | 2014-04-22 | 1 | -3/+12 |
| | | | | | | | | |||||
* | | | | | | | | LDAP: cache display names immediately on retrieval, saves tens of unecessary ↵ | Arthur Schiwon | 2014-04-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queries to LDAP server in the share dialog for example | ||||
* | | | | | | | | Merge pull request #8297 from owncloud/fix-text-master | Volkan Gezer | 2014-04-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix spelling 'Allow user ...' -> 'Allow users ...' | ||||
| * | | | | | | | | fix spelling 'Allow user ...' -> 'Allow users ...' | Thomas Müller | 2014-04-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #8263 from LEDfan/add-key-to-contacts | Thomas Müller | 2014-04-22 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add key to every contact | ||||
| * | | | | | | | | | Change key to addressbook-key | Tobia De Koninck | 2014-04-22 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add key to every contact | LEDfan | 2014-04-18 | 1 | -1/+6 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #8255 from owncloud/fix-public-download-button | Raghu Nayyar | 2014-04-22 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | keep long file names in one line to not overflow download button on mobile | ||||
| * | | | | | | | | | | keep long file names in one line to not overflow download button on mobile | Jan-Christoph Borchardt | 2014-04-17 | 1 | -0/+13 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #8286 from owncloud/use-proper-jsdoc | Thomas Müller | 2014-04-22 | 4 | -148/+296 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use proper JSDoc documentation instead of inconsistent documentation styles | ||||
| * | | | | | | | | | | | Fix typo | Lukas Reschke | 2014-04-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to => too | ||||
| * | | | | | | | | | | | fixing typos | Thomas Müller | 2014-04-22 | 1 | -25/+24 |
| | | | | | | | | | | | |