summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-29368-5791/+6409
|\
| * Merge pull request #4552 from dampfklon/fix4552Morris Jobke2013-08-281-1/+5
| |\
| | * Make group suffix in share dialog translatabledampfklon2013-08-221-1/+5
| * | Merge pull request #4631 from owncloud/hotfix_4630Morris Jobke2013-08-281-1/+9
| |\ \
| | * | no duplicate declaration of appLicense + camelCaseThomas Müller2013-08-281-5/+4
| | * | Work around #4630 to fix license showingkondou2013-08-281-1/+10
| * | | Merge pull request #3926 from owncloud/improve_filesummaryThomas Müller2013-08-284-40/+127
| |\ \ \
| | * | | Reimplement filesummary in JSkondou2013-08-284-40/+127
| * | | | Merge pull request #4614 from owncloud/trashbin_also_show_empty_foldersThomas Müller2013-08-281-5/+0
| |\ \ \ \
| | * | | | also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
| * | | | | Merge pull request #4615 from owncloud/npm-modulesThomas Müller2013-08-281-0/+3
| |\ \ \ \ \
| | * | | | | Adds Node Modules to build in gitignore for easy testing.raghunayyar2013-08-281-0/+3
| | |/ / / /
| * | | | | Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-282-0/+65
| |\ \ \ \ \
| | * | | | | fixing typoThomas Müller2013-08-281-1/+1
| | * | | | | calculate fontsize and line-heightMorris Jobke2013-08-281-2/+7
| | * | | | | update 3rdparty - md5Morris Jobke2013-08-281-0/+0
| | * | | | | fix 3rdparty commitMorris Jobke2013-08-281-0/+0
| | * | | | | reviewers commentsMorris Jobke2013-08-281-6/+14
| | * | | | | add visualizeMorris Jobke2013-08-282-0/+52
| | |/ / / /
| * | | | | Merge pull request #3961 from owncloud/logrotateMorris Jobke2013-08-283-3/+63
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | fix typoMorris Jobke2013-08-281-1/+1
| | * | | | Only enable logrotate when configured. Also rotate size is settable.Bart Visscher2013-08-283-11/+23
| | * | | | Check for installed state before registering the logrotate background jobBart Visscher2013-08-282-2/+16
| | * | | | Add description to log rotate classBart Visscher2013-08-281-0/+7
| | * | | | Review fixesBart Visscher2013-08-281-4/+4
| | * | | | Very simple log rotationBart Visscher2013-08-282-0/+27
| | |/ / /
| * | | | Merge pull request #4627 from owncloud/trashbin-tipsyMorris Jobke2013-08-281-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | change orientation for delete tooltip to left, fix #4589Jan-Christoph Borchardt2013-08-281-0/+1
| * | | | 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
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 03:15:15 +0000