Morris Jobke
|
865efa5740
|
fix mysql error handling
|
2016-06-23 17:05:31 +02:00 |
Morris Jobke
|
41436fecc2
|
Add mysql job to CI
|
2016-06-23 10:48:20 +02:00 |
Morris Jobke
|
77c1175894
|
Merge pull request #204 from JSoko/master
de language files changed to Nextcloud
|
2016-06-22 22:14:40 +02:00 |
Joachim Sokolowski
|
d7d7b49647
|
to Nextcloud
|
2016-06-22 17:41:01 +02:00 |
Joachim Sokolowski
|
553a151fc6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into nextcloud/master
|
2016-06-22 13:10:40 +02:00 |
Joachim Sokolowski
|
690062a634
|
Merge remote-tracking branch 'refs/remotes/nextcloud/master'
|
2016-06-22 11:13:01 +02:00 |
Lukas Reschke
|
c347a35ab6
|
Merge pull request #201 from nextcloud/followup-to-196
Fix translation strings
|
2016-06-22 11:02:57 +02:00 |
Morris Jobke
|
7e186194c4
|
Fix translation strings
|
2016-06-22 10:27:24 +02:00 |
Morris Jobke
|
7ba89b1175
|
Merge pull request #196 from JSoko/patch-2
singleuser.user.php -> nextcloud
|
2016-06-22 10:25:03 +02:00 |
Morris Jobke
|
4d4e579dbc
|
Merge pull request #197 from JSoko/master
changed to nextcloud
|
2016-06-22 10:13:12 +02:00 |
Joachim Sokolowski
|
fa19e4c2eb
|
some text-changes to nextcloud
|
2016-06-22 08:41:10 +02:00 |
Joachim Sokolowski
|
a83cbee717
|
changed to nextcloud
|
2016-06-22 08:20:23 +02:00 |
Joachim Sokolowski
|
1ffd8d0d96
|
nextcloud server
nextcloud server
|
2016-06-22 08:07:45 +02:00 |
Joachim Sokolowski
|
2d76fbf3ca
|
Merge remote-tracking branch 'refs/remotes/nextcloud/master'
|
2016-06-22 07:59:18 +02:00 |
Joachim Sokolowski
|
64a9f9d77b
|
singleuser.user.php -> nextcloud
Changed to nextcloud
|
2016-06-22 07:48:36 +02:00 |
Marius Blüm
|
ce923d7b83
|
Merge pull request #194 from JSoko/patch-1
default.php for nextcloud themes example
|
2016-06-22 06:41:54 +02:00 |
Joachim Sokolowski
|
235e2fc68e
|
default.php for nextcloud
changing it to nextcloud
|
2016-06-21 17:27:02 +02:00 |
Lukas Reschke
|
638a713008
|
Merge pull request #191 from nextcloud/ci-postgres
Add postgres to CI
|
2016-06-21 16:46:30 +02:00 |
Morris Jobke
|
6583a2fef0
|
Add postgres to CI
|
2016-06-21 16:05:48 +02:00 |
Lukas Reschke
|
3985055cda
|
Merge pull request #188 from nextcloud/add-wnd
Add "Global Auth" option to external storage
|
2016-06-21 14:53:44 +02:00 |
Robin Appelman
|
6affbdc6e7
|
Add "Global Auth" option to external storage
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93 from https://github.com/owncloud/core/pull/22468.
This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.
![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
|
2016-06-21 14:16:45 +02:00 |
Lukas Reschke
|
097cba8b38
|
Merge pull request #185 from nextcloud/fix-permission-issue
Show error message if config file is not readable
|
2016-06-21 12:14:24 +02:00 |
Lukas Reschke
|
e6895cb3b5
|
Merge pull request #186 from nextcloud/master-sync-upstream
[master] sync upstream - 21.06.2016
|
2016-06-21 11:43:15 +02:00 |
Morris Jobke
|
191a6c65d9
|
Show error message if config file is not readable
* when the config file is not writable there is a error message shown
* same happens now if the config file is not readable
* fixes #180
|
2016-06-21 11:25:38 +02:00 |
Lukas Reschke
|
2b493e2f9d
|
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
|
2016-06-21 11:18:22 +02:00 |
Jenkins for ownCloud
|
0e575c7eea
|
[tx-robot] updated from transifex
|
2016-06-21 03:49:50 -04:00 |
Morris Jobke
|
b4df57f3f0
|
Merge pull request #176 from Zollak/replace-owncloud-configsample
replaced ownCloud by Nextcloud in config sample
|
2016-06-20 23:27:44 +02:00 |
Robin Appelman
|
bb465a7ab4
|
Catch exceptions while creating shared mounts (#25077)
|
2016-06-20 22:11:05 +02:00 |
Vincent Petry
|
dcee528482
|
Don't send activity to non-admins when assigning invisible tags (#25192)
|
2016-06-20 22:06:34 +02:00 |
Patric Lenhart
|
46d6839914
|
replaced ownCloud by Nextcloud in config sample
|
2016-06-20 20:00:18 +02:00 |
Vincent Petry
|
ef5217d6e8
|
Merge pull request #25173 from owncloud/fix_conversion_issues
Fix conversion issues
|
2016-06-20 17:15:45 +02:00 |
Vincent Petry
|
88b9f5a357
|
Merge pull request #25162 from owncloud/password-login-forbidden-hint
Password login forbidden hint
|
2016-06-20 17:05:20 +02:00 |
Morris Jobke
|
232ab8f6dd
|
Merge pull request #122 from nextcloud/readd-labels-for-usability
Re-add labels for password inputs for usability
|
2016-06-20 15:14:00 +02:00 |
Björn Schießle
|
987704b27b
|
Merge pull request #168 from nextcloud/fix-references-trash-and-versions
no need to mention ownCloud explicitely in the versions and trash bin app
|
2016-06-20 15:12:29 +02:00 |
Morris Jobke
|
8bcc39ff1b
|
Merge pull request #159 from nextcloud/stable9-reintroduce-hackerone
[stable9] Reintroduce HackerOne into CONTRIBUTING.md
|
2016-06-20 15:08:48 +02:00 |
Morris Jobke
|
2a79cba955
|
Merge pull request #158 from nextcloud/reintroduce-hackerone
Reintroduce HackerOne into CONTRIBUTING.md
|
2016-06-20 15:08:34 +02:00 |
Juan Pablo Villafáñez
|
bb24e40bf4
|
Fix conversion issues
Change to phpdoc type for automatic conversion
|
2016-06-20 14:51:36 +02:00 |
Bjoern Schiessle
|
548b8848ee
|
no need to mention ownCloud explicitely
|
2016-06-20 14:46:13 +02:00 |
Björn Schießle
|
61a3daa55d
|
Merge pull request #165 from nextcloud/fix-owncloud-references-federated
fix references to ownCloud in the federated files sharing app
|
2016-06-20 14:40:33 +02:00 |
Bjoern Schiessle
|
9eaccaf2b1
|
s/ownCloud/Nextcloud
|
2016-06-20 14:20:48 +02:00 |
Morris Jobke
|
22fd33137f
|
Merge pull request #162 from nextcloud/fix-owncloud-reference
Fix references
|
2016-06-20 14:19:30 +02:00 |
Morris Jobke
|
62e6de5df3
|
fix unit tests
|
2016-06-20 13:52:51 +02:00 |
Vincent Petry
|
c1770d746d
|
Merge pull request #25159 from owncloud/share-app-initorder
Delay files_sharing's registerMountProviders
|
2016-06-20 13:31:36 +02:00 |
Morris Jobke
|
1cba82ae7d
|
Merge pull request #164 from nextcloud/fix_audit_log
don't try to log the currently logged in user, this fails on cronjobs…
|
2016-06-20 13:27:25 +02:00 |
Morris Jobke
|
0194873c55
|
fix german l10n
|
2016-06-20 13:14:24 +02:00 |
Morris Jobke
|
e95c15e53a
|
fix more strings
|
2016-06-20 13:14:24 +02:00 |
Morris Jobke
|
19b531fd14
|
fix more strings
|
2016-06-20 13:14:24 +02:00 |
Morris Jobke
|
9107fd6cd6
|
fix federation strings
|
2016-06-20 13:13:37 +02:00 |
Morris Jobke
|
416466b700
|
fix l10n
|
2016-06-20 13:13:37 +02:00 |
Morris Jobke
|
9327ded595
|
fix l10n
|
2016-06-20 13:13:37 +02:00 |