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

33662 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
9dafc516a7 Merge pull request #524 from nextcloud/ocs_appframework_status_code 
Set proper status code in OCS AppFramework Middleware
 2016-07-22 15:15:20 +02:00
Lukas Reschke
8457c617e0
Adjust tests 2016-07-22 14:58:30 +02:00
Joas Schilling
af39501465 Merge pull request #526 from nextcloud/bumb-app-requirements 
bumb compatible app versions for core apps
 2016-07-22 14:51:06 +02:00
Robin Appelman
b94ff97a77 add recent files api endpoint 2016-07-22 14:48:51 +02:00
Roeland Douma
1533780dde Merge pull request #522 from nextcloud/ocs_correct_login_exception 
OCS correctly handle login exception
 2016-07-22 14:47:53 +02:00
Thomas Pulzer
61a1d56d27 Renamed test classes for file logging tests. 2016-07-22 14:47:50 +02:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Thomas Pulzer
b058639a8a Changed code style and made use of '===' comparison. 2016-07-22 14:45:33 +02:00
Robin Appelman
e321ecd592 add recent files to node api 2016-07-22 14:39:32 +02:00
Thomas Pulzer
32f5073f9f Reverted the default syslog tag to avoid breaking existing systems. 2016-07-22 14:38:44 +02:00
Robin Appelman
d499f68fd7 Fix storage id with storage jail 2016-07-22 14:34:59 +02:00
Jos Poortvliet
642f59e159 Update header.css 
make the logo look good on the login page
 2016-07-22 14:23:00 +02:00
Roeland Jago Douma
67ce87dca7
Fix intergration tests 2016-07-22 13:37:32 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Roeland Jago Douma
72b06d250d
Add tests 2016-07-22 12:53:47 +02:00
Roeland Jago Douma
b543fd8d30
Set proper status code in OCS AppFramework Middleware 2016-07-22 12:53:47 +02:00
Jos Poortvliet
183d4d8e99 Update themingcontroller.php 2016-07-22 12:25:58 +02:00
Thomas Pulzer
ba3f4f118e Changed logtype to file instead of owncloud. 
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.
 2016-07-22 11:44:19 +02:00
Roeland Jago Douma
8ae49183c1
Catch LoginException 2016-07-22 11:43:47 +02:00
Joas Schilling
194c385c7a Merge pull request #517 from nextcloud/fix-typo 
Fix typo in docs
 2016-07-22 11:41:20 +02:00
root
c1b37e4ccb Merge branch 'master' of https://github.com/nextcloud/server 2016-07-22 16:47:27 +08:00
root
02ec8b1726 New LDAPProvider for user_ldap 2016-07-22 16:46:29 +08:00
Roeland Jago Douma
1b73a63041
Inject parameters 2016-07-22 10:12:26 +02:00
Joas Schilling
03cb588ea9 Merge pull request #500 from nextcloud/bump_version 
Bump version
 2016-07-22 10:03:42 +02:00
Joas Schilling
398d1591ca
Use app name from stable9 2016-07-22 09:55:46 +02:00
Joas Schilling
04b5cb849e
Fix typo 2016-07-22 09:55:38 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke
363ca21085 Merge pull request #505 from nextcloud/fix-license-script 
Fix the license script
 2016-07-21 23:48:31 +02:00
Morris Jobke
febf95ffb4 Merge pull request #496 from nextcloud/fix-config-generation 
Make the changes from doc fix persistant
 2016-07-21 23:37:22 +02:00
Morris Jobke
8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script 
Update emails and license headers with latest changes
 2016-07-21 23:27:15 +02:00
William Bargent
6da54a6987 Merge pull request #374 from lpszBuffer/master 
Alters 'No Internet Connection' error message. #181
 2016-07-21 18:55:58 +01:00
Lukas Reschke
562e63cf69 Merge pull request #480 from nextcloud/fix_ocs_response_format 
AppFramework default response for OCS is xml
 2016-07-21 19:52:17 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc
Fix others 2016-07-21 18:13:57 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Bjoern Schiessle
b64c6d6993
only search the license header for @copyright statements 2016-07-21 18:06:31 +02:00
Joas Schilling
c98de829c4
Fix the license script 2016-07-21 18:06:31 +02:00
Joas Schilling
8ec019e105 Merge pull request #506 from nextcloud/update-mailmap 
Fix more mailmap entries
 2016-07-21 17:43:33 +02:00
Joas Schilling
c2e76908b7
Fix more mailmap entries 2016-07-21 17:32:03 +02:00
Björn Schießle
3ae6254d35 Merge pull request #501 from nextcloud/mailmap 
Fix e-mail in mailmap
 2016-07-21 16:38:55 +02:00
Joas Schilling
86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Roeland Jago Douma
fac430ea9a
Fix e-mail in mailmap 2016-07-21 14:48:26 +02:00
Roeland Jago Douma
00b78262e6
Bump version 2016-07-21 14:44:52 +02:00
Joas Schilling
1902105b5f
Change the app name 2016-07-21 12:57:05 +02:00
Joas Schilling
9c6c902220
Make the changes from 6ccd2c5678 persistant 2016-07-21 12:26:48 +02:00
Morris Jobke
dc5608d15a Merge pull request #477 from nextcloud/fix-layout-public-upload 
move closing div to the right place
 2016-07-21 09:28:35 +02:00
Morris Jobke
ca6c2c7855 Merge pull request #484 from nextcloud/reenable-help-section 
[master] Reenable help section
 2016-07-21 09:19:11 +02:00
Morris Jobke
167caa1295 Merge pull request #486 from nextcloud/master-link-proper 
[master] Properly link to nextcloud
 2016-07-21 09:17:53 +02:00
Morris Jobke
d14098736e Merge pull request #488 from nextcloud/brand-to-nextcloud 
[master] Use proper branding
 2016-07-21 09:16:56 +02:00
Lukas Reschke
14b1edeb5d
Add proper links 2016-07-21 02:25:00 +02:00