368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
8eee8e76d1
forgotten infobox messages translations
2014-05-27 16:39:22 +02:00
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
d38f867055
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
...
don't lose file size during rename
2014-05-27 12:25:55 +02:00
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
a79f3fd1c0
Merge pull request #8728 from owncloud/sharing_fix_reshare
...
allow resharing of files with only share permissions
2014-05-27 09:02:52 +02:00
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
36f63ea990
allow resharing of files with only share permissions
2014-05-26 20:32:24 +02:00
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
59125cb796
fix grammar
2014-05-25 20:42:52 +02:00
f880734827
make user_ldap fully translatable
2014-05-25 14:41:59 +02:00
3348019bfa
Merge pull request #8705 from wakeup/master
...
fix typo
2014-05-25 11:00:34 +02:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
426f492f57
fix typo
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ ) on transifex
2014-05-24 14:36:10 +02:00
1b215b0131
Merge pull request #8688 from owncloud/public-image-positioning
...
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
864cd2455c
Merge pull request #8699 from owncloud/sharing_improvements
...
fix share label creation
2014-05-23 20:53:32 +02:00
ff4bb3a9e6
fix share label creation
2014-05-23 16:21:15 +02:00
7be0ce6ada
remove noise texture from interface (not necessary, and blurry on high-res)
2014-05-23 14:15:36 +02:00
10c1fc8d24
Show less whitespace above publicly shared images
2014-05-23 13:36:16 +02:00
71e1d919de
Merge pull request #8675 from owncloud/sharing-improvements
...
Sharing improvements
2014-05-23 06:41:34 -04:00
0b0e038b8b
Merge pull request #8671 from owncloud/log-upload-errors
...
php upload errors are written to log
2014-05-23 11:33:14 +02:00
3b279c9056
prevent default action when clicking on the share notification
2014-05-23 11:17:13 +02:00
6ffb139a46
Merge pull request #8658 from realriot/master
...
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
157b139b57
Dont scale up the preview for publicly shared images
2014-05-22 16:45:51 +02:00
11aa2cf74b
always check for unique filename, if a file gets added from outside the mount
...
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
1166d62d9b
fileList needs be be declared before the if-statement
2014-05-22 14:31:16 +02:00
050df76830
Merge pull request #8599 from owncloud/sharing_disable_for_groups
...
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
201cc59fe0
php upload errors are written to log
2014-05-22 12:20:27 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
9151d72507
Treat 'all users' as 'global'
...
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
05642733a3
Add storage priority support
...
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.
The priority order is as follows:
* Personal
* User
* Group
* Global
Within each mount type, the mount with the highest priority is active.
The storage backend defaults were chosen to be the following:
* Local - 150
* Remote storage - 100
* SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
14a953fbe0
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
...
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
88d26aac7b
Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
...
[master] Fixed issues with renaming
2014-05-21 06:27:07 -04:00
319942bccb
Merge pull request #8646 from owncloud/publicshare-fixes
...
[master] Fixed for public link page
2014-05-21 05:41:35 -04:00
9b23a210c9
Merge pull request #8637 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
7d98bcf9a2
Fixed JS issues in public page
...
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
160a2bc36f
Fixed download URL in public page
2014-05-20 13:24:52 +02:00
Jenkins for ownCloud
Thomas Müller
Volkan Gezer
Vincent Petry
Bjoern Schiessle
Volkan Gezer
Lukas Reschke
Jan-Christoph Borchardt
Robin Appelman
Robin McCorkell
Sascha Schmidt