summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use defaultavatarskondou2013-08-2911-11/+60
* Include placeholder.jskondou2013-08-281-2/+2
* Merge branch 'master' into oc_avatarskondou2013-08-287-3/+132
|\
| * 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
* | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-284-18/+7
* | | Merge branch 'master' into oc_avatarskondou2013-08-28541-8194/+13990
|\| |
| * | 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