Commit graph

12578 commits

Author SHA1 Message Date
kondou
4cd87549e1 Close.png instead of delete.png for close dialogs 2013-07-10 04:39:22 +02:00
kondou
efb707a431 Use OC instead of oc to show alert at an error.
Related to #4001
2013-07-10 04:28:54 +02:00
Jenkins for ownCloud
7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Robin Appelman
065bc96b02 more consistent naming 2013-07-10 02:17:24 +02:00
Robin Appelman
db14775536 consistent naming 2013-07-10 02:09:42 +02:00
Robin Appelman
4de5e292e5 search parameter is not optional 2013-07-10 02:01:34 +02:00
Robin Appelman
2d9be541ea add test case for getting group after deleting it 2013-07-10 02:00:14 +02:00
Robin Appelman
cc2818ba13 more consitency in hook names 2013-07-10 01:59:59 +02:00
Robin Appelman
c2bff656ff cant use private members from closure in php <5.4 2013-07-10 01:55:38 +02:00
Robin Appelman
912b151561 use new group api as backend for the old api 2013-07-10 00:07:46 +02:00
Robin Appelman
a735105a22 update group management 2013-07-10 00:06:22 +02:00
Victor Dubiniuk
194ab11322 General fixes 2013-07-10 00:49:05 +03:00
mvn23
40879c6327 Merge pull request #3787 from mvn23/patch-1
Thanks @bartv2 and @bantu, merged and closed.
2013-07-09 08:21:07 -07:00
VicDeo
43755a292b Merge pull request #3943 from owncloud/encode_uri_component
Add path encoding to public API.
2013-07-09 08:13:50 -07:00
Thomas Tanghus
9e9c323acd Set path in cookie. 2013-07-09 16:46:35 +02:00
Victor Dubiniuk
c0b210f0d5 Add unit test 2013-07-09 17:46:11 +03:00
Victor Dubiniuk
257096f1d4 Encode current trashbin directory 2013-07-09 17:46:11 +03:00
Victor Dubiniuk
582631323a Migrate to encodePath 2013-07-09 17:46:11 +03:00
Victor Dubiniuk
5a3fce12a4 Implement encodePath 2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
d70d4f435e apply @LukasReschke's cookie changes, hopefully finally fix #854 2013-07-09 15:00:36 +02:00
Jörn Friedrich Dreyer
cc0965b9bc Merge pull request #3980 from owncloud/try-permissions-hook-again
Add update permissions hook to sharing
2013-07-09 05:40:16 -07:00
Jörn Friedrich Dreyer
5513e30752 Merge pull request #3920 from owncloud/Fixing_search_ie8
[ie8] Fix lazy CSS loading and missing borders in search dropdown
2013-07-09 05:29:18 -07:00
Jenkins for ownCloud
439cad07b5 [tx-robot] updated from transifex 2013-07-09 02:12:22 +02:00
Michael Gapczynski
4feff3456b Only emit permissions hook for files and and include path 2013-07-08 17:28:18 -04:00
Thomas Müller
244d376a16 Merge pull request #3977 from owncloud/enable_oracle_in_autotests
enable oracle testing by default
2013-07-08 13:44:12 -07:00
icewind1991
af1c3dd4ce Merge pull request #3963 from owncloud/update-logic-split
Move the upgrade logic to \OC\Updater
2013-07-08 12:38:39 -07:00
Robin Appelman
a0d5ba1167 fix typo 2013-07-08 21:13:31 +02:00
Jörn Friedrich Dreyer
15907f6aee Merge pull request #3979 from owncloud/permissions-hook
Add update permissions hook to sharing
2013-07-08 09:32:10 -07:00
Bart Visscher
e7b882a4fc stupid namespace 2013-07-08 18:29:43 +02:00
Bart Visscher
4a6803ef9d Check if logger is set, also no need to return true 2013-07-08 18:26:11 +02:00
Bart Visscher
abe9abab99 Add constructor documentation 2013-07-08 18:01:32 +02:00
Jörn Friedrich Dreyer
301c9e1399 requires fixes in 3rdparty mdb2 2013-07-08 18:01:20 +02:00
Bart Visscher
52553c64ed Merge branch 'master' into convert-oc_config
Conflicts:
	lib/config.php
2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba Add update permissions hook to sharing 2013-07-08 11:40:10 -04:00
Robin Appelman
4a4e139c83 forward previously registerd hooks 2013-07-08 16:54:26 +02:00
Robin Appelman
925d09cb0e add forwarding emitter for agregating multiple emitters 2013-07-08 16:45:19 +02:00
Jörn Friedrich Dreyer
ccce93755f enable oracle testing by default 2013-07-08 16:42:19 +02:00
Thomas Müller
02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Christian Berendt
020803aa7e minimize waiting time 2013-07-08 16:06:08 +02:00
Christian Berendt
deda583fad wait methods are probably not working, just wait 2013-07-08 15:56:56 +02:00
Jan-Christoph Borchardt
8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
2013-07-08 06:56:29 -07:00
Christian Berendt
83a1fce1a3 make tests workable with Amazon S3 2013-07-08 15:25:49 +02:00
Christian Berendt
882d5ad728 added exception messages 2013-07-08 15:10:10 +02:00
Christian Berendt
8c9e6db1b1 increasing allowed time difference 2013-07-08 15:03:55 +02:00
Christian Berendt
fdeb21ba5b wait until bucket exists after the creation 2013-07-08 15:00:07 +02:00
Christian Berendt
911e947fd7 check if used bucket name is valid 2013-07-08 14:59:09 +02:00
Christian Berendt
dc8ca00f1e fixed syntax error 2013-07-08 13:26:41 +02:00
Thomas Müller
0365d244e0 Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
Christian Berendt
d59291a8e7 remove needless check 2013-07-08 11:16:58 +02:00
Christian Berendt
0bc28dcb95 replaced substr with trim 2013-07-08 11:14:47 +02:00