| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 1 | -22/+0 |
* | Merge pull request #7085 from owncloud/quick-fix-7019-master | Thomas Müller | 2014-02-11 | 1 | -0/+1 |
|\ |
|
| * | Load authentication apps to get users from all backends - fixes #7019 | Thomas Müller | 2014-02-05 | 1 | -0/+1 |
* | | LDAP: improve debug message | Arthur Schiwon | 2014-02-10 | 1 | -1/+2 |
* | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image | Arthur Schiwon | 2014-02-10 | 1 | -6/+24 |
* | | Merge pull request #7134 from owncloud/issue/5794 | Morris Jobke | 2014-02-10 | 1 | -2/+2 |
|\ \ |
|
| * | | Make google drive client secret and dropbox api secret a password field | Joas Schilling | 2014-02-07 | 1 | -2/+2 |
* | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryption | Morris Jobke | 2014-02-10 | 1 | -1/+8 |
|\ \ \ |
|
| * | | | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
* | | | | LDAP: add documentation info in info.xml | Arthur Schiwon | 2014-02-10 | 1 | -0/+3 |
* | | | | Merge pull request #7126 from nickvergessen/issue/6683 | Vincent Petry | 2014-02-10 | 2 | -4/+6 |
|\ \ \ \ |
|
| * | | | | Only add files to file list when uploading to current directory | Joas Schilling | 2014-02-07 | 2 | -4/+6 |
* | | | | | Rephrase and clarify log message | Arthur Schiwon | 2014-02-10 | 1 | -1/+1 |
* | | | | | Wizard: enable base DN for editing, if not base DN could have been detected. ... | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
* | | | | | Wizard: disable LDAP referrals, fixes #6670 | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
* | | | | | throw an info message, when base dn test failed | Arthur Schiwon | 2014-02-10 | 1 | -0/+4 |
* | | | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance i... | Arthur Schiwon | 2014-02-10 | 2 | -4/+6 |
* | | | | | Merge pull request #7133 from owncloud/fix-implied-eval | Thomas Müller | 2014-02-10 | 2 | -7/+5 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 2 | -7/+5 |
| | |/ /
| |/| | |
|
* / | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
|/ / / |
|
* / / | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 2 | -3/+21 |
|/ / |
|
* | | Merge pull request #7089 from owncloud/sharing-searchbymime | Vincent Petry | 2014-02-06 | 2 | -9/+164 |
|\ \ |
|
| * | | Fixed searchByMime in shared cache | Vincent Petry | 2014-02-05 | 2 | -9/+164 |
* | | | Remove unused template variable assignment of files_sharing/template/public.php | Pellaeon Lin | 2014-02-06 | 1 | -5/+0 |
* | | | Move template variable assignment to correct place | Pellaeon Lin | 2014-02-06 | 1 | -4/+5 |
* | | | Merge pull request #7064 from owncloud/files-scrolltopafterupdate | Jan-Christoph Borchardt | 2014-02-05 | 1 | -4/+5 |
|\ \ \ |
|
| * | | | Scroll to the top after switching dir | Vincent Petry | 2014-02-04 | 1 | -5/+6 |
| |/ / |
|
* | | | Merge pull request #7032 from owncloud/enc_fix_delete | Björn Schießle | 2014-02-05 | 9 | -119/+430 |
|\ \ \
| |_|/
|/| | |
|
| * | | add function to extract filename from sharekey name + tests | Bjoern Schiessle | 2014-02-03 | 2 | -1/+37 |
| * | | added tests for the delete hooks if the trash bin is disabled | Bjoern Schiessle | 2014-02-01 | 3 | -65/+300 |
| * | | don't expect OC_FilesystemView, this is depreciated | Bjoern Schiessle | 2014-01-31 | 1 | -1/+1 |
| * | | better error detection and don't use glob() | Bjoern Schiessle | 2014-01-31 | 1 | -12/+27 |
| * | | move unlink proxy to a hook which handles pre and post conditions | Bjoern Schiessle | 2014-01-31 | 3 | -41/+66 |
* | | | Merge pull request #7011 from owncloud/jshint | Thomas Müller | 2014-02-04 | 10 | -22/+124 |
|\ \ \ |
|
| * | | | Fixed file name validation unit test + added newline | Vincent Petry | 2014-01-30 | 2 | -7/+16 |
| * | | | Added .jshintrc | Vincent Petry | 2014-01-30 | 10 | -15/+108 |
* | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg | Jan-Christoph Borchardt | 2014-02-04 | 6 | -6/+29 |
|\ \ \ \ |
|
| * | | | | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 192 | -5750/+12562 |
| |\| | | |
|
| * | | | | Use $storageInfo['free'] | Pellaeon Lin | 2014-01-29 | 2 | -3/+2 |
| * | | | | Fix variable name | Pellaeon Lin | 2014-01-24 | 1 | -2/+2 |
| * | | | | Add $freeSpace and $uploadLimit to files_sharing | Pellaeon Lin | 2014-01-17 | 2 | -0/+6 |
| * | | | | Comments to clarify | Pellaeon Lin | 2014-01-16 | 1 | -2/+2 |
| * | | | | Use t() 's native method | Pellaeon Lin | 2014-01-16 | 1 | -2/+8 |
| * | | | | Fix namespace | Pellaeon Lin | 2014-01-15 | 1 | -1/+1 |
| * | | | | Contextual upload error message | Pellaeon Lin | 2013-12-11 | 1 | -2/+2 |
| * | | | | #max_upload is needed after all | Pellaeon Lin | 2013-12-11 | 1 | -1/+1 |
| * | | | | Update #free_space on getstoragestats AJAX call | Pellaeon Lin | 2013-12-11 | 2 | -0/+3 |
| * | | | | Display different messages for uploadLimit and freeSpace | Pellaeon Lin | 2013-12-08 | 3 | -4/+15 |
| * | | | | Change misleading message when file size exceeds upload limit | Pellaeon Lin | 2013-12-08 | 1 | -2/+2 |
* | | | | | Merge pull request #6647 from owncloud/memcache-public | icewind1991 | 2014-02-04 | 1 | -1/+1 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|