e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
dc1a17b6f4
memcache: also switch factory to prefix
2013-07-16 16:08:37 +02:00
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
8ad148feaf
memcache: some additional unit tests
2013-07-16 15:46:27 +02:00
69048ab71f
memchache: use prefix string instead of global flag
2013-07-16 15:42:40 +02:00
d82c1dfcab
split out memcache factory from base class
2013-07-16 15:34:22 +02:00
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
d673d8c253
Merge pull request #4075 from owncloud/markdown-readme-master
...
Markdown readme master
2013-07-16 02:29:58 -07:00
feb01847e7
Merge pull request #4076 from owncloud/fix_typos_kondou
...
Fix some typos
2013-07-16 01:23:16 -07:00
7403cfff8b
update 'get in touch' links
2013-07-16 09:50:06 +02:00
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
d9c697534d
Fix some typos
2013-07-16 06:01:26 +02:00
bfa0496fbb
initial markdown verions of README
2013-07-15 23:58:51 +02:00
a457501394
rename README
2013-07-15 23:46:28 +02:00
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
icewind1991
Bart Visscher
Robin Appelman
Thomas Müller
VicDeo
Jan-Christoph Borchardt
kondou
rolandgeider
Frank Karlitschek
Björn Schießle
Jörn Friedrich Dreyer
Morris Jobke
Arthur Schiwon
Victor Dubiniuk