Commit Graph

33037 Commits

Author SHA1 Message Date
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
Morris Jobke ca4fd9d25b
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke e7e0dc608b
fix strings 2016-06-20 13:13:37 +02:00
Morris Jobke 451b630ec8
Fix themes readme 2016-06-20 13:13:37 +02:00
Marius Blüm fffe1be609 Merge pull request #157 from nblock/dev/remove-old-contacts-table
Remove obsolete contacts_cards_properties table
2016-06-20 12:18:13 +02:00
Thomas Müller 2951a70fcb Update ExcludeFileByNameFilterIterator.php (#25184)
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp    tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname   with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
2016-06-20 12:02:23 +02:00
William Bargent 99833ecffa Merge pull request #163 from nextcloud/loading-spinner
make loading spinner thicker and color lighter
2016-06-20 10:45:55 +01:00
Bjoern Schiessle f9fd7093c0
don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway 2016-06-20 11:21:27 +02:00
Vincent Petry 09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests
Fix GDrive test rename overwrite folder
2016-06-20 11:02:24 +02:00
Jan-Christoph Borchardt 5df13ec5c4 make loading spinner thicker and color lighter 2016-06-20 11:00:42 +02:00
Christoph Wurst 56199eba37
fix unit test warning/errors 2016-06-20 10:41:23 +02:00
Vincent Petry fa533e72cd Merge pull request #25161 from owncloud/fixgetsharefolder
Make getShareFolder use given view instead of static FS
2016-06-20 10:26:03 +02:00
Vincent Petry e3ddbeb755 Merge pull request #25120 from owncloud/settings_fix_checkbox_newline
files_external: Keep checkbox and its label on one line
2016-06-20 10:00:25 +02:00
Vincent Petry e2b0a0f18f Merge pull request #25174 from owncloud/tokenmapper-close-cursor
close cursor after loading a token
2016-06-20 09:54:15 +02:00
Vincent Petry 01041045da Merge pull request #25168 from owncloud/capped-user-cache
Capped cache for user config
2016-06-20 09:53:58 +02:00
Christoph Wurst fb36fd495b
fix DefaultTokenMapperTest 2016-06-20 09:25:15 +02:00
Christoph Wurst 5c68084823
fix default token provider tests 2016-06-20 09:17:19 +02:00
Christoph Wurst 9d74ff02a4
fix nitpick 2016-06-20 09:13:47 +02:00
Christoph Wurst 8ef5431e7a
fix user session tests 2016-06-20 09:10:11 +02:00
Morris Jobke e4996305fc Merge pull request #160 from nextcloud/rename_in_apps
rename owncloud to nextcloud in Official apps button popup
2016-06-20 08:53:02 +02:00
Morris Jobke 7a09b3daff
fix translations 2016-06-20 08:28:54 +02:00
Jenkins for ownCloud bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Timo Witte 205e936370 rename owncloud to nextcloud in Official apps button popup 2016-06-20 01:58:39 +02:00
Marius Blüm 2166c90484 Reintroduce HackerOne into CONTRIBUTING.md 2016-06-19 21:36:05 +02:00
Marius Blüm 3d470be8eb Reintroduce HackerOne into CONTRIBUTING.md 2016-06-19 17:49:46 +02:00
Florian Preinstorfer f6e9322f1e Remove obsolete contacts_cards_properties table
The table contacts_cards_properties was part of the contacts app until
ownCloud 8.2. It got replaced with cards_properties (part of dav).

See also: ownCloud/core #21889
2016-06-19 15:40:37 +02:00
Marius Blüm 97094b211c Merge pull request #156 from nblock/dev/remove-old-gallery-tables
Drop obsolete tables: gallery_albums and gallery_photos
2016-06-19 15:01:23 +02:00
Florian Preinstorfer 217144dd95 Drop obsolete tables: gallery_albums and gallery_photos
Commit 34a21a63ce renamed gallery_albums
to pictures_images_cache and removed gallery_photos entirely.
2016-06-19 14:01:42 +02:00
Jenkins for ownCloud d65c56d7de [tx-robot] updated from transifex 2016-06-18 01:58:51 -04:00
Markus Goetz 111bd8e57d files_external: Keep checkbox and its label on one line #20032 #22655
Else the checkbox and the decription end up on different lines in my Chrome on OS X
2016-06-17 16:19:38 +02:00
Christoph Wurst b0f2878f6e
close cursor after loading a token 2016-06-17 16:13:28 +02:00