upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22
33445 commits 1040 branches 1221 tags 8.4 GiB
Commit graph

33445 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
155e4ced3f
Generate the checks list in JS 2016-07-27 14:12:12 +02:00
Morris Jobke
01ec62e3d2
fix enabled apps tests 2016-07-27 14:11:53 +02:00
Morris Jobke
b2e4a8c0d3
fix unit tests 2016-07-27 14:11:46 +02:00
Joas Schilling
80eeedc005
Add app to provisioning output 2016-07-27 14:11:36 +02:00
Morris Jobke
497954ca34
Move template to workflowengine app 2016-07-27 14:11:14 +02:00
Morris Jobke
6eabcf134f
create an operation based on the correct model 2016-07-27 14:10:55 +02:00
Morris Jobke
bc6c05afb6
Add workflowengine 2016-07-27 14:10:43 +02:00
Morris Jobke
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
Marius Blüm
4b96e3a93e Add icon for tags app 2016-07-27 11:10:52 +02:00
Marius Blüm
24d3164abe Add icon for comments app 2016-07-27 11:09:32 +02:00
Björn Schießle
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
Julius Haertl
db755d7236
Theming: Fix preview and center alignment of logo 2016-07-26 13:24:41 +02:00
Lukas Reschke
9281b008c5
Adjust tests 2016-07-26 13:24:34 +02:00
Jos Poortvliet
a8616f68b5
Update header.css 
make the logo look good on the login page
 2016-07-26 13:24:28 +02:00
Jos Poortvliet
148cb09e00
Update themingcontroller.php 2016-07-26 13:24:08 +02:00
Morris Jobke
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
Morris Jobke
d5e783d2bd
Add proper scope to files external CSS 
* for select2
 2016-07-26 09:20:40 +02:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
Joas Schilling
28dffaa32f
Make sure we try to autoload the class 2016-07-25 09:42:28 +02:00
Morris Jobke
3a212651d2 Merge pull request #513 from nextcloud/backport-505-license-mailmap 
[stable10] license and mailmap backports
 2016-07-22 12:58:31 +02:00
Morris Jobke
09812c60ec Merge pull request #515 from nextcloud/run-le-script-10 
[stable10] Run the license script
 2016-07-22 12:58:19 +02:00
Joas Schilling
23b205ed48
Run the license script 2016-07-22 11:40:41 +02:00
Roeland Jago Douma
a08e201d19
Fix e-mail in mailmap 2016-07-22 11:20:57 +02:00
Joas Schilling
2d5a854f45
Fix more mailmap entries 2016-07-22 11:20:57 +02:00
Bjoern Schiessle
d3a11e9cf1
only search the license header for @copyright statements 2016-07-22 11:20:57 +02:00
Joas Schilling
3f4db2d02b
Fix the license script 2016-07-22 11:20:54 +02:00
Roeland Douma
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
Joas Schilling
413968d4ba
FIx typo 2016-07-22 09:54:03 +02:00
Joas Schilling
f4fbdbabee
Change the app name 2016-07-22 09:24:59 +02:00
Joas Schilling
c8c78fd981
Make the changes from 6ccd2c5678 persistant 2016-07-22 09:23:50 +02:00
Roeland Jago Douma
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
Morris Jobke
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
Bjoern Schiessle
f98bc936d7
move closing div to the right place 2016-07-21 11:30:37 +02:00
Morris Jobke
d8b9672ad8 Merge pull request #485 from nextcloud/stable10-reenable-help-section 
[Stable10] reenable help section
 2016-07-21 09:18:50 +02:00
Morris Jobke
db5a709885 Merge pull request #487 from nextcloud/stable10-link-proper 
[stable10] Properly link to nextcloud
 2016-07-21 09:18:10 +02:00
Morris Jobke
cb08ab7c00 Merge pull request #489 from nextcloud/stable10-brand-to-nextcloud 
[stable10] Use proper branding
 2016-07-21 09:17:22 +02:00
Lukas Reschke
0caeb31d83
Use proper branding 
Stable9 has this already
 2016-07-21 02:21:28 +02:00
Lukas Reschke
10f3178215
[master] Properly link to nextcloud 2016-07-21 02:15:37 +02:00
Lukas Reschke
ed21916999
Add proper links 2016-07-21 02:11:34 +02:00
Lukas Reschke
305534225e
Revert "Remove "Help" link from personal sidebar" 
This reverts commit deef15a3c7.
 2016-07-21 02:11:30 +02:00
Lukas Reschke
decfd1ab59
Link to proper clients 2016-07-21 01:57:03 +02:00
Lukas Reschke
d4f9a69a72
Port 2d37341 to stable10 2016-07-21 01:46:11 +02:00
Lukas Reschke
fb006181ad
Add ownCloud cert 2016-07-21 01:35:23 +02:00
Lukas Reschke
96c2b0de66
Use proper certificates 
Ports bcf693539b
 2016-07-21 01:35:19 +02:00
Lukas Reschke
acb820ffb8 Merge pull request #483 from nextcloud/use-proper-documentation-links 
Use proper documentation links
 2016-07-21 00:47:27 +02:00
Lukas Reschke
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
Lukas Reschke
2d52cc9fe0
10.0 beta it is 2016-07-21 00:32:43 +02:00