upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-16 23:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 47
31387 commits 1029 branches 1232 tags 8.1 GiB
Commit graph

31387 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
5e2bf16db1
[stable9] Don't show the updater if updater is incompatible 
Prevents us from breaking instances.
 2016-06-13 23:49:46 +02:00
Marius Blüm
757ca9593a Merge pull request #78 from nextcloud/stable9-lgtm-noself 
[stable9] LGTM: no self approval
 2016-06-13 20:28:51 +02:00
Marius Blüm
5c9fa5ade7 [stable9] LGTM: no self approval 2016-06-13 20:19:57 +02:00
Lukas Reschke
ea0e443b88 Merge pull request #72 from nextcloud/stable9-backport-33 
[stable9] Add JS Unit tests
 2016-06-13 18:20:48 +02:00
Morris Jobke
b6e102d3da
place password input directly below label 2016-06-13 16:39:24 +02:00
Morris Jobke
0cbfdf7d8b
revert suspicious change - please check this @schiessle & @LukasReschke 2016-06-13 16:30:20 +02:00
Morris Jobke
12df3eb71d
fix unit tests 2016-06-13 16:28:52 +02:00
Morris Jobke
74a93290aa
Use proper PhantomJS library and run the tests as separate step 
* add dependency for phantomjs
 2016-06-13 14:20:20 +02:00
Lukas Reschke
577cf92009 Merge pull request #70 from nextcloud/show-spinner-again 
[stable9] Show spinner for files_drop again
 2016-06-13 10:25:51 +02:00
Lukas Reschke
f3b299be78
Show spinner for files_drop again 
Somehow the spinner wasn't there anymore after some changes. This makes it appear again.
 2016-06-13 01:07:05 +02:00
Lukas Reschke
3e93bd1e68 9.0.0 alpha it is 2016-06-13 00:46:00 +02:00
Lukas Reschke
470f23c8b9 Merge pull request #54 from nextcloud/backport-upload-only-shares 
[stable9] Backport files drop feature
 2016-06-13 00:26:47 +02:00
Lukas Reschke
4fcc8c9140 Merge pull request #69 from nextcloud/add-owncloud-root-ca 
[stable9] Add ownCloud root CA
 2016-06-13 00:21:45 +02:00
Arthur Schiwon
7f5048e2e5
smaller files drop fixes 
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
 2016-06-13 00:15:09 +02:00
Lukas Reschke
bcf693539b
Add ownCloud root CA 
As the apps from the appstore are at the moment signed by the ownCloud Root CA we have to add it as fallback as well. We can remove that once Nextcloud 10 with new appstore has been released.
 2016-06-13 00:08:48 +02:00
Lukas Reschke
145954d360 Merge pull request #68 from nextcloud/stable9-custom-updater-url 
[stable9] Use custom updater URL
 2016-06-12 23:56:03 +02:00
Lukas Reschke
eb7ed2356f
[stable9] Use custom updater URL 2016-06-12 23:49:23 +02:00
Lukas Reschke
84607f42dc
Link to Nextcloud Android client 2016-06-12 23:14:34 +02:00
Lukas Reschke
ce6479e3dc
Update certificates to 2096 bit 2016-06-12 23:08:01 +02:00
Lukas Reschke
e647ccf375 Merge pull request #67 from nextcloud/signing-certificates 
Use new certificates
 2016-06-12 22:45:15 +02:00
Lukas Reschke
3f8792a28c
Use new certificates 2016-06-12 22:43:00 +02:00
Lukas Reschke
df2902a701 Merge pull request #66 from nextcloud/stable9-downstream-160612 
[Stable9] downstream 16-06-12
 2016-06-12 20:23:47 +02:00
Arthur Schiwon
cd7a1eca3f
Merge branch 'stable9' of https://github.com/owncloud/core into stable9-downstream-160612 2016-06-12 20:14:19 +02:00
Lukas Reschke
fe5a50a21f Merge pull request #65 from nextcloud/add-nextcloud-docs 
Add nextcloud docs
 2016-06-12 19:48:30 +02:00
Lukas Reschke
b4eefc00cd
Link to Nextcloud docs 2016-06-12 19:19:46 +02:00
Lukas Reschke
b60b0f558e
Link to Nextcloud domains in the help section 2016-06-12 19:15:31 +02:00
Lukas Reschke
40950edbab
Revert "Remove "Help" link from personal sidebar" 
This reverts commit 34ad3f7ada.
 2016-06-12 19:12:35 +02:00
Lukas Reschke
689cbb1bbd Merge pull request #64 from nextcloud/stable9-more-patterns-lgtm 
[stable9] Match more patterns for LGTM bot
 2016-06-12 12:05:48 +02:00
Lukas Reschke
352ad5a5b8 Match more patterns for LGTM bot 
Also adds :shipit: and 👍
 2016-06-12 12:00:50 +02:00
Lukas Reschke
7ca1eca653 Merge pull request #62 from nextcloud/stable9-pr 
Stable9 Upload progress Colour Fix
 2016-06-12 11:56:26 +02:00
William Bargent
c791a95267 Upload progress nextcloud blue 2016-06-12 10:01:03 +01:00
William Bargent
f4206f1412 Sets notification background to white 2016-06-12 09:40:30 +01:00
Lukas Reschke
68c38ae8c2
[stable9] Backport files drop feature 2016-06-11 11:38:16 +02:00
Lukas Reschke
96c3a3a647 Merge pull request #51 from nextcloud/fix-some-more-branding-texts 
Adjust some more branding texts
 2016-06-11 10:52:52 +02:00
Lukas Reschke
7cc37b08ed Merge pull request #37 from nextcloud/downstream-stable9-160610 
Downstream stable9 16-06-10
 2016-06-11 10:49:45 +02:00
Lukas Reschke
218e4b48ad
Adjust some more branding texts 
Replaces ownCloud with Nextcloud in the user-facing messages
 2016-06-11 10:46:02 +02:00
Lukas Reschke
bd8d50d125 Merge pull request #44 from nextcloud/stable9-add-same-site-cookies 
[stable9] Add Same Site Cookie protection
 2016-06-11 10:31:24 +02:00
Jan-Christoph Borchardt
7a10bedbc6 Merge pull request #46 from nextcloud/stable9-color-inversion 
invert colors of favicons to match header and log in site, white on blue
 2016-06-10 18:25:41 +02:00
Jan-Christoph Borchardt
d969ceef9e invert colors of favicons to match header and log in site, white on blue 2016-06-10 18:17:48 +02:00
Lukas Reschke
7d92165b99 Merge pull request #43 from nextcloud/stable9-pr 
[stable9] Backport auditing app
 2016-06-10 18:13:53 +02:00
Marius
d152935a80 Merge pull request #40 from nextcloud/stable9-design-nextcloud 
backport design change
 2016-06-10 18:11:47 +02:00
Lukas Reschke
2c6a5fcf91
Add Same Site Cookie protection 2016-06-10 17:15:43 +02:00
Vincent Petry
851b7ca27f Merge pull request #25054 from owncloud/issue-24536-language-name-reused-for-fallback-languages-stable9 
[stable9] Do not use the language name, when it's not the one from the language…
 2016-06-10 17:02:48 +02:00
Bjoern Schiessle
22bbb047a0
log events from versions app 2016-06-10 15:49:58 +02:00
Bjoern Schiessle
0880cba816
listen to trash bin and group manager hooks 2016-06-10 15:49:46 +02:00
Lukas Reschke
c2571cca41
Add basic audit component to logger 
Logs already:
- Share events
- Authentication events
- User management events
- File action events
 2016-06-10 15:44:27 +02:00
Lukas Reschke
6c69cdf860
Add user ID to log entries in admin page 2016-06-10 15:44:24 +02:00
Jan-Christoph Borchardt
8d32813c42 backport design change 2016-06-10 15:31:57 +02:00
Joas Schilling
b4f14f1f48
Do not use the language name, when it's not the one from the language we want 2016-06-10 12:44:12 +02:00
Arthur Schiwon
674e1d0205
Merge branch 'stable9' of https://github.com/owncloud/core into downstream-stable9-160610 2016-06-10 11:42:07 +02:00