Commit graph

33569 commits

Author SHA1 Message Date
Joas Schilling
29a9cb7f1a
Allow to reuse the template 2016-07-27 12:29:49 +02:00
Joas Schilling
d47b7bd4b2
Fix default value of operator 2016-07-27 12:29:30 +02:00
Bjoern Schiessle
4ecd16c555
Redirect to default page after login 2016-07-27 12:11:58 +02:00
Joas Schilling
da97a69148
Allow DI of the workflow manager by the OCP interface 2016-07-27 11:46:09 +02:00
Vincent Petry
aeb4011279
Fix misleading MySQL DB creation error (#25485)
Whenever the GRANT ALL failed, it used to display "Database creation
failed" which is incorrect. It's only the privleges setting that failed.

This moves the privilege setting message to DEBUG and makes it more
precise.
2016-07-27 11:45:13 +02:00
Vincent Petry
77df09d58a
Prevent setting email and triggering events at login time (#25553)
Whenever an LDAP user also has an email address defined in LDAP, the
LDAP code will try and update the email address of the locally known
user. This happens at login time or every time the user's LDAP
attributes are processed.

There is code listening to the email setting hook which updates the
system address book, which also will trigger FS setup due to avatars
and other things.

This fix only sets the email address when really necessary.
2016-07-27 11:28:33 +02:00
Thomas Müller
1177c70b9d
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 2016-07-27 11:17:53 +02:00
Joas Schilling
a3d1cd4ad2
Fix morris comments 2016-07-27 10:38:03 +02:00
Joas Schilling
681eebcfe6
Remove php side of check registration 2016-07-27 10:21:26 +02:00
Joas Schilling
7588f648a1
Generate the checks list in JS 2016-07-27 10:21:26 +02:00
Joas Schilling
318d68a9a9 Merge pull request #565 from nextcloud/workflowengine
Add workflowengine
2016-07-27 10:07:20 +02:00
Morris Jobke
72ae7520d7 Merge pull request #566 from nextcloud/setup-port
revert to old setup connection logic
2016-07-27 10:02:39 +02:00
root
2719dcabed Merge branch 'master' of https://github.com/nextcloud/server 2016-07-27 15:17:29 +08:00
root
1c64ee67af comments amended 2016-07-27 15:16:57 +08:00
root
32fb6beac3 final changes 2016-07-27 15:10:35 +08:00
Morris Jobke
9c21067c19
fix enabled apps tests 2016-07-27 08:36:03 +02:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
blizzz
f88109be75 Merge pull request #349 from nextcloud/ldab-groupOfUniqueNames
add groupOfUniqueNames as valid group object class
2016-07-26 23:32:47 +02:00
Jan-Christoph Borchardt
b709d59a1e Add app icons for Comments and Tags (#579)
* add icon for Comments app

* add icon for Tags app
2016-07-26 19:42:54 +02:00
Morris Jobke
6482be040b
fix unit tests 2016-07-26 16:43:58 +02:00
Joas Schilling
96d466475c
Add app to provisioning output 2016-07-26 16:39:04 +02:00
Morris Jobke
9f4a53429e Merge pull request #563 from nextcloud/log-internet-connection-exception
Log exception that is thrown by internet connection check
2016-07-26 16:22:43 +02:00
Morris Jobke
0e5114ddd7
Move template to workflowengine app 2016-07-26 14:35:01 +02:00
Joas Schilling
1b1ff3bf58 Merge pull request #567 from nextcloud/wb-admin-log-buttons
Orders Admin Log Button
2016-07-26 14:17:22 +02:00
Morris Jobke
8c31ac57ce
create an operation based on the correct model 2016-07-26 12:03:16 +02:00
Robin Appelman
0e83f5dbd7 revert to old setup connection logic 2016-07-26 11:44:15 +02:00
root
3b44d73108 Orders Admin Log Button 2016-07-26 09:27:48 +00:00
Morris Jobke
2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
Joas Schilling
cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position
Fix theme logo position and shape
2016-07-26 10:46:13 +02:00
Morris Jobke
5da813f477
Log exception that is thrown by internet connection check 2016-07-26 10:03:31 +02:00
Morris Jobke
3b6bba09d4 Merge pull request #557 from nextcloud/fix-css-scope-files-external
Add proper scope to files external CSS
2016-07-26 08:58:38 +02:00
Nextcloud bot
31e807b155
[tx-robot] updated from transifex 2016-07-26 00:09:19 +00:00
Julius Haertl
d58ff68531
Theming: Fix preview and center alignment of logo 2016-07-25 18:54:13 +02:00
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