nextcloud/core
Thomas Müller 3564a837d8 Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 12:15:44 +02:00
..
ajax Merge pull request #19508 from owncloud/setting-to-skip-migration-tests 2015-10-02 12:15:23 +02:00
avatar Revert "Allow Remote avatars" 2015-09-15 16:52:12 +02:00
command setting to skip migration tests by default 2015-10-01 14:23:25 +02:00
css Merge pull request #19484 from owncloud/ie8-checkbox-rage 2015-10-02 08:58:16 +02:00
doc fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
fonts move fonts from Regular+Bold to Light+Semibold for lighter feel 2015-08-25 16:13:05 +02:00
img Merge pull request #19454 from owncloud/ie8-madness-returns 2015-09-30 15:15:38 +02:00
js Make sure the conflict dialog is loaded before adding conflicts 2015-10-02 09:55:43 +02:00
l10n [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
lostpassword Expire token after 12h and if user logged-in again 2015-08-22 20:42:45 +02:00
search fix wording of other search results to 'in other folders' 2015-09-23 21:31:00 +02:00
setup Remove OC_Log 2015-07-03 18:00:16 +02:00
skeleton add a real examplefile instead of an .gitignore which is a bit stupid here 2013-10-04 10:21:33 +02:00
tags Update license headers 2015-03-26 11:44:36 +01:00
templates Fix login arrow in login page 2015-09-29 17:13:10 +02:00
user Update license headers 2015-03-26 11:44:36 +01:00
vendor adjust gitignore for backbone.js 2015-08-06 11:22:15 +02:00
application.php Expire token after 12h and if user logged-in again 2015-08-22 20:42:45 +02:00
register_command.php [App Code Check] add check for version and mandatory fields 2015-09-24 11:58:12 +02:00
routes.php update license headers and authors 2015-06-25 14:13:49 +02:00
shipped.json Remove user_webdavauth which is now part of user_external 2015-09-24 09:59:14 +02:00
strings.php update license headers and authors 2015-06-25 14:13:49 +02:00