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
cba370634f
Add a simple Admin UI to manage systemtags
2016-07-28 10:37:48 +02:00
aa02f518ad
Backport LDAPProvider to Nextcloud 10
...
New LDAPProvider for user_ldap
final changes
comments amended
Nextcloud license header for new files
2016-07-28 10:20:38 +02:00
c9b4a2b4cc
Fix unit tests
2016-07-28 10:08:36 +02:00
12a35e46ce
also adjust log in background color in theme
2016-07-28 10:08:02 +02:00
88560096d4
fix searchbox overlapping on mobile
2016-07-28 10:07:57 +02:00
dbafc183da
change core to server
2016-07-28 09:22:59 +02:00
05b6850a9e
fix js test
2016-07-27 16:38:07 +02:00
b9dfc1674c
only load sidebar previews when we know it's available
2016-07-27 16:38:03 +02:00
276383ebf5
dont load filelist previews if we know we dont have one
2016-07-27 16:37:59 +02:00
76b2cffb08
add dav property to check if a file has a preview available
2016-07-27 16:37:56 +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
8e0e85c631
Fix loading icon for workflowengine
2016-07-27 14:13:18 +02:00
2a4a1278fa
Allow DI of the workflow manager by the OCP interface
2016-07-27 14:13:08 +02:00
ec8ec17cf4
Allow to reuse the template
2016-07-27 14:12:47 +02:00
0ebc3bbc9f
Fix default value of operator
2016-07-27 14:12:39 +02:00
34f46c8e7f
Fix morris comments
2016-07-27 14:12:28 +02:00
6a21289378
Remove php side of check registration
2016-07-27 14:12:19 +02:00
155e4ced3f
Generate the checks list in JS
2016-07-27 14:12:12 +02:00
01ec62e3d2
fix enabled apps tests
2016-07-27 14:11:53 +02:00
b2e4a8c0d3
fix unit tests
2016-07-27 14:11:46 +02:00
80eeedc005
Add app to provisioning output
2016-07-27 14:11:36 +02:00
497954ca34
Move template to workflowengine app
2016-07-27 14:11:14 +02:00
6eabcf134f
create an operation based on the correct model
2016-07-27 14:10:55 +02:00
bc6c05afb6
Add workflowengine
2016-07-27 14:10:43 +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
b9266e7141
Prevent setting email and triggering events at login time ( #25554 )
...
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:32:10 +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
Morris Jobke
Joas Schilling
root
Jan-Christoph Borchardt
Olivier Paroz
Robin Appelman
Björn Schießle
Vincent Petry
Thomas Müller
Marius Blüm
Arthur Schiwon
Julius Haertl
Lukas Reschke
Jos Poortvliet
Roeland Jago Douma