mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
34,337 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

34337 Commits

Author SHA1 Message Date
Morris Jobke 74daac49ac Merge pull request #1292 from nextcloud/add-theming-icon 
Add icon for the theming app
 2016-09-07 08:31:50 +02:00
Nextcloud bot 1110ef52ed
[tx-robot] updated from transifex 2016-09-07 00:09:25 +00:00
Felix Epp aacaf7a568 Add icon for the theming app 2016-09-07 01:23:53 +02:00
Roeland Jago Douma 3431591f34 Merge pull request #1285 from nextcloud/deprecate-edition-string 
Deprecate \OC_Util::getEditionString()
 2016-09-06 19:07:50 +02:00
Joas Schilling 7c0951244a
Deprecate getEditionString() 2016-09-06 16:05:28 +02:00
Morris Jobke 836c938583 Merge pull request #1245 from nextcloud/get-external-mounts 
get files_external mounts more efficiently
 2016-09-06 15:43:32 +02:00
Roeland Jago Douma c049559745 Merge pull request #1286 from nextcloud/add-twofactor_backupcodes-l10n 
add twofactor_backupcodes to l10n
 2016-09-06 15:39:45 +02:00
Roeland Jago Douma 9854705f63 Merge pull request #1284 from nextcloud/allow-status.php-before-install 
Allow status.php before install
 2016-09-06 15:10:56 +02:00
Morris Jobke d13d1e1f06
add twofactor_backupcodes to l10n 2016-09-06 14:50:05 +02:00
Morris Jobke b6bdf81d55 Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup 
Internal OCS Controller cleanup
 2016-09-06 14:46:05 +02:00
Joas Schilling 6a6af86a1c Merge pull request #1242 from nextcloud/bump_phpunit 
Bump phpunit
 2016-09-06 14:18:57 +02:00
Joas Schilling 20b636f382
Also fix "occ status" 2016-09-06 14:13:59 +02:00
Morris Jobke 45a84f3623 Merge pull request #1235 from nextcloud/issue-1192-move-navigation-entries-without-order-to-the-end 
Move navigation entries without order to the end
 2016-09-06 14:12:01 +02:00
Roeland Jago Douma 8c974589bd Merge pull request #1279 from nextcloud/2fa-backup-codes-typo 
fix 2fa backup codes typo
 2016-09-06 14:03:43 +02:00
Joas Schilling bbc5fbe8c4
Don't throw 500 when not installed 2016-09-06 14:00:54 +02:00
Joas Schilling 7bfc698ae4
Allow to call status.php before the instance is installed 2016-09-06 13:59:45 +02:00
Christoph Wurst ea6562aa57 translate 2fa backup strings 2016-09-06 12:52:44 +02:00
Roeland Jago Douma cec213e354
Fix autoloader 2016-09-06 11:58:47 +02:00
Roeland Jago Douma 3c55fe6bab
Split OCS version handling 
This cleans up a bit the OCSController/Middleware. Since the 2 versions
of OCS differ a bit. Moved a lot of stuff internal since it is of no
concern to the outside.
 2016-09-06 11:57:39 +02:00
Christoph Wurst c57976879c fix 2fa backup codes typo 2016-09-06 10:39:00 +02:00
Morris Jobke 314afcecf9 Merge pull request #1272 from nextcloud/theming-info-capabilities 
Add theming information to capabilities for the client
 2016-09-06 10:00:42 +02:00
Roeland Jago Douma c609e291bd
Fix getMock share 2016-09-06 09:33:48 +02:00
Roeland Jago Douma 1a05201543
Fix getMock Avatar 2016-09-06 09:33:48 +02:00
Roeland Jago Douma 4d3b92e687
Fix getMock Authentication 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 3a3a17b2e3
Fix getMock TwoFactorMiddlewareTest 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 5fb2eee5df
Fix getMock user_ldap 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 798dd40139
Fix getMock files_versions 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 327352e73a
Fix getMock files_trashbin 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 9cd6374878
Fix getMock files 2016-09-06 09:29:27 +02:00
Roeland Jago Douma c629761fea
Fix getMock files_sharing 2016-09-06 09:29:27 +02:00
Roeland Jago Douma d13ac20bca
Fix getMock files_external 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 0c154c1ed7
Fix getMock encryption 2016-09-06 09:29:27 +02:00
Roeland Jago Douma 831179971c
Use PHPUnit 5.5.4 2016-09-06 09:29:27 +02:00
Joas Schilling 67408c3f63
Add image URLs and tests 2016-09-06 08:55:22 +02:00
Nextcloud bot 5d48809609
[tx-robot] updated from transifex 2016-09-06 00:09:18 +00:00
Lukas Reschke 914bb23e6a Merge pull request #1121 from nextcloud/avatar_304 
Proper 304 response
 2016-09-05 19:14:33 +02:00
Roeland Jago Douma e8b625b098
Update autoloader 2016-09-05 15:11:46 +02:00
Roeland Jago Douma 6740c627b8
Move AvatarController over to FileDisplayResponse 2016-09-05 15:11:45 +02:00
Roeland Jago Douma 777c3ee325
Add FileDisplayResponse 
A lazy implementation of the DisplayResponse that only hits the
filesystem if the etag and mtime do not match.
 2016-09-05 15:09:54 +02:00
Lukas Reschke 06fa486706 Merge pull request #1158 from nextcloud/cache_avatars 
Cache avatars
 2016-09-05 15:08:43 +02:00
Robin Appelman b573c5b8f8
get files_external mounts more efficiently 2016-09-05 14:34:20 +02:00
Joas Schilling 1d834bd49e
Add theming information to capabilities for the client 2016-09-05 14:27:19 +02:00
Joas Schilling 12736a3592 Merge pull request #1271 from nextcloud/fix-docs-for-notifications 
Null !== void, those methods are void
 2016-09-05 14:16:45 +02:00
Morris Jobke 8741acf8a6 Merge pull request #1270 from nextcloud/issue-1265-always-use-js-console-when-available 
Always use the js console when available
 2016-09-05 13:03:02 +02:00
Joas Schilling fb04c56827
Null !== void, those methods are void 2016-09-05 13:00:56 +02:00
Joas Schilling db6a3367ad Merge pull request #1259 from nextcloud/language_order 
ACCEPT_LANGUAGE goes before default_langauge
 2016-09-05 12:37:44 +02:00
Marius Blüm f8eb7be7b1 Merge pull request #1171 from nextcloud/2fa-backup-codes 
add 2fa backup codes app
 2016-09-05 12:17:29 +02:00
Lukas Reschke e3a5767a29 Merge pull request #1269 from nextcloud/deprecate_ocs_response 
Deprecate OCSRespone
 2016-09-05 11:36:03 +02:00
Morris Jobke 5f1fbf499b Merge pull request #1268 from nextcloud/fix_1260 
Use proper ALTER ROLE syntax
 2016-09-05 11:28:40 +02:00
Joas Schilling fe9ffd29a7
Always use the js console when available 2016-09-05 11:25:47 +02:00