wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15845 commits 157 branches 562 tags 714 MiB
Commit graph

15845 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
2233aa2a04 Fixed files row height in Firefox/KDE 
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
 2014-01-16 12:05:05 +01:00
raghunayyar
fd49d3c5c5 Fixes typo in versions.css 2014-01-16 14:45:23 +05:30
raghunayyar
775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
raghunayyar
f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Myles McNamara
62040fe2d2 change em to px 2014-01-15 17:06:48 -05:00
Volkan Gezer
97b0840bbe Fix untranslated text when deleting user 
This should fix issue #6728
 2014-01-15 18:40:04 +01:00
Thomas Müller
5730e05a14 properly handle app activation for unit testing 2014-01-15 17:12:42 +01:00
Thomas Müller
7f68497b39 error handling in case a requested app doesn't exists 2014-01-15 17:11:29 +01:00
Vincent Petry
bd643c47f3 Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix 
Fixed Dropbox/Google storage async save call
 2014-01-15 07:41:01 -08:00
Björn Schießle
5163e648f8 Merge pull request #6780 from owncloud/trash_bin_copy_recursively 
copy files to owners trash recursively
 2014-01-15 06:57:33 -08:00
Jan-Christoph Borchardt
f0a3c2a0f4 Merge pull request #6779 from owncloud/sharing-breadcrumb-folder-name 
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
 2014-01-15 06:56:59 -08:00
Bjoern Schiessle
592ae16603 remove old code 2014-01-15 14:35:17 +01:00
Bjoern Schiessle
f4179a3f5a don't try to encrypt/decrypt cache chunks or files in the trash bin 2014-01-15 14:29:33 +01:00
Bjoern Schiessle
f11f65c6a5 copy files to owner trash recursively 2014-01-15 14:27:23 +01:00
Robin Appelman
d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
icewind1991
d1f3f121d6 Merge pull request #6774 from owncloud/versions_update_cache 
call getFileInfo to enforce a file cache entry for the new version
 2014-01-15 03:57:22 -08:00
Thomas Müller
b6dcc2e59c Merge pull request #3234 from owncloud/mjob-password-strength 
Indicate password strength
 2014-01-15 03:35:41 -08:00
Thomas Müller
d4519125db Merge pull request #6744 from owncloud/fix_ocs_response_messages 
keep response message
 2014-01-15 03:17:24 -08:00
Bjoern Schiessle
76fa7bab63 call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 11:37:47 +01:00
Morris Jobke
5c1a9f35f1 Indicate password strength using strengthify 
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
 2014-01-15 11:10:12 +01:00
Vincent Petry
34559ef114 Merge pull request #6768 from owncloud/scanner-use-storage-mtime 
Use storage_mtime when determining if we can reuse cached data while scanning
 2014-01-15 01:31:33 -08:00
raghunayyar
d8eac2b9bc Merge branch 'master' into files-em-to-px 
Conflicts:
	apps/files/css/files.css
 2014-01-15 14:59:50 +05:30
tsumi
f41255f652 Useless else removed 
As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
 2014-01-15 09:39:21 +01:00
Robin Appelman
16b898ddb8 update another test 2014-01-14 20:19:05 +01:00
Vincent Petry
8135828b2e Fix to not destroy draggable when no draggable was set 
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.

Fixes #6254
 2014-01-14 19:17:23 +01:00
Bjoern Schiessle
fc54335aff extended test to also check the status messages 2014-01-14 17:11:04 +01:00
Arthur Schiwon
25fecb4f25 typo, grammar 2014-01-14 16:33:18 +01:00
Arthur Schiwon
097b6b8be9 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2014-01-14 16:33:09 +01:00
Arthur Schiwon
bb6bad6b3c remove unused variables 2014-01-14 16:33:02 +01:00
Arthur Schiwon
e4b7c6ef10 LDAP: fix TLS detection 2014-01-14 16:32:55 +01:00
Vincent Petry
c3a0b0d7f3 Merge pull request #6704 from owncloud/encryptedfoldersizecalc 
Fix calculated folder size to use unencrypted size
 2014-01-14 07:20:16 -08:00
Robin Appelman
7e4c80fd60 use different value for mtime and storage_mtime in test 2014-01-14 15:13:21 +01:00
Robin Appelman
4113042c8f remove duplicate test class 2014-01-14 15:11:41 +01:00
Vincent Petry
ab21c25e38 Merge pull request #6759 from owncloud/extstorage-smbtimezonefix 
Fixed timezone issue with SMB storage
 2014-01-14 06:03:24 -08:00
Björn Schießle
a2a5ed3f4f Merge pull request #6767 from owncloud/sharing_error_messages 
it is not an urgent error... a DEBUG message is enough at this point
 2014-01-14 06:02:48 -08:00
Robin Appelman
203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
Bjoern Schiessle
fa7f53e89d it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 13:38:41 +01:00
Thomas Müller
3c0e4a3bc6 Merge pull request #6752 from owncloud/silence-test-listener 
no warnings within unlinkDir() within the TestCleanupListener
 2014-01-13 15:47:39 -08:00
Andreas Fischer
cb071a9f35 Merge pull request #6755 from owncloud/remove-ru_RU-master 
remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex
 2014-01-14 00:44:34 +01:00
Vincent Petry
1eb5ebd58c Fixed timezone issue with SMB storage 
Now forcing smbclient to also run on UTC
 2014-01-14 00:37:57 +01:00
Bjoern Schiessle
d1b47021f1 don't unshare on delete 2014-01-13 16:49:16 +01:00
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry
5e04b7f284 Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files 
Fixing Issue #6301 on master branch
 2014-01-13 07:09:01 -08:00
Frank Karlitschek
82c840b3e6 Merge pull request #6734 from st3so/redirectfix 
fixing typo in redirection query string
 2014-01-13 06:55:52 -08:00
Thomas Müller
70650a004a no warnings within unlinkDir() within the TestCleanupListener 2014-01-13 15:32:11 +01:00
Thomas Müller
fcf6653e64 Merge pull request #6694 from owncloud/fix-email-template-l10n 
fix email template l10n, emphasize filename
 2014-01-13 04:34:28 -08:00
Bjoern Schiessle
6845860470 keep response message 2014-01-13 12:27:05 +01:00
st3so
a2cae551f3 fixing typo in redirection query string 2014-01-12 15:49:32 +01:00
Lukas Reschke
85e00ad35a Merge pull request #6713 from owncloud/files-filenameescapingfixes 
Fixed various file name escaping issues in core apps
 2014-01-12 03:45:30 -08:00
tsumi
7c1649fc24 Added SVG fallback to apps settings popup 
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
 2014-01-10 21:19:30 +01:00