481bb831bb
Merge branch 'master' into ext-fs-irods-master
2013-07-12 09:54:39 +02:00
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
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
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
10cc0511af
Optimize images with optipng and scour
2013-07-12 01:36:10 +02:00
14a35267c1
OC\Preview - outsource static methods
2013-07-11 20:35:55 +02:00
1ffc42b4be
OC\Preview - fix logic of two return values
2013-07-11 20:15:30 +02:00
c6849bed9d
OC\Preview - remove unneeded comment
2013-07-11 20:02:59 +02:00
1e8a646f51
OC\Preview - improve documentation
2013-07-11 19:21:37 +02:00
7b2aa5d830
OC\Preview - use camelCase
2013-07-11 19:03:21 +02:00
83b2411b81
reword LDAP config and use themable strings, fix rest of #3791
2013-07-11 17:45:13 +02:00
30ab6580f6
reword WebDAV auth to not have 'ownCloud' anymore
2013-07-11 17:42:16 +02:00
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
20791e0ad1
use themable strings for installation
2013-07-11 17:39:44 +02:00
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
7f3dbb6936
remove debug code ...
2013-07-11 13:41:09 +02:00
89554bd917
it's setValue not getValue, damn type
2013-07-11 13:39:10 +02:00
c5f2ea9a95
Merge pull request #4015 from owncloud/fixing-4005-master
...
EventSource and update fixes [master]
2013-07-11 03:33:47 -07:00
ec75e1904d
make jenkins happy
2013-07-11 12:28:41 +02:00
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
06eca985ce
use $root instead of $path
2013-07-11 11:57:46 +02:00
4bbbba1dc8
fix typo
2013-07-11 11:43:53 +02:00
7f71ae60b0
improve validation of oc\preview and implement preview of error icon if something went wrong
2013-07-11 10:10:07 +02:00
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
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
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
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
5c31b843fc
fix typo
2013-07-10 18:04:13 +02:00
f14b0fa6e0
update some comments in preview lib
2013-07-10 18:01:04 +02:00
7091d7a6d2
clean up oc\preview
2013-07-10 17:57:04 +02:00
63df8f3500
reneme id to gid
2013-07-10 17:52:34 +02:00
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
c772a6479d
stripping services from AWS SDK
2013-07-10 16:38:34 +02:00
9965eb0295
fixing style issues
2013-07-10 16:12:48 +02:00
4fdf279395
use === instead of ==
2013-07-10 16:09:22 +02:00
a8b2aa34a4
remove uneeded calls to touch
2013-07-10 16:07:41 +02:00
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
3fb3a7baa8
add MB indicator to size heading, fix #3987
2013-07-10 13:52:55 +02:00
45d1691671
fix orientation before caching preview
2013-07-10 13:38:42 +02:00
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
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
832779804d
add two new icons - for copyright see filetypes/readme-2.txt
2013-07-10 12:30:20 +02:00
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
8eefaba719
some style adjustments
2013-07-10 12:30:11 +02:00
5387e5c354
LDAP: even better check for emptiness, fixes #3815
2013-07-10 11:39:47 +02:00
6a50848a6e
Merge pull request #3994 from owncloud/fix_oracle_setup
...
General setup fixes for Oracle
2013-07-10 01:02:52 -07:00
203df66c00
rewrote initialisation, added testing workaround
2013-07-10 07:47:15 +02:00
4cd87549e1
Close.png instead of delete.png for close dialogs
2013-07-10 04:39:22 +02:00
efb707a431
Use OC instead of oc to show alert at an error.
...
Related to #4001
2013-07-10 04:28:54 +02:00
70b4f85911
Use isIgnoredDir()
2013-07-10 02:36:43 +02:00
Thomas Müller
icewind1991
kondou
Georg Ehrke
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Morris Jobke
Robin Appelman
Christian Berendt
Arthur Schiwon