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

33687 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
8fd7edb2c8
Add proper scope to files external CSS 
* for select2
 2016-07-25 17:55:05 +02:00
William Bargent
352e24e703 Merge pull request #292 from nextcloud/recent-files 
Add "Recent" file listing
 2016-07-25 15:25:02 +01:00
Morris Jobke
e51afa1684 Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars 
AppFramework add default values (ApiController) as parameters
 2016-07-25 13:18:53 +02:00
Morris Jobke
88cbde6a66 Merge pull request #550 from nextcloud/ldap-integration-test-autoloader 
fix autoloading in LPAP integration tests, resolves #544
 2016-07-25 12:54:50 +02:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master 
Renamed file logging
 2016-07-25 11:41:24 +02:00
Joas Schilling
6a25e5f0eb Merge pull request #547 from nextcloud/fix-restore-all-files 
Fix error message while restoring all files
 2016-07-25 11:38:05 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544 2016-07-25 11:05:59 +02:00
root
1fb080df2b Merge branch 'master' of https://github.com/nextcloud/server 2016-07-25 16:56:14 +08:00
Robin Appelman
f18338d932 fix test 2016-07-25 10:41:53 +02:00
Morris Jobke
59b87fade5
Fix error message while restoring all files 
* use $_POST['files'] only of ssinlge files are restored
* fixes #528
 2016-07-25 09:24:32 +02:00
Morris Jobke
de4236bc4a Merge pull request #530 from nextcloud/fix-theme-loading 
Make sure we try to autoload the class
 2016-07-25 08:37:13 +02:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Roeland Douma
fcbacd13d6 Merge pull request #533 from nextcloud/oparoz-ns-server-contributing.md 
change core to server
 2016-07-23 15:53:22 +02:00
Joas Schilling
dddd43f5be Merge pull request #534 from nextcloud/twofactor-isset 
Check if an app provide two-factor-auth providers before we try to use them
 2016-07-23 15:49:28 +02:00
Robin Appelman
681ac9f19f Check if an app provide two-factor-auth providers before we try to use them 2016-07-23 13:26:57 +02:00
Olivier Paroz
944110fe49 change core to server 2016-07-23 10:50:00 +02:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Joas Schilling
8cea95390d
Make sure we try to autoload the class 2016-07-22 16:49:33 +02:00
Jan-Christoph Borchardt
dd1a5b9ac3 Fix search box overlapping on mobile (#450) 
* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests
 2016-07-22 15:38:37 +02:00
Robin Appelman
2139a031e7 block user sorting in recent files 2016-07-22 15:20:55 +02:00
Robin Appelman
81e103074e use limit instead of since when listing recent files 2016-07-22 15:20:55 +02:00
Robin Appelman
a4ba3eadd0 fix test 2016-07-22 15:20:55 +02:00
Robin Appelman
2e3114cc28 Add recent file listing 2016-07-22 15:20:51 +02:00
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