Thomas Müller
481bb831bb
Merge branch 'master' into ext-fs-irods-master
2013-07-12 09:54:39 +02:00
Thomas Müller
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
icewind1991
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
Jenkins for ownCloud
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt
83b2411b81
reword LDAP config and use themable strings, fix rest of #3791
2013-07-11 17:45:13 +02:00
Jan-Christoph Borchardt
30ab6580f6
reword WebDAV auth to not have 'ownCloud' anymore
2013-07-11 17:42:16 +02:00
Jan-Christoph Borchardt
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
Jan-Christoph Borchardt
20791e0ad1
use themable strings for installation
2013-07-11 17:39:44 +02:00
Jan-Christoph Borchardt
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
Jörn Friedrich Dreyer
c5f2ea9a95
Merge pull request #4015 from owncloud/fixing-4005-master
...
EventSource and update fixes [master]
2013-07-11 03:33:47 -07:00
Jenkins for ownCloud
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
Thomas Müller
d18bd17eb7
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
...
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
icewind1991
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Morris Jobke
e2a5af4b9e
Merge pull request #3985 from owncloud/cookie-past2
...
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-10 09:08:01 -07:00
Robin Appelman
63df8f3500
reneme id to gid
2013-07-10 17:52:34 +02:00
Jan-Christoph Borchardt
a9072056a0
Merge pull request #3990 from owncloud/size-mb
...
add MB indicator to size heading, fix #3987
2013-07-10 08:42:05 -07:00
Christian Berendt
c772a6479d
stripping services from AWS SDK
2013-07-10 16:38:34 +02:00
Christian Berendt
9965eb0295
fixing style issues
2013-07-10 16:12:48 +02:00
Christian Berendt
4fdf279395
use === instead of ==
2013-07-10 16:09:22 +02:00
Christian Berendt
a8b2aa34a4
remove uneeded calls to touch
2013-07-10 16:07:41 +02:00
Morris Jobke
eed516c31a
Merge pull request #4002 from owncloud/use_OC_in_settings_js
...
[settings] Use OC instead of oc to show alert at an error.
2013-07-10 04:55:21 -07:00
Jan-Christoph Borchardt
3fb3a7baa8
add MB indicator to size heading, fix #3987
2013-07-10 13:52:55 +02:00
Morris Jobke
01c6ca94c2
Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_for_dialogs
...
Use close.png instead of delete.png for closing dialogs
2013-07-10 04:36:37 -07:00
Arthur Schiwon
5387e5c354
LDAP: even better check for emptiness, fixes #3815
2013-07-10 11:39:47 +02:00
Jörn Friedrich Dreyer
6a50848a6e
Merge pull request #3994 from owncloud/fix_oracle_setup
...
General setup fixes for Oracle
2013-07-10 01:02:52 -07:00
Christian Berendt
203df66c00
rewrote initialisation, added testing workaround
2013-07-10 07:47:15 +02:00
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
