Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Vincent Petry
e41ea20ce4
Fixed clicking on the "Home" breadcrumb in the trash app
...
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
2013-10-28 20:24:06 +01:00
Jenkins for ownCloud
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
Andreas Fischer
eb2d66d1a0
Fix double not in newfile/newfolder language.
2013-10-27 11:53:14 +01:00
Jenkins for ownCloud
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
Arthur Schiwon
81dbe7dab7
Port PR #5457 to master
2013-10-25 14:15:05 +02:00
Donald Buczek
3fc232370e
make sure the shared ldap connection is rebound to the configured user after being used for password checking.
2013-10-25 11:12:18 +02:00
Thomas Müller
5fd1f552a3
Merge pull request #5532 from owncloud/ldap_fixes
...
Ldap fixes
2013-10-24 23:24:39 -07:00
Arthur Schiwon
c48157e3b8
LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518
2013-10-24 20:26:05 +02:00
Thomas Müller
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
Arthur Schiwon
7fa418c81a
LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520
2013-10-24 18:21:02 +02:00
Arthur Schiwon
20f46602bd
LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521
2013-10-24 14:27:33 +02:00
Arthur Schiwon
6284e95e2b
typo, fixes #5517
2013-10-24 14:16:58 +02:00
Thomas Müller
535bc7b664
Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename
...
prevent user from creating or renaming sth. to an existing filename
2013-10-23 13:45:27 -07:00
Thomas Müller
e95ad29d90
Merge pull request #5435 from owncloud/share-improvements
...
Share improvements
2013-10-23 09:56:24 -07:00
Jörn Friedrich Dreyer
4991a7bd06
fix translations
2013-10-23 17:02:41 +02:00
Bjoern Schiessle
2221aa9ca4
run first getUsersItemShared() with the owner
2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43
update etags for user we haven't checked yet
2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946
keep a list of users we already checked to avoid loops
2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8
fix infinite loop while updating etags, fix for #4365
2013-10-23 16:33:28 +02:00
Markus Goetz
af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
Thomas Müller
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
Arthur Schiwon
30c0f5dee6
LDAP Wizard: proper strings and translations for user and group count text
2013-10-23 12:20:13 +02:00
Jörn Friedrich Dreyer
3121dc8cb5
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-23 12:02:06 +02:00
Arthur Schiwon
d78a80a689
merge master with resolved conflicts
2013-10-23 12:01:45 +02:00
Jörn Friedrich Dreyer
8ed73e5ced
use a more descriptive error message when the user tries to create '/Shared'
2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer
a9735c8a6f
cleanup array value assignment
2013-10-23 11:01:05 +02:00
Jörn Friedrich Dreyer
af7ec3169b
cleanup precondition checking when creating new files / folders
...
- use i18n
- use trim when checking for empty file / folder name
- use more verbose error descriptions
2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer
bc0faa1c4e
use correct filename in error result json
2013-10-23 10:59:01 +02:00
Björn Schießle
2d14daf36b
Merge pull request #5472 from owncloud/enc_init_status_on_enable
...
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
Christopher Schäpers
70c0d7d6bc
Merge pull request #5310 from owncloud/hide_filestable-header_when_empty
...
Hide files list header, when theres no files to see
2013-10-22 14:39:14 -07:00
Thomas Müller
cea1f80c1a
Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle
...
Fixed ugly white space while loading file thumbnail
2013-10-22 14:20:48 -07:00
Thomas Müller
e6aa7a8643
Merge pull request #5467 from owncloud/fixing-5063-master
...
display the original file name - this will change in case of renames
2013-10-22 14:10:35 -07:00
Thomas Müller
9019ad550f
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
...
Conflicts:
apps/files/js/filelist.js
2013-10-22 23:06:53 +02:00
Thomas Müller
ca3771f8fd
fixing js syntax error
2013-10-22 22:39:28 +02:00
Thomas Müller
bf46e0c317
fixing undefined variable $newname
2013-10-22 22:38:48 +02:00
Thomas Müller
0283589a19
adding PHPDoc comments
2013-10-22 22:38:05 +02:00
Jörn Friedrich Dreyer
45e6d96702
prevent user from creating or renaming sth. to an existing filename
...
- show tooltip when violating naming constraints while typing
- when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong
- fixes #5062
- also fixes some whitespace and codestyle issues in files js
- uses css selector over filterAttr in touched js files
2013-10-22 18:11:03 +02:00
Vincent Petry
263f8bebfe
Added FileList.setViewerMode to hide controls
...
Some files app embed themselves under the controls (like the text
editor). The new method FileList.setViewerMode() makes it possible to
properly show/hide the control buttons using the correct permissions.
Apps using this approach must call setViewerMode(true) when starting and
setViewerMode(false) upon closing to restore the controls.
This is needed for #5284
2013-10-22 16:44:57 +02:00
Bjoern Schiessle
3d1d443529
remove debug output
2013-10-22 16:21:04 +02:00
Bjoern Schiessle
eb348b776c
set the init status to "NOT_INITIALIZED" if the encryption app gets enabled
2013-10-22 16:15:24 +02:00
Thomas Müller
e23433f771
display the original file name - this will change in case of renames
2013-10-22 14:02:44 +02:00
Vincent Petry
3bb7cf939e
Fixed ugly white space while loading file thumbnail
...
Preview images are now pre-loaded before being set on the file element.
This fixes #5135 and prevents a white space to be displayed while the
thumbnails is being loaded.
2013-10-22 12:08:05 +02:00
Thomas Müller
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
Arthur Schiwon
76a195a0be
LDAP Wizard: l10n improvements
2013-10-21 23:15:21 +02:00
Vincent Petry
d1c27e08e5
Fixed empty content logic
...
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
2013-10-21 22:18:10 +02:00
Thomas Müller
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
Vincent Petry
bd7cf436c6
Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix
...
Fixed share with link checkbox missing as regular user
2013-10-21 11:46:01 -07:00
kondou
732e7db319
Fix mind-boggling emptycontent logic
2013-10-21 19:49:27 +02:00
Jenkins for ownCloud
a376407da3
[tx-robot] updated from transifex
2013-10-21 13:03:32 -04:00