1a2db491af
Merge pull request #3962 from owncloud/move-error-handlers
...
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
f2639d6269
[tx-robot] updated from transifex
2013-07-15 02:34:45 +02:00
6f5b0af67f
Merge pull request #3487 from owncloud/basic_auth_hack
...
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
7cc22443e3
Merge pull request #4061 from rolandgeider/master
...
Use transifex.com on link to translations
2013-07-14 10:52:43 -07:00
995feea42a
Use transifex.com on link to translations
2013-07-14 11:54:39 +02:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
ccb3c5b428
Removed the preview warning. This is only a simple text change
2013-07-13 13:31:55 +02:00
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
8ae2066b20
Merge pull request #4037 from owncloud/add_new_file_above_summary
...
add new file above summary if it is the first file in the list
2013-07-12 03:45:45 -07:00
b16c5a6df7
fix array access and change variable names according to the coding style
2013-07-12 11:25:40 +02:00
15f7bb296c
continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota
2013-07-12 11:25:31 +02:00
fbf34f3bf6
fix some var names according to our style guide
2013-07-12 11:25:23 +02:00
2f0d88cae4
adjust comments
2013-07-12 11:25:12 +02:00
e7959d3da0
fix typo in comment
2013-07-12 11:25:04 +02:00
e8760d7284
also expire versions on rename, to update the history more regularly
2013-07-12 11:24:52 +02:00
d6c1e5490d
it is enough to call the expire function once
2013-07-12 11:24:31 +02:00
e159143165
call expire function before writing the new version to make sure to have enough free space
2013-07-12 11:24:19 +02:00
cb81ceb31d
add new file above summary if it is the first file in the list
2013-07-12 10:40:24 +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
c5f2ea9a95
Merge pull request #4015 from owncloud/fixing-4005-master
...
EventSource and update fixes [master]
2013-07-11 03:33:47 -07: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
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
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
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
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
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
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
194ab11322
General fixes
2013-07-10 00:49:05 +03:00
40879c6327
Merge pull request #3787 from mvn23/patch-1
...
Thanks @bartv2 and @bantu, merged and closed.
2013-07-09 08:21:07 -07:00
43755a292b
Merge pull request #3943 from owncloud/encode_uri_component
...
Add path encoding to public API.
2013-07-09 08:13:50 -07:00
9e9c323acd
Set path in cookie.
2013-07-09 16:46:35 +02:00
c0b210f0d5
Add unit test
2013-07-09 17:46:11 +03:00
257096f1d4
Encode current trashbin directory
2013-07-09 17:46:11 +03:00
582631323a
Migrate to encodePath
2013-07-09 17:46:11 +03:00
5a3fce12a4
Implement encodePath
2013-07-09 17:46:11 +03:00
d70d4f435e
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-09 15:00:36 +02:00
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
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
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
244d376a16
Merge pull request #3977 from owncloud/enable_oracle_in_autotests
...
enable oracle testing by default
2013-07-08 13:44:12 -07:00
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
a0d5ba1167
fix typo
2013-07-08 21:13:31 +02:00
Bart Visscher
Jenkins for ownCloud
Jan-Christoph Borchardt
rolandgeider
Frank Karlitschek
Kondou
Björn Schießle
icewind1991
Jörn Friedrich Dreyer
Morris Jobke
Arthur Schiwon
Victor Dubiniuk
mvn23
VicDeo
Thomas Tanghus
Michael Gapczynski
Robin Appelman