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

1706 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
ab77af7b4d Merge pull request #4159 from owncloud/Fixing-share-sj-error 
Fixing share JS error
 2013-07-23 08:23:15 -07:00
Victor Dubiniuk
ab997bdc68 Create an array entry before filling it 2013-07-23 14:57:58 +03:00
Jenkins for ownCloud
a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Victor Dubiniuk
5160ea6063 Show generic error when there is no error 2013-07-22 21:02:18 +03:00
Thomas Müller
934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Morris Jobke
647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment 
finally remove the file size obfuscation as it had more disadvantages.
 2013-07-21 01:25:39 -07:00
Jenkins for ownCloud
9a13b687cc [tx-robot] updated from transifex 2013-07-21 02:02:41 -04:00
Jan-Christoph Borchardt
35fc149ef0 deactivate show password toggle for IE 2013-07-19 15:17:28 +02:00
Jenkins for ownCloud
ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Jan-Christoph Borchardt
48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Jenkins for ownCloud
279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
210006c4a6 [tx-robot] updated from transifex 2013-07-17 02:28:02 -04:00
Jenkins for ownCloud
a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
Jenkins for ownCloud
583addaea1 [tx-robot] updated from transifex 2013-07-13 02:07:35 +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
Jenkins for ownCloud
3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +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
kondou
4cd87549e1 Close.png instead of delete.png for close dialogs 2013-07-10 04:39:22 +02:00
Jenkins for ownCloud
7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02: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
icewind1991
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
Jan-Christoph Borchardt
8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup 
Icon cleanup
 2013-07-08 06:56:29 -07:00
Jenkins for ownCloud
096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Robin Appelman
58f473d734 split upgrade logic from ajax file 2013-07-06 17:00:00 +02:00
Jenkins for ownCloud
c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller
18b11f76b1 fixing === and ident 2013-07-05 15:27:14 +02:00
Thomas Müller
59b700a550 Merge branch 'master' into fixing-3934-master 
Conflicts:
	core/js/share.js
 2013-07-05 13:52:33 +02:00
Thomas Müller
27c0cc7fda no anonymous upload on read-only folders 2013-07-05 11:23:08 +02:00
Thomas Müller
13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
Björn Schießle
83898e87be Merge https://github.com/owncloud/core/pull/3900 
Squashed commit of the following:

commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jul 5 09:59:29 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:03:47 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 10:38:39 2013 +0200

    switch to non-static defaults.php

commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:59:48 2013 +0200

    Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer

    Conflicts:
    	core/templates/altmail.php

commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:56:29 2013 +0200

    name and slogan should be in one line

commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Mon Jul 1 21:15:35 2013 +0200

    no ?> at the end of a file

commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:58:36 2013 +0200

    print url unescaped

commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:56:05 2013 +0200

    make new mail templates aware of different ownCloud themes
 2013-07-05 10:07:23 +02:00
Jenkins for ownCloud
955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
Jan-Christoph Borchardt
b9be693305 change delete from entry forbidden sign to proper icon 2013-07-05 01:51:09 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Jenkins for ownCloud
51cfacd789 [tx-robot] updated from transifex 2013-07-04 09:33:58 +02:00
Jenkins for ownCloud
811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02:00
Victor Dubiniuk
16e5a1b100 Fix lazy styles loading in IE8 2013-07-02 18:44:10 +03:00
Jenkins for ownCloud
cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Björn Schießle
d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +02:00
Björn Schießle
23cc69b816 construct the foother in defaults.php so that we use always the same footer 
Conflicts:

	settings/templates/admin.php
 2013-07-01 10:46:00 +02:00
Morris Jobke
b19033b353 Merge pull request #3223 from owncloud/fix-2820 
if rename of file fails, the rename is undone in the view - fix 2820
 2013-07-01 01:28:17 -07:00
Jenkins for ownCloud
80a8b9c995 [tx-robot] updated from transifex 2013-07-01 03:28:25 +02:00
Jenkins for ownCloud
4d74e8955f [tx-robot] updated from transifex 2013-06-30 02:13:07 +02:00
Lukas Reschke
0217315a24 Escape dropdown 
Fixes #3241
 2013-06-29 13:24:05 +02:00
Bart Visscher
414b5f150e Merge pull request #2914 from Kondou-ger/label_overlapping_value 
Fix textfield label overlapping value.
 2013-06-29 04:09:50 -07:00
Jenkins for ownCloud
d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00
Jörn Friedrich Dreyer
7d3490036c Merge pull request #3838 from rgeber/master 
Public Upload Feature
 2013-06-28 07:30:41 -07:00