Commit Graph

16513 Commits

Author SHA1 Message Date
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Nextcloud bot 656ea773e1
[tx-robot] updated from transifex 2017-11-09 09:12:53 +00:00
Morris Jobke c91515cfed
Merge pull request #6847 from nextcloud/filelist-confict-path-12
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
Nextcloud bot 69e61b2892
[tx-robot] updated from transifex 2017-11-09 01:09:28 +00:00
Nextcloud bot 98b012d545
[tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Lukas Reschke 4d117a5e23
Merge pull request #7096 from nextcloud/backport-stable12-7042
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
Robin Appelman fe6b4d432b
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
Robin Appelman e51acfc717
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
Morris Jobke 70e20727e5
Merge pull request #6699 from nextcloud/backport-6522-stable12
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
Georg Ehrke 3059191444
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Nextcloud bot e873b1a3d1
[tx-robot] updated from transifex 2017-11-06 01:09:19 +00:00
Nextcloud bot 0b25217ba6
[tx-robot] updated from transifex 2017-11-05 01:09:07 +00:00
Nextcloud bot 43341833fd
[tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot 8b1417a269
[tx-robot] updated from transifex 2017-11-02 01:11:03 +00:00
Nextcloud bot 52b31a09ef
[tx-robot] updated from transifex 2017-11-01 01:08:55 +00:00
Nextcloud bot 00ffed5a19
[tx-robot] updated from transifex 2017-10-31 01:08:41 +00:00
Morris Jobke 0ce718796e
Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
#6307 fix page title not changed (stable12)
2017-10-30 12:58:17 +01:00
Nextcloud bot 76ede89b6b
[tx-robot] updated from transifex 2017-10-30 01:08:44 +00:00
Nextcloud bot e20c4c6a71
[tx-robot] updated from transifex 2017-10-29 00:08:41 +00:00
Nextcloud bot 09a0048f77
[tx-robot] updated from transifex 2017-10-28 00:08:41 +00:00
Bernd Stellwag 8eb47de969 bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Bernd Stellwag bf3f86f1ff bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Nextcloud bot 85f612c819
[tx-robot] updated from transifex 2017-10-27 00:08:39 +00:00
Nextcloud bot f7ac152a6c
[tx-robot] updated from transifex 2017-10-26 00:08:49 +00:00
Morris Jobke 7ec5689d0e Merge pull request #6935 from nextcloud/12-5780
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
Morris Jobke aab0c3f18e Merge pull request #6946 from nextcloud/12-6574
[stable12] Fix undefined offset warning when using '/' as external storage root
2017-10-25 14:33:20 +02:00
Joas Schilling aef69efe2e Merge pull request #6942 from nextcloud/12-6826
[stable12] Fix class name in exception logger plugin
2017-10-25 11:51:24 +02:00
Roeland Jago Douma 27e8352ef1 Merge pull request #6945 from nextcloud/12-6633
[stable12] Don't add a LIKE condition when it's not needed
2017-10-25 08:53:37 +02:00
Nextcloud bot 5bd0bde89d
[tx-robot] updated from transifex 2017-10-25 00:08:56 +00:00
Robin Appelman f301b12c7b
Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-25 01:45:25 +02:00
Thomas Citharel 8c56f93124
Don't add a LIKE condition when it's not needed
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-10-25 01:42:51 +02:00
Joas Schilling 89d4e1f2ab
Use ::class to avoid errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:59 +02:00
Joas Schilling 572f246b78
Fix class name, regression from 44cf67accd
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:55 +02:00
Morris Jobke d3916b2170
Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:11:05 +02:00
rakekniven 59fc88650c
Update file-upload.js
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-24 17:34:49 +02:00
Morris Jobke 293a3d578f
Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:34:31 +02:00
Nextcloud bot 895336a3f3
[tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
Morris Jobke ad66244bdf Merge pull request #6910 from nextcloud/backport-6677-s12
[stable12]  don't reset quota
2017-10-23 07:46:49 -07:00
Arthur Schiwon 791fa6905f
and add missing whitespaces to log outout
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:32 +02:00
Juan Pablo Villafáñez b8afb84b18
Adjust unittest
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:27 +02:00
Juan Pablo Villafáñez 18c35a7ab0
Keep the current quota if no suitable quota is found
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:19 +02:00
Morris Jobke 5c53b162ed
Do not log WebDAV maintenance mode exception
Log the maintenance mode exception only in debug level. Fixes #6124

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 11:24:07 +02:00
Nextcloud bot e70135bcbf
[tx-robot] updated from transifex 2017-10-23 00:08:49 +00:00
Nextcloud bot bc19a8b193
[tx-robot] updated from transifex 2017-10-22 00:08:45 +00:00
Nextcloud bot 1c488aae8a
[tx-robot] updated from transifex 2017-10-21 00:08:36 +00:00
Nextcloud bot 5d2c6233a9
[tx-robot] updated from transifex 2017-10-20 00:08:44 +00:00
Nextcloud bot e8c217ed4f
[tx-robot] updated from transifex 2017-10-19 00:08:38 +00:00
Nextcloud bot 8b0842f020
[tx-robot] updated from transifex 2017-10-18 00:08:33 +00:00