wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12685 commits 157 branches 562 tags 714 MiB
Commit graph

12685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
6f5b0af67f Merge pull request #3487 from owncloud/basic_auth_hack 
Basic Auth is broken - again...
 2013-07-14 14:56:45 -07:00
Thomas Müller
2964027cad Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master 2013-07-14 22:00:42 +02:00
Thomas Müller
79d23463f8 No admin option to enable public upload in case encryption is enabled 
No upload on pubic page if public upload is disabled
 2013-07-14 21:58:08 +02:00
Jan-Christoph Borchardt
7cc22443e3 Merge pull request #4061 from rolandgeider/master 
Use transifex.com on link to translations
 2013-07-14 10:52:43 -07:00
rolandgeider
995feea42a Use transifex.com on link to translations 2013-07-14 11:54:39 +02:00
Jenkins for ownCloud
29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
kondou
0d604a6c9a Include $defaults 2013-07-13 18:44:36 +02:00
Michael Gapczynski
00e2b46017 Fix 'most' Google Drive tests 2013-07-13 11:02:07 -04:00
Frank Karlitschek
ccb3c5b428 Removed the preview warning. This is only a simple text change 2013-07-13 13:31:55 +02:00
Bart Visscher
5549c77ec5 Merge branch 'master' into doctrine 
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
 2013-07-13 12:01:14 +02:00
Jenkins for ownCloud
583addaea1 [tx-robot] updated from transifex 2013-07-13 02:07:35 +02:00
Thomas Mueller
7a44d45714 change anonymous to public 2013-07-12 21:34:38 +02:00
Thomas Müller
c3e16a7388 fixing Undefined index: publicUploadEnabled 2013-07-12 17:51:01 +02:00
Thomas Müller
5f5700e353 in case the encryption app is enabled we cannot yet allow anonymous upload 2013-07-12 17:05:58 +02:00
Thomas Müller
fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Thomas Müller
d1c0564711 Merge branch 'master' into ext-fs-irods-master 2013-07-12 15:30:01 +02:00
Thomas Müller
ca16c08ba1 update copy right 2013-07-12 15:28:01 +02:00
Thomas Müller
e9c10f65b4 update .gitignore 2013-07-12 15:16:30 +02:00
Thomas Müller
01378e1907 incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp 2013-07-12 15:08:13 +02:00
Kondou
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
Björn Schießle
b16c5a6df7 fix array access and change variable names according to the coding style 2013-07-12 11:25:40 +02:00
Björn Schießle
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
Björn Schießle
fbf34f3bf6 fix some var names according to our style guide 2013-07-12 11:25:23 +02:00
Björn Schießle
2f0d88cae4 adjust comments 2013-07-12 11:25:12 +02:00
Björn Schießle
e7959d3da0 fix typo in comment 2013-07-12 11:25:04 +02:00
Björn Schießle
e8760d7284 also expire versions on rename, to update the history more regularly 2013-07-12 11:24:52 +02:00
Björn Schießle
d6c1e5490d it is enough to call the expire function once 2013-07-12 11:24:31 +02:00
Björn Schießle
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
Björn Schießle
cb81ceb31d add new file above summary if it is the first file in the list 2013-07-12 10:40:24 +02:00
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