aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4563 from owncloud/use_personal-passwordJan-Christoph Borchardt2013-08-282-2/+2
|\
| * Use personal-password for the password name in personal.phpkondou2013-08-242-2/+2
* | Merge pull request #4489 from owncloud/clean-3rdparty-mess-masterBart Visscher2013-08-2816-2/+1506
|\ \
| * | fixing require pathThomas Müller2013-08-182-2/+2
| * | update 3rdparty submodule - timepicker removedThomas Müller2013-08-171-0/+0
| * | update 3rdparty submoduleThomas Müller2013-08-171-0/+0
| * | 3rdparty submodule update: getid3 removedThomas Müller2013-08-171-0/+0
| * | update 3rdparty - openid movedThomas Müller2013-08-171-0/+0
| * | moving Dropbox and smb4php 3rdparty code over to the appsThomas Müller2013-08-1715-2/+1506
| * | update 3rdparty submoduleThomas Müller2013-08-171-0/+0
* | | Merge pull request #3891 from owncloud/fix_loadAppScriptFileBart Visscher2013-08-281-5/+8
|\ \ \
| * | | Check if the app is enabled and the app path is found before trying to load t...Bart Visscher2013-06-281-5/+8
* | | | Merge pull request #4610 from owncloud/password-toggle-loginMorris Jobke2013-08-283-7/+4
|\ \ \ \
| * | | | fix shadow style of username input boxJan-Christoph Borchardt2013-08-281-3/+3
| * | | | remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-282-4/+1
|/ / / /
* | | | Merge pull request #4601 from owncloud/fixing-4341-masterMorris Jobke2013-08-283-27/+33
|\ \ \ \
| * | | | backport of #4357 to masterThomas Müller2013-08-273-27/+33
* | | | | Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-282-5/+6
|\ \ \ \ \
| * | | | | Cache Object.keys(this.vars)Thomas Tanghus2013-08-281-3/+4
| * | | | | Fix octemplate string escaping.Thomas Tanghus2013-08-142-5/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2888-230/+301
| |/ / / / |/| | | |
* | | | | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacementMorris Jobke2013-08-271-1/+1
|\ \ \ \ \
| * | | | | Fix "select all" checkbox displacement when checkedPellaeon Lin2013-08-261-1/+1
* | | | | | LDAP: case insensitive replace for more robustnessArthur Schiwon2013-08-271-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-27275-2289/+4008
* | | | | | Merge pull request #3208 from owncloud/api_capabilities_quotaMorris Jobke2013-08-272-6/+49
|\ \ \ \ \ \
| * | | | | | add documentationMorris Jobke2013-08-271-0/+13
| * | | | | | Code styleTom Needham2013-08-271-2/+2
| * | | | | | Add quota to core apiTom Needham2013-08-272-6/+36
* | | | | | | Merge pull request #4596 from owncloud/fix_isEmpty_trashBjörn Schießle2013-08-271-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | the trash bin can also contain empty files. Don't use the trash bin size as i...Bjoern Schiessle2013-08-271-4/+5
|/ / / / / /
* | | | | | Merge pull request #4348 from owncloud/fixing-4343-masterJörn Friedrich Dreyer2013-08-272-27/+165
|\ \ \ \ \ \
| * | | | | | lacy initialization of fileView - in case basic auth is used FileSystem is no...Thomas Müller2013-08-261-4/+16
| * | | | | | Merge branch 'master' into fixing-4343-masterThomas Müller2013-08-221613-29093/+28175
| |\ \ \ \ \ \
| * | | | | | | adding unit tests for quota checksThomas Müller2013-08-082-33/+98
| * | | | | | | adding unit tests to determine lengthThomas Müller2013-08-082-1/+48
| * | | | | | | fixes #4343Thomas Müller2013-08-081-2/+16
* | | | | | | | Merge pull request #4507 from owncloud/existingusersfromgroupblizzz2013-08-272-19/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | consolidate validity check for users in group classArthur Schiwon2013-08-262-28/+29
| * | | | | | | | no assoc index here, makes tests pass againArthur Schiwon2013-08-191-1/+1
| * | | | | | | | return only existing users in groupArthur Schiwon2013-08-191-3/+12
* | | | | | | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-2721-3253/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revert debugging code which accidentially entered this pull requestThomas Müller2013-08-271-4/+0
| * | | | | | | | | kill zh_CN.GB2312Thomas Müller2013-08-2722-3253/+4
* | | | | | | | | | Merge pull request #4585 from owncloud/fixing-4385-masterMorris Jobke2013-08-275-10/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | storage information is path specificThomas Müller2013-08-274-5/+8
| * | | | | | | | | | webdav quota now displays the same values as the web interface doesThomas Müller2013-08-272-6/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4584 from owncloud/fixing-4575-masterMorris Jobke2013-08-271-12/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | adding translations to update eventsThomas Müller2013-08-271-12/+13
|/ / / / / / / / /
* | | | | | | | | Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core in...Morris Jobke2013-08-261-3/+20
|\ \ \ \ \ \ \ \ \