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
Pellaeon Lin
cd6ab29313
Use t() 's native method
2014-01-16 17:51:00 +08: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
Jan-Christoph Borchardt
3e7cf4110d
tweak color and position of username in public share
2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt
5f95356592
remove unused log icon
2014-01-15 15:48:42 +01:00
Jan-Christoph Borchardt
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
Thomas Müller
50ae2ab14c
add download button on single file share page
2014-01-15 15:31:27 +01:00
Thomas Müller
b3a6683784
remove unused js code and css rules
2014-01-15 15:22:40 +01:00
Thomas Müller
ce231c406d
no new menu on public upload
2014-01-15 15:07:52 +01:00
Thomas Müller
6c76b4ba12
fixing preview generation
2014-01-15 15:07:24 +01:00
Thomas Müller
807b885a0e
reuse file upload as used within files app - remove public upload button
2014-01-15 14:36:18 +01: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
Robin Appelman
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +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
Pellaeon Lin
dbbbfee7de
Fix namespace
2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt
072ef7f010
remove min-width rule to fix mobile views
2014-01-14 22:14:46 +01:00
Jan-Christoph Borchardt
2bdd014f83
first mobile style rules, hide extra columns in files view and scroll header
2014-01-14 22:14:06 +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