39eeb7def9
Merge pull request #8882 from owncloud/remove-placeholdercall
...
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
e734caecba
Merge pull request #8876 from owncloud/design-css-settings
...
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:52:10 +02:00
48eee0b432
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
2014-06-04 17:47:09 +02:00
71ba457372
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:05:44 +02:00
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
c6196c022d
Merge pull request #8875 from owncloud/app-css-relative
...
explicit position:relative for app-content, fixes first run layout
2014-06-04 16:51:43 +02:00
411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
9c6f604321
explicit position:relative for app-content, fixes first run layout
2014-06-04 16:41:11 +02:00
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
b5f0a17918
Merge pull request #8822 from owncloud/cache-change-propagator
...
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
5adb8f0a8a
Merge pull request #8844 from owncloud/design-icons
...
[WIP] simplify icons, remove shadow
2014-06-04 12:23:08 +02:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
ade6ed3797
Merge pull request #8701 from owncloud/slide-up-toggle
...
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
a244172219
Merge pull request #8853 from owncloud/design-typeface
...
Use Open Sans as typeface
2014-06-04 11:16:03 +02:00
8874c74a74
Merge pull request #8860 from owncloud/phpstorm-code-style
...
add phpstorm code style
2014-06-04 11:12:35 +02:00
d3128f0694
IE -> IE8 only
2014-06-04 11:07:28 +02:00
d1176f546a
move from tff to woff and fix IE8
2014-06-04 10:58:52 +02:00
962cd50ae7
add phpstorm code style
2014-06-04 10:58:51 +02:00
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
3bcdad62fb
Fix unit tests
2014-06-04 10:01:50 +02:00
9e31118675
Merge pull request #8842 from owncloud/ldap_cli_methods
...
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
86623358f0
Merge pull request #8849 from owncloud/trash_expire_fix
...
get files in trash from file cache
2014-06-04 09:36:40 +02:00
9f3fcf036c
fixing typo
2014-06-04 09:36:27 +02:00
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
0a417b1174
Use ->instanceOfStorage() not instanceof for Storage instances.
2014-06-04 07:55:46 +02:00
0e85618c42
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.
2014-06-04 07:55:46 +02:00
48eb0515e9
only lock if unlink is called for a file
2014-06-04 07:55:46 +02:00
2b30fb4862
fix unit test after adding the additional parameter to addStorageWrapper()
2014-06-04 07:55:46 +02:00
ab6680e9ab
name the storage wrapper to make sure that we don't apply the wrapper multiple times
2014-06-04 07:55:46 +02:00
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
cda87fd9c4
Normalize lock exception messages.
2014-06-04 07:55:45 +02:00
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
ba887d2b17
Restore the reference to this used exception class.
2014-06-04 07:55:45 +02:00
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
c9c6a0ab1e
Don't error out on console.
2014-06-04 07:55:45 +02:00
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
826b14e36b
Fix typo
2014-06-04 07:55:45 +02:00
9bbc4b0034
Fix typo
2014-06-04 07:55:44 +02:00
896bc526e6
Remove unused methods.
2014-06-04 07:55:44 +02:00
6b94732bdf
Respect locked files, surface correct exception.
2014-06-04 07:55:44 +02:00
428510a4f8
Simpler log unique id.
2014-06-04 07:55:44 +02:00
Morris Jobke
Thomas Müller
Jan-Christoph Borchardt
Vincent Petry
Bernhard Posselt
Morris Jobke
Robin Appelman
Jenkins for ownCloud
Bjoern Schiessle
ringmaster
Lukas Reschke