77c18e4ec2
Merge pull request #614 from nextcloud/stable10-ns-server-contributing.md
...
[stable10] change core to server - backport of #533
2016-07-28 11:08:59 +02:00
dbafc183da
change core to server
2016-07-28 09:22:59 +02:00
1fc7248dae
Merge pull request #591 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName-stable10
...
[stable10] Fix undefined OfflineUser::composeAndStoreDisplayName()
2016-07-27 15:25:31 +02:00
0e816a65b5
Merge pull request #580 from nextcloud/backport-550-stable10
...
[stable10] fix autoloading in LPAP integration tests, resolves #544
2016-07-27 14:55:26 +02:00
b0f23598e1
Merge pull request #599 from nextcloud/fix-defaultapp-master-stable10
...
Redirect to default page after login
2016-07-27 14:30:56 +02:00
df3cacdc50
Merge pull request #588 from nextcloud/stable10-app-icons
...
[stable10] Add app icons for Comments and Tags
2016-07-27 13:03:51 +02:00
7c476e4fa2
Redirect to default page after login
2016-07-27 12:14:13 +02:00
ac5987a017
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248
2016-07-27 11:21:26 +02:00
4b96e3a93e
Add icon for tags app
2016-07-27 11:10:52 +02:00
24d3164abe
Add icon for comments app
2016-07-27 11:09:32 +02:00
cb10ca5c23
Merge pull request #569 from nextcloud/stable10-fix-theme-logo-position
...
[stable10] fix theme logo position
2016-07-27 10:21:45 +02:00
1013fac447
fix autoloading in LPAP integration tests, resolves #544
2016-07-26 21:06:29 +02:00
db755d7236
Theming: Fix preview and center alignment of logo
2016-07-26 13:24:41 +02:00
9281b008c5
Adjust tests
2016-07-26 13:24:34 +02:00
a8616f68b5
Update header.css
...
make the logo look good on the login page
2016-07-26 13:24:28 +02:00
148cb09e00
Update themingcontroller.php
2016-07-26 13:24:08 +02:00
010a8b49f3
Merge pull request #562 from nextcloud/stable10-backport-557
...
[stable10] Add proper scope to files external CSS
2016-07-26 12:06:49 +02:00
d5e783d2bd
Add proper scope to files external CSS
...
* for select2
2016-07-26 09:20:40 +02:00
4c45d0fcd3
Merge pull request #551 from nextcloud/stable10-backport-547
...
[stable10] Fix error message while restoring all files
2016-07-25 16:08:14 +02:00
edc15db3bd
Fix error message while restoring all files
...
* use $_POST['files'] only of ssinlge files are restored
* fixes #528
2016-07-25 12:57:18 +02:00
d181301699
Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml
...
[Stable10] AppFramework do not get default response
2016-07-25 12:52:13 +02:00
750644aa15
Merge pull request #548 from nextcloud/backport-530-theming-autoloading
...
[stable10] Make sure we try to autoload the class
2016-07-25 11:10:01 +02:00
28dffaa32f
Make sure we try to autoload the class
2016-07-25 09:42:28 +02:00
3a212651d2
Merge pull request #513 from nextcloud/backport-505-license-mailmap
...
[stable10] license and mailmap backports
2016-07-22 12:58:31 +02:00
09812c60ec
Merge pull request #515 from nextcloud/run-le-script-10
...
[stable10] Run the license script
2016-07-22 12:58:19 +02:00
23b205ed48
Run the license script
2016-07-22 11:40:41 +02:00
a08e201d19
Fix e-mail in mailmap
2016-07-22 11:20:57 +02:00
2d5a854f45
Fix more mailmap entries
2016-07-22 11:20:57 +02:00
d3a11e9cf1
only search the license header for @copyright statements
2016-07-22 11:20:57 +02:00
3f4db2d02b
Fix the license script
2016-07-22 11:20:54 +02:00
49a4654150
Merge pull request #512 from nextcloud/backport-496-doc-fix-10
...
[stable10] Make the changes from doc fix persistant
2016-07-22 11:12:19 +02:00
413968d4ba
FIx typo
2016-07-22 09:54:03 +02:00
f4fbdbabee
Change the app name
2016-07-22 09:24:59 +02:00
c8c78fd981
Make the changes from 6ccd2c5678 persistant
2016-07-22 09:23:50 +02:00
2abd83212e
AppFramework do not get default response
...
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.
This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-21 20:32:48 +02:00
b4c7eb5326
Merge pull request #495 from nextcloud/fix-layout-public-upload-stable10
...
[stable10] move closing div to the right place
2016-07-21 19:50:42 +02:00
f98bc936d7
move closing div to the right place
2016-07-21 11:30:37 +02:00
d8b9672ad8
Merge pull request #485 from nextcloud/stable10-reenable-help-section
...
[Stable10] reenable help section
2016-07-21 09:18:50 +02:00
db5a709885
Merge pull request #487 from nextcloud/stable10-link-proper
...
[stable10] Properly link to nextcloud
2016-07-21 09:18:10 +02:00
cb08ab7c00
Merge pull request #489 from nextcloud/stable10-brand-to-nextcloud
...
[stable10] Use proper branding
2016-07-21 09:17:22 +02:00
0caeb31d83
Use proper branding
...
Stable9 has this already
2016-07-21 02:21:28 +02:00
10f3178215
[master] Properly link to nextcloud
2016-07-21 02:15:37 +02:00
ed21916999
Add proper links
2016-07-21 02:11:34 +02:00
305534225e
Revert "Remove "Help" link from personal sidebar"
...
This reverts commit deef15a3c7
2016-07-21 02:11:30 +02:00
decfd1ab59
Link to proper clients
2016-07-21 01:57:03 +02:00
d4f9a69a72
Port 2d37341 to stable10
2016-07-21 01:46:11 +02:00
fb006181ad
Add ownCloud cert
2016-07-21 01:35:23 +02:00
96c2b0de66
Use proper certificates
...
Ports bcf693539b
2016-07-21 01:35:19 +02:00
acb820ffb8
Merge pull request #483 from nextcloud/use-proper-documentation-links
...
Use proper documentation links
2016-07-21 00:47:27 +02:00
9a1ff29351
Use proper documentation links
...
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
Morris Jobke
Olivier Paroz
Björn Schießle
Thomas Müller
Marius Blüm
Arthur Schiwon
Julius Haertl
Lukas Reschke
Jos Poortvliet
Joas Schilling
Roeland Jago Douma
Roeland Douma