| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 #7131 from owncloud/issue/6269 | Thomas Müller | 2014-02-10 | 2 | -7/+7 |
|\ |
|
| * | Change MySQL to MySQL/MariaDB in the frontend | Joas Schilling | 2014-02-07 | 2 | -7/+7 |
* | | Merge pull request #7066 from owncloud/check_svg_installed | Thomas Müller | 2014-02-10 | 4 | -4/+4 |
|\ \ |
|
| * | | properly check if pdf and svg modules are installed | Georg Ehrke | 2014-02-04 | 4 | -4/+4 |
* | | | Merge pull request #7071 from jcfischer/master | Thomas Müller | 2014-02-10 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | close statement in MimeType detection is executed [#7069] | Jens-Christian Fischer | 2014-02-04 | 1 | -1/+2 |
| |/ / |
|
* | | | Merge pull request #7133 from owncloud/fix-implied-eval | Thomas Müller | 2014-02-10 | 3 | -9/+7 |
|\ \ \ |
|
| * | | | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 3 | -9/+7 |
| | |/
| |/| |
|
* | | | Merge pull request #6247 from owncloud/memcached-multiple-servers | Andreas Fischer | 2014-02-08 | 2 | -4/+18 |
|\ \ \ |
|
| * | | | Readd support for memcached_server config variable. | Andreas Fischer | 2014-01-10 | 1 | -1/+9 |
| * | | | Add support for multiple memcached servers. | Andreas Fischer | 2014-01-10 | 2 | -4/+10 |
* | | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
| |/ /
|/| | |
|
* | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files | Vincent Petry | 2014-02-07 | 3 | -4/+22 |
|\ \ \ |
|
| * | | | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 3 | -4/+22 |
* | | | | Merge pull request #6997 from owncloud/fix_l10n_warnings | Thomas Müller | 2014-02-07 | 1 | -2/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | change order of issubdirectory() calls to avoid error messages for non-apps | Bjoern Schiessle | 2014-01-29 | 1 | -2/+2 |
* | | | | Update README.md | Thomas Müller | 2014-02-07 | 1 | -0/+1 |
* | | | | Update README.md | Thomas Müller | 2014-02-07 | 1 | -1/+2 |
* | | | | Merge pull request #6952 from MartialGeek/add_freebox_support | Vincent Petry | 2014-02-06 | 3 | -1/+21 |
|\ \ \ \ |
|
| * | | | | The regexp of the Freebox user agent is now more strict. | Martial Saunois | 2014-01-29 | 2 | -1/+6 |
| * | | | | Unit tests added for the new Freebox user agent. | Martial Saunois | 2014-01-28 | 1 | -0/+10 |
| * | | | | New user agent added for the Freebox. | Martial Saunois | 2014-01-26 | 2 | -1/+6 |
* | | | | | Merge pull request #6445 from owncloud/fix_5956 | Vincent Petry | 2014-02-06 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | encode imagePath and fix documentation of loadFromFile | Georg Ehrke | 2014-01-11 | 1 | -2/+2 |
| * | | | | | fix issue with logging non utf8 chars | Georg Ehrke | 2013-12-16 | 1 | -1/+1 |
* | | | | | | Merge pull request #7099 from owncloud/fix-autoconfig-master | Thomas Müller | 2014-02-06 | 1 | -4/+5 |
|\ \ \ \ \ \ |
|
| * | | | | | | fixing autoconfig handling | Thomas Müller | 2014-02-05 | 1 | -4/+5 |
* | | | | | | | 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 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | Merge pull request #7105 from NCTU-NBA/pr-7098 | Morris Jobke | 2014-02-06 | 1 | -9/+5 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | 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 #7091 from owncloud/jenkins-catchsetuperrors | Thomas Müller | 2014-02-05 | 1 | -2/+6 |
|\ \ \ \ \ \ |
|
| * | | | | | | Catch setup errors during autotest | Vincent Petry | 2014-02-05 | 1 | -2/+6 |
| |/ / / / / |
|
* | | | | | | Merge pull request #6490 from owncloud/theming-for-appstemplate | Jan-Christoph Borchardt | 2014-02-05 | 1 | -0/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | use appstoreenabled config switch | Bjoern Schiessle | 2014-01-16 | 1 | -2/+2 |
| * | | | | | | do not show 'Add app' and 'More apps' for themed ownCloud | Jan-Christoph Borchardt | 2013-12-18 | 1 | -0/+4 |
* | | | | | | | 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 |