Arthur Schiwon
14d1abf63f
LDAP: improve debug message
2014-02-10 14:45:37 +01:00
Arthur Schiwon
18e1a10e96
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
2014-02-10 14:45:31 +01:00
Morris Jobke
eba1d574cf
Merge pull request #7134 from owncloud/issue/5794
...
Make google drive client secret and dropbox api secret a password field
2014-02-10 14:34:24 +01:00
Morris Jobke
02bdb47049
Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
...
refuse login as long as the initial encryption is running
2014-02-10 13:25:39 +01:00
Arthur Schiwon
299d37154b
LDAP: add documentation info in info.xml
2014-02-10 12:59:11 +01:00
Vincent Petry
6b5a7035ee
Merge pull request #7126 from nickvergessen/issue/6683
...
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
Arthur Schiwon
e156f85bfb
Rephrase and clarify log message
2014-02-10 11:29:08 +01:00
Arthur Schiwon
a76840d206
Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670
2014-02-10 11:29:02 +01:00
Arthur Schiwon
e825a008c9
Wizard: disable LDAP referrals, fixes #6670
2014-02-10 11:28:55 +01:00
Arthur Schiwon
a908bd5695
throw an info message, when base dn test failed
2014-02-10 11:28:46 +01:00
Arthur Schiwon
bc17b40650
LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard
2014-02-10 11:28:38 +01:00
Bjoern Schiessle
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
Thomas Müller
e7db48cd7f
Merge pull request #7133 from owncloud/fix-implied-eval
...
Fix implied evals and doubled definition of variable
2014-02-10 10:08:40 +01:00
Joas Schilling
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
Bjoern Schiessle
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
Morris Jobke
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Joas Schilling
af7366cd30
Only add files to file list when uploading to current directory
...
Fix Issue #6683
2014-02-07 13:06:50 +01:00
Bjoern Schiessle
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
Vincent Petry
aff1cafaca
Merge pull request #7089 from owncloud/sharing-searchbymime
...
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
Pellaeon Lin
946fccc0dd
Remove unused template variable assignment of files_sharing/template/public.php
2014-02-06 12:26:36 +08:00
Pellaeon Lin
8c56e21ced
Move template variable assignment to correct place
2014-02-06 12:06:16 +08:00
Jan-Christoph Borchardt
b0692af29a
Merge pull request #7064 from owncloud/files-scrolltopafterupdate
...
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
Björn Schießle
697b25f165
Merge pull request #7032 from owncloud/enc_fix_delete
...
Encryption replace delete proxy with pre/post hooks and add tests
2014-02-05 14:26:52 +01:00
Vincent Petry
fa5ddc3e18
Fixed searchByMime in shared cache
...
- searchByMime now correctly returns files recursively search through
all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Thomas Müller
6d3b61f388
Merge pull request #7011 from owncloud/jshint
...
Added .jshintrc
2014-02-04 12:11:32 -08:00
Vincent Petry
fe2a63ffd4
Scroll to the top after switching dir
...
Fixes #7061
2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt
3692260174
Merge pull request #7055 from owncloud/ellipsize-modified-date
...
ellipsize long modified dates to make room for showing delete button
2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt
b56dbbe0e5
fix misalignment of modified dates, shift to right
2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt
6d7d3c16d0
ellipsize long modified dates to make room for showing delete button, fix #7040
2014-02-03 17:24:44 +01:00
Björn Schießle
9a0d7c5be4
Merge pull request #7014 from owncloud/fix_ocs_share_api
...
remove needless element tag from the ocs share api
2014-02-03 08:02:54 -08:00
Bjoern Schiessle
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
Bjoern Schiessle
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
Bjoern Schiessle
bef58f5361
don't expect OC_FilesystemView, this is depreciated
2014-01-31 20:39:52 +01:00
Bjoern Schiessle
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +01:00
Bjoern Schiessle
5610842e56
move unlink proxy to a hook which handles pre and post conditions
2014-01-31 20:38:35 +01:00
Georg Ehrke
1f30bffba3
Merge pull request #7017 from owncloud/trashpreview
...
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
raghunayyar
5ccb395ec6
Makes Rename Icon Width 44px for touch sourfaces.
2014-01-31 12:33:00 +05:30
Vincent Petry
c5767b67b1
Fixed image preview in trashbin subdirs
2014-01-30 17:03:13 +01:00
Pellaeon Lin
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Vincent Petry
ba1b9df8a9
Fixed file name validation unit test + added newline
...
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
2014-01-30 13:40:01 +01:00
Vincent Petry
d36a2ff9ee
Added .jshintrc
...
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
Bjoern Schiessle
f9d9a62e58
remove needless element tag
2014-01-30 13:34:41 +01:00
Vincent Petry
bc598f1919
Updated unit tests for rename action
...
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
including the rename one
2014-01-30 10:07:08 +01:00
raghunayyar
85e67be0aa
Rename action now appears as pencil icon
2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt
271088a7a2
Merge pull request #6777 from owncloud/mobile-style
...
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt
edea7781b7
make header scroll up for single shares, more view of content on small screens
2014-01-29 17:20:55 +01:00
Thomas Müller
7655728ddf
- adding class to header div: share-folder or share-file
...
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
Morris Jobke
afa00318bc
Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
...
Added error message for when target folder was removed
2014-01-29 07:48:50 -08:00