Bjoern Schiessle
2af7256267
only set the values we need and make sure that we write the file info for both
...
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle
3d19bb2e51
also try to get file info from part file
2014-11-07 15:17:24 +01:00
Lukas Reschke
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Jenkins for ownCloud
7d47d50724
[tx-robot] updated from transifex
2014-11-07 01:55:10 -05:00
Robin Appelman
0f3fd89f7d
Fix sharing tests
2014-11-06 18:31:41 +01:00
Robin Appelman
7ecd220715
Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user
2014-11-06 18:31:40 +01:00
Robin Appelman
9c79c2fa17
Dont make real users in tests
2014-11-06 18:31:40 +01:00
Bjoern Schiessle
8104a4e24e
check if the provided password is really the current log-in password
2014-11-06 11:12:20 +01:00
Morris Jobke
226d43a1cf
manage select2 via bower
2014-11-06 09:27:12 +01:00
Jenkins for ownCloud
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
Jan-Christoph Borchardt
e869db47b0
unbold labels and folders
2014-11-05 14:13:09 +01:00
Thomas Müller
7f41048a33
Merge pull request #11962 from owncloud/fix-server-sharing-strings
...
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Bjoern Schiessle
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
Vincent Petry
97cbec8b8d
Merge pull request #11853 from owncloud/close-session-for-trashbin
...
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Thomas Müller
8116d903dd
adjust strings - fixed #11930
2014-11-05 11:08:17 +01:00
Jenkins for ownCloud
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
Vincent Petry
ee6d8c9d58
Store curl error message directly
2014-11-04 17:37:15 +01:00
Bjoern Schiessle
0580c232d7
still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue.
2014-11-04 17:16:36 +01:00
Vincent Petry
768f3979e0
Check for cert bundle existence before using it
2014-11-04 16:44:42 +01:00
Vincent Petry
79a7297880
Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
...
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
blizzz
b26f11c16f
Merge pull request #11362 from mark0n/rm_ldap_conf_cli
...
Add a CLI command that deletes an LDAP config
2014-11-04 13:19:45 +01:00
Vincent Petry
97a51c46ed
Only rescan trash folder when checking deleted versions
...
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
2014-11-04 12:29:42 +01:00
Morris Jobke
1979ec70a5
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
2014-11-04 10:37:16 +01:00
Jenkins for ownCloud
287faf9923
[tx-robot] updated from transifex
2014-11-04 01:55:05 -05:00
blizzz
dc9ea893fd
Merge pull request #11172 from owncloud/user-ldap-no-bcmath
...
Fix ldap convertSID2Str() / Remove BCMath dependency
2014-11-03 14:03:26 +01:00
Björn Schießle
79b650a023
Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
...
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
Andreas Fischer
d1410b46a9
user_ldap: Reimplement convertSID2Str() without BCMath dependency.
...
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-03 12:07:53 +01:00
Jenkins for ownCloud
fd480d6c40
[tx-robot] updated from transifex
2014-11-02 01:54:24 -05:00
Jenkins for ownCloud
469b2655d5
[tx-robot] updated from transifex
2014-11-02 01:54:29 -04:00
Jenkins for ownCloud
d8f7780f4f
[tx-robot] updated from transifex
2014-11-01 01:54:37 -04:00
Bjoern Schiessle
ebe1d3df0a
don't move versions if only the mount point was renamed
2014-10-31 16:42:54 +01:00
Jörn Friedrich Dreyer
fe9e6be35c
test files external amazon s3 storage id migration
2014-10-31 14:26:09 +01:00
Jörn Friedrich Dreyer
69a3d8eb1a
fix files_external storage id migration
2014-10-31 14:25:55 +01:00
Lukas Reschke
e0528c7598
Merge pull request #11876 from owncloud/remove-pointless-requires
...
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
Vincent Petry
a9b41cbf54
Merge pull request #11850 from owncloud/fix-11848
...
on xp'ed mode and switching configurations: save raw mode instead of tog...
2014-10-31 08:38:05 +01:00
Jenkins for ownCloud
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
Vincent Petry
146c46b73a
Merge pull request #11659 from jknockaert/master
...
rework getFileSize
2014-10-30 18:06:25 +01:00
Thomas Müller
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
Jan-Christoph Borchardt
108cdeb892
Merge pull request #11867 from owncloud/settings-sidebar-admin
...
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
Jan-Christoph Borchardt
1dfabfb491
admin settings: fix LDAP settings header layout
2014-10-30 16:04:26 +01:00
Thomas Müller
24feb74638
fixing ldap listing in admin sidebar - needs styling review
2014-10-30 13:55:33 +01:00
Vincent Petry
5536f6edd0
Properly register sharing hooks and proxies
...
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.
Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
Jenkins for ownCloud
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
Lukas Reschke
2cd35e94b4
Close session for files_trashbin
...
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +01:00
Arthur Schiwon
8a48b088ed
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
2014-10-29 18:53:07 +01:00
Vincent Petry
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke
7d10ec41e6
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
...
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Vincent Petry
e8f9b929bd
Added encryption test when moving file as non-owner
2014-10-29 12:57:12 +01:00
Vincent Petry
f44e617dfd
Fix warning with unset extension check
2014-10-29 12:56:49 +01:00
Vincent Petry
b920f888ae
Fix moving share keys as non-owner to subdir
...
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.
After the move/copy operation the keys are moved/copied to the target
dir.
Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
