Commit Graph

13070 Commits

Author SHA1 Message Date
kondou a21376480d Split personal and user-mgmt password change logic 2013-09-06 08:05:07 +02:00
Morris Jobke ea6e74ca95 Merge pull request #4552 from dampfklon/fix4552
Make group suffix in share dialog translatable
2013-08-28 15:46:51 -07:00
Morris Jobke af6eb9d41b Merge pull request #4631 from owncloud/hotfix_4630
Work around #4630 to fix license showing
2013-08-28 15:42:06 -07:00
Thomas Müller 81cab5ada8 Merge pull request #3926 from owncloud/improve_filesummary
Improve filelist summary
2013-08-28 15:11:09 -07:00
Thomas Müller 67ce2ad869 Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
also move empty folders to the trash bin
2013-08-28 14:54:37 -07:00
Thomas Müller cebb635955 Merge pull request #4615 from owncloud/npm-modules
Adds Node Modules to build in gitignore for easy testing.
2013-08-28 14:18:47 -07:00
Morris Jobke f0ea23891a Merge pull request #4618 from owncloud/visualize-js
visualize
2013-08-28 14:17:50 -07:00
Thomas Müller 6502a148ec fixing typo 2013-08-28 23:04:55 +02:00
Thomas Müller 1d04843ef0 no duplicate declaration of appLicense + camelCase 2013-08-28 22:42:43 +02:00
Morris Jobke 125824b78d Merge pull request #3961 from owncloud/logrotate
Very simple log rotation
2013-08-28 13:17:38 -07:00
kondou 6c7efd5dac Work around #4630 to fix license showing 2013-08-28 22:12:01 +02:00
Morris Jobke 067815099f calculate fontsize and line-height 2013-08-28 21:54:20 +02:00
Morris Jobke 54d07bd9b0 update 3rdparty - md5 2013-08-28 21:22:56 +02:00
Morris Jobke d4952bd9df fix typo 2013-08-28 18:36:32 +02:00
Morris Jobke 584857de69 Merge pull request #4627 from owncloud/trashbin-tipsy
change orientation for delete tooltip to left, fix #4589
2013-08-28 09:09:40 -07:00
Jan-Christoph Borchardt e7b40983e4 change orientation for delete tooltip to left, fix #4589 2013-08-28 17:58:23 +02:00
Bart Visscher 3fd2df4088 Only enable logrotate when configured. Also rotate size is settable. 2013-08-28 17:41:27 +02:00
Bart Visscher 42f3ecb60f Check for installed state before registering the logrotate background job 2013-08-28 17:11:43 +02:00
Bart Visscher 62560ef859 Add description to log rotate class 2013-08-28 17:11:43 +02:00
Bart Visscher 594a2af75a Review fixes 2013-08-28 17:11:43 +02:00
Bart Visscher b5e2842e00 Very simple log rotation 2013-08-28 17:11:43 +02:00
Morris Jobke 16abc536c5 fix 3rdparty commit 2013-08-28 16:59:12 +02:00
Morris Jobke ed2fa06a26 reviewers comments 2013-08-28 16:52:12 +02:00
Morris Jobke 4a00b26029 add visualize 2013-08-28 16:29:27 +02:00
raghunayyar 6b278c89b3 Adds Node Modules to build in gitignore for easy testing. 2013-08-28 19:30:49 +05:30
Bjoern Schiessle aed71bb420 also move empty folders to the trash bin as discussed here #4590 2013-08-28 15:46:44 +02:00
Jan-Christoph Borchardt 0c02e1efef Merge pull request #4563 from owncloud/use_personal-password
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
Bart Visscher ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
kondou 6bd0f3cba7 Reimplement filesummary in JS
Fix #993
2013-08-28 15:10:17 +02:00
Bart Visscher 45076edf4f Merge pull request #3891 from owncloud/fix_loadAppScriptFile
Check if the app is enabled and the app path is found before trying to l...
2013-08-28 06:10:06 -07:00
Morris Jobke b9a95af12c Merge pull request #4610 from owncloud/password-toggle-login
Password toggle login
2013-08-28 06:04:15 -07:00
Jan-Christoph Borchardt 0c8ac241df fix shadow style of username input box 2013-08-28 13:59:23 +02:00
Jan-Christoph Borchardt c6eda25d50 remove show password toggle from log in page, ref #4577 #4580 2013-08-28 13:58:49 +02:00
Morris Jobke 5a03707184 Merge pull request #4601 from owncloud/fixing-4341-master
backport of #4357 to master
2013-08-28 04:42:50 -07:00
Thomas Tanghus 9843c8e838 Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
Thomas Tanghus 776d64f804 Cache Object.keys(this.vars) 2013-08-28 12:50:05 +02:00
Jenkins for ownCloud 3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Thomas Müller 3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Morris Jobke 34a32d862c Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
Fix "select all" checkbox displacement when checked, fix #4571
2013-08-27 14:21:34 -07:00
Arthur Schiwon 321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Morris Jobke abc23f7128 Merge pull request #3208 from owncloud/api_capabilities_quota
Add the quota to the external API for use with the mobile and desktop clients
2013-08-27 08:07:47 -07:00
Morris Jobke e91edabe0f add documentation 2013-08-27 16:07:25 +02:00
Björn Schießle 38084aba2a Merge pull request #4596 from owncloud/fix_isEmpty_trash
trash bin: fix isEmpty() function
2013-08-27 06:40:39 -07:00
Tom Needham 273f162b26 Code style 2013-08-27 15:39:47 +02:00
Tom Needham f14ce1efdc Add quota to core api 2013-08-27 15:39:43 +02:00
Bjoern Schiessle 316d9bfed6 the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not 2013-08-27 14:39:43 +02:00
Jörn Friedrich Dreyer 13514fd1ad Merge pull request #4348 from owncloud/fixing-4343-master
fixes #4343
2013-08-27 04:26:51 -07:00
blizzz 163269805a Merge pull request #4507 from owncloud/existingusersfromgroup
return only existing users in group
2013-08-27 03:47:56 -07:00
Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00