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

5498 commits

Author SHA1 Message Date
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
52eab2a61a [tx-robot] updated from transifex 2016-06-26 01:55:53 -04:00
Vincent Petry
dc78d26f2a Merge pull request #25239 from owncloud/setupchecks-preventreload 
Don't reload page in case of auth errors during setup checks
 2016-06-24 09:47:55 +02:00
Vincent Petry
97f1813695
Don't reload page in case of auth errors during setup checks 
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
 2016-06-23 11:54:49 +02:00
Joachim Sokolowski
d7d7b49647 to Nextcloud 2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js 2016-06-22 16:58:06 +02:00
VicDeo
854352d9a0 occ web executor (#24957) 
* Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
 2016-06-22 13:12:36 +02:00
Morris Jobke
7e186194c4
Fix translation strings 2016-06-22 10:27:24 +02:00
Morris Jobke
7ba89b1175 Merge pull request #196 from JSoko/patch-2 
singleuser.user.php -> nextcloud
 2016-06-22 10:25:03 +02:00
Joachim Sokolowski
a83cbee717 changed to nextcloud 2016-06-22 08:20:23 +02:00
Joachim Sokolowski
1ffd8d0d96 nextcloud server 
nextcloud server
 2016-06-22 08:07:45 +02:00
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Joachim Sokolowski
64a9f9d77b singleuser.user.php -> nextcloud 
Changed to nextcloud
 2016-06-22 07:48:36 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Jan-Christoph Borchardt
5df13ec5c4 make loading spinner thicker and color lighter 2016-06-20 11:00:42 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Robin Appelman
8485f5bcb1 Prevent the advanced options toggle in the setup from acting as a link 2016-06-16 15:25:56 +02:00
Jan-Christoph Borchardt
44910510f6 fix grouped input fields, make sure they take precedence 2016-06-16 11:43:57 +02:00
Marius Blüm
d9be370b86 Merge pull request #83 from nextcloud/file-drop-highlight 
File drop highlight
 2016-06-15 17:36:16 +02:00
Morris Jobke
3720bae3ec
fix setup page strengthify 
* fixes #105
 2016-06-15 15:27:30 +02:00
Morris Jobke
a1b1d6ac7d
Update strengthify to 0.5.1 2016-06-15 15:20:21 +02:00
Vincent Chan
10f8d643dc store icons in class 2016-06-15 14:42:39 +02:00
Jenkins for ownCloud
be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Morris Jobke
5e2726c0e7
Change name of the product in update message 
* also update all german translations
* fixes #96
 2016-06-14 17:02:55 +02:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Lukas Reschke
01f8434a75 Merge pull request #57 from nextcloud/fdrop-template 
smaller files drop fixes
 2016-06-13 00:14:34 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon
ca43c49709
smaller files drop fixes 
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
 2016-06-11 15:15:37 +02:00
William Bargent
e90931c99b Upload progress nextcloud blue 2016-06-11 08:47:29 +01:00
William Bargent
25470e6992 Sets notification background to white 2016-06-11 08:15:56 +01:00
Lukas Reschke
842cc2a788 Merge pull request #19 from nextcloud/files-drop 
add "hide file list" option
 2016-06-10 18:29:09 +02:00
Jan-Christoph Borchardt
6a89518e98 invert colors of favicons to match header and log in site, white on blue 2016-06-10 18:03:29 +02:00
Jörn Friedrich Dreyer
c45b7b0bdf Allow empty host when installing on oracle via CLI (#25034) 2016-06-10 11:16:32 +02:00
William Bargent
d64f46afae Single block for PHP Mod not installed 2016-06-10 09:44:41 +01:00
Vincent Petry
6660488b73 Merge pull request #25048 from owncloud/email-login-leak 
Do not leak the login name
 2016-06-10 10:41:27 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09 
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
 2016-06-09 18:45:12 +02:00
Lukas Reschke
0b00a06a0d
Fix indentation 2016-06-09 18:17:04 +02:00
Lukas Reschke
5fdde426eb
Add fancy layout 2016-06-09 17:55:26 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Thomas Müller
232d735893
Do not leak the login name - fixes #25047 2016-06-09 16:44:31 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Joas Schilling
4c26abe228 Fix the FIXME (#25022) 2016-06-09 15:05:02 +02:00
Joas Schilling
7f88645eab
Allow to cancel 2FA after login 2016-06-09 14:00:02 +02:00
Sergio Bertolín
fad91e92f0
Fixed reviews 2016-06-09 14:00:00 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only 2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user 2016-06-09 14:00:00 +02:00
davitol
3b5c169869
Comments fixed 2016-06-09 13:59:59 +02:00