Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
96c2b0d
Use proper certificates
LukasReschke Jul 20, 2016
fb00618
Add ownCloud cert
LukasReschke Jul 20, 2016
d4f9a69
Port 2d37341 to stable10
LukasReschke Jul 20, 2016
decfd1a
Link to proper clients
LukasReschke Jul 20, 2016
3055342
Revert "Remove "Help" link from personal sidebar"
LukasReschke Jul 21, 2016
ed21916
Add proper links
LukasReschke Jul 21, 2016
10f3178
[master] Properly link to nextcloud
LukasReschke Jul 21, 2016
0caeb31
Use proper branding
LukasReschke Jul 21, 2016
cb08ab7
Merge pull request #489 from nextcloud/stable10-brand-to-nextcloud
MorrisJobke Jul 21, 2016
db5a709
Merge pull request #487 from nextcloud/stable10-link-proper
MorrisJobke Jul 21, 2016
d8b9672
Merge pull request #485 from nextcloud/stable10-reenable-help-section
MorrisJobke Jul 21, 2016
f98bc93
move closing div to the right place
schiessle Jul 20, 2016
b4c7eb5
Merge pull request #495 from nextcloud/fix-layout-public-upload-stable10
MorrisJobke Jul 21, 2016
2abd832
AppFramework do not get default response
rullzer Jul 20, 2016
c8c78fd
Make the changes from https://github.com/nextcloud/documentation/comm…
nickvergessen Jul 21, 2016
f4fbdba
Change the app name
nickvergessen Jul 21, 2016
413968d
FIx typo
nickvergessen Jul 22, 2016
49a4654
Merge pull request #512 from nextcloud/backport-496-doc-fix-10
rullzer Jul 22, 2016
3f4db2d
Fix the license script
nickvergessen Jul 21, 2016
d3a11e9
only search the license header for @copyright statements
schiessle Jul 21, 2016
2d5a854
Fix more mailmap entries
nickvergessen Jul 21, 2016
a08e201
Fix e-mail in mailmap
rullzer Jul 21, 2016
23b205e
Run the license script
nickvergessen Jul 22, 2016
09812c6
Merge pull request #515 from nextcloud/run-le-script-10
MorrisJobke Jul 22, 2016
3a21265
Merge pull request #513 from nextcloud/backport-505-license-mailmap
MorrisJobke Jul 22, 2016
28dffaa
Make sure we try to autoload the class
nickvergessen Jul 22, 2016
750644a
Merge pull request #548 from nextcloud/backport-530-theming-autoloading
MorrisJobke Jul 25, 2016
d181301
Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml
MorrisJobke Jul 25, 2016
edc15db
Fix error message while restoring all files
MorrisJobke Jul 25, 2016
4c45d0f
Merge pull request #551 from nextcloud/stable10-backport-547
MorrisJobke Jul 25, 2016
d5e783d
Add proper scope to files external CSS
MorrisJobke Jul 25, 2016
010a8b4
Merge pull request #562 from nextcloud/stable10-backport-557
MorrisJobke Jul 26, 2016
148cb09
Update themingcontroller.php
Jul 22, 2016
a8616f6
Update header.css
Jul 22, 2016
9281b00
Adjust tests
LukasReschke Jul 22, 2016
db755d7
Theming: Fix preview and center alignment of logo
juliusknorr Jul 25, 2016
1013fac
fix autoloading in LPAP integration tests, resolves #544
blizzz Jul 25, 2016
cb10ca5
Merge pull request #569 from nextcloud/stable10-fix-theme-logo-position
schiessle Jul 27, 2016
24d3164
Add icon for comments app
MariusBluem Jul 27, 2016
4b96e3a
Add icon for tags app
MariusBluem Jul 27, 2016
ac5987a
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() -…
DeepDiver1975 Jul 25, 2016
7c476e4
Redirect to default page after login
schiessle Jul 27, 2016
df3cacd
Merge pull request #588 from nextcloud/stable10-app-icons
MorrisJobke Jul 27, 2016
b0f2359
Merge pull request #599 from nextcloud/fix-defaultapp-master-stable10
schiessle Jul 27, 2016
0e816a6
Merge pull request #580 from nextcloud/backport-550-stable10
MorrisJobke Jul 27, 2016
1fc7248
Merge pull request #591 from nextcloud/fixing-undefined-OfflineUser-c…
MorrisJobke Jul 27, 2016
dbafc18
change core to server
oparoz Jul 28, 2016
8856009
fix searchbox overlapping on mobile
jancborchardt Jul 19, 2016
12a35e4
also adjust log in background color in theme
jancborchardt Jul 19, 2016
c9b4a2b
Fix unit tests
MorrisJobke Jul 21, 2016
77c18e4
Merge pull request #614 from nextcloud/stable10-ns-server-contributin…
MorrisJobke Jul 28, 2016
6990a4e
Support subdir in the OCS v2 endpoint
rullzer Jul 27, 2016
e184e4a
Merge pull request #609 from nextcloud/stable10_606
rullzer Jul 28, 2016
b1830b7
Merge pull request #622 from nextcloud/stable10-fix-searchbox-background
MorrisJobke Jul 28, 2016
5c12c8c
Theming: Preview for colorized checkboxes
juliusknorr Jul 19, 2016
49ef994
Theming: Colorize checkboxes depending on luminance
juliusknorr Jul 19, 2016
aa4e133
Theming: Clean up css generation and fix tests
juliusknorr Jul 19, 2016
b7024b4
Theming: Colorize radio buttons and append new styles on preview
juliusknorr Jul 25, 2016
1f3e55b
Theming: Generate colorized radio buttons dynamically
juliusknorr Jul 25, 2016
4eb85f1
Theming: Cleanup and remove opacity from checkbox/radiobutton
juliusknorr Jul 27, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use proper branding
Stable9 has this already
  • Loading branch information
LukasReschke committed Jul 21, 2016
commit 0caeb31d832b717232c52c02ea8fe834722b0df4
4 changes: 2 additions & 2 deletions apps/federation/templates/settings-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<h3><?php p($l->t('Trusted Servers')); ?></h3>
<p id="ocFederationAddServer">
<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add ownCloud server')); ?></button>
<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('ownCloud Server')); ?>" name="server_url"/>
<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add Nextcloud server')); ?></button>
<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Nextcloud Server')); ?>" name="server_url"/>
<span class="msg"></span>
</p>
<ul id="listOfTrustedServers">
Expand Down