Commit Graph

33852 Commits

Author SHA1 Message Date
Lukas Reschke 6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Lukas Reschke 2061d40ba2 Merge pull request #862 from nextcloud/us_25767
[us] How to polish code, eg: OC\User
2016-08-15 21:53:52 +02:00
Lukas Reschke 63fb17a44f Merge pull request #882 from nextcloud/use-proper-test-execution
Use proper casing
2016-08-15 21:50:43 +02:00
Roeland Jago Douma 36647dbb67 Merge pull request #876 from nextcloud/licence
Licence script update
2016-08-15 20:24:06 +02:00
Roeland Jago Douma 87ac72d004
We have to mock the is_uploaded_file in the OC\Core\Controller namespace 2016-08-15 20:08:20 +02:00
Roeland Jago Douma 09f4ce4389
Fix mock call in AvatarControllerTest 2016-08-15 20:07:07 +02:00
Lukas Reschke cf3cfca356
Use generated URL 2016-08-15 17:37:55 +02:00
Lukas Reschke 910176c540
Fix CheckSetupController tests 2016-08-15 17:36:45 +02:00
Lukas Reschke d6992e3f9f
Fix template test 2016-08-15 17:19:50 +02:00
Lukas Reschke 75d135d8d4
Fix tests for LoginController 2016-08-15 17:19:32 +02:00
Lukas Reschke 1c7fa3333e
Add reference to current user 2016-08-15 17:15:14 +02:00
Lukas Reschke c16c411275
Add new dependency 2016-08-15 17:13:58 +02:00
Lukas Reschke 65d1472005
Don't use create mock
Not compatible with this PHPunit version
2016-08-15 17:08:27 +02:00
Lukas Reschke 166a7667d3
Use proper casing 2016-08-15 17:00:35 +02:00
Lukas Reschke 7ffb7b0d84
Use MockBuilder instead of createMock
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
Lukas Reschke 8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Roeland Jago Douma 396678c9ce Merge pull request #855 from nextcloud/files_drop_capability
Add files drop capability for clients
2016-08-15 15:38:35 +02:00
Roeland Jago Douma b5f61ba0e2
If there is no copyright notice print comment line 2016-08-15 14:51:09 +02:00
Roeland Jago Douma 08a71b176f
Do not licence composer stuff 2016-08-15 14:42:39 +02:00
Arthur Schiwon 75a73a5a73
satisfy dependencies for files_external 2016-08-15 13:38:02 +02:00
Roeland Jago Douma 6c360ad79f
Add PHPdoc 2016-08-15 11:14:28 +02:00
Nextcloud bot f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Marius Blüm 282ca057d2 Merge pull request #816 from nextcloud/socialbuttons
adding social buttons
2016-08-14 21:41:15 +02:00
Jörn Friedrich Dreyer 291b3fd8b4
missing PHPDoc 2016-08-14 19:37:52 +02:00
Jörn Friedrich Dreyer da5633c31a
Type compatability 2016-08-14 19:37:37 +02:00
Jörn Friedrich Dreyer 3593668413
Method is deprecated 2016-08-14 19:37:11 +02:00
Jörn Friedrich Dreyer 5aef60d2ca
Unreachable statement 2016-08-14 19:36:42 +02:00
Jörn Friedrich Dreyer d2a16c4dc8
Unnecessary fully qualified names 2016-08-14 19:36:06 +02:00
Nextcloud bot 241fc286c7
[tx-robot] updated from transifex 2016-08-14 00:10:34 +00:00
Roeland Jago Douma 5cd5233952
Do not translate HTML 2016-08-13 14:16:17 +02:00
Jan-Christoph Borchardt c8113a4269
compress images and fix position 2016-08-13 14:03:56 +02:00
Jan-Christoph Borchardt 18d7ca21f5
use shorthand for padding values 2016-08-13 14:03:56 +02:00
Lukas Reschke 4806ea20fe
Remove accidentially added line 2016-08-13 14:03:56 +02:00
Frank Karlitschek 707fc30304
adding rel="noreferrer noopener" 2016-08-13 14:03:56 +02:00
Frank Karlitschek 629c3dd39f
adding social buttons 2016-08-13 14:03:56 +02:00
Roeland Jago Douma 9daf41e05a
Add files drop capability for clients 2016-08-13 14:02:09 +02:00
Nextcloud bot 4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Arthur Schiwon 8188bb4509
simplify encryption manager fetching in DIContainer 2016-08-13 01:26:11 +02:00
Arthur Schiwon 158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon d2fcac8300
change federatedfilesharing css class to followupsection to reduce whitespace 2016-08-13 00:36:32 +02:00
Arthur Schiwon b99ecb3c23
move systemstags to sharign section, drop collaboration section 2016-08-13 00:33:09 +02:00
Arthur Schiwon a133e7970d
make updatenotification settings appear as if it is part of the version part in server settings 2016-08-13 00:29:39 +02:00
Arthur Schiwon 7a2b96c7e6
change casing in section display names 2016-08-13 00:06:10 +02:00
Lukas Reschke 11e089f112 Merge pull request #844 from nextcloud/twofactor_mw_excep
TwoFactorMiddleware should forward Exception
2016-08-12 20:15:32 +02:00
Arthur Schiwon 90e58b7fb3
mark current section 2016-08-12 17:08:32 +02:00
Arthur Schiwon 0fdf801c25
fix theming tests 2016-08-12 16:58:59 +02:00
Arthur Schiwon 9aa6b99a56
added some missed diagnosis output 2016-08-12 16:52:20 +02:00
Arthur Schiwon 0c15081279
rename remaining occurences of OCA/Theming/Template 2016-08-12 16:00:39 +02:00
Bjoern Schiessle 18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Morris Jobke 4a887d851e Merge pull request #837 from nextcloud/when-logged-in-then-just-redirect-to-redirected-page
When logged in then just redirect to redirected page
2016-08-12 14:21:36 +02:00