Commit Graph

9303 Commits

Author SHA1 Message Date
Frank Karlitschek 66cab77b6d merge master
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
2013-01-30 14:36:17 +01:00
Björn Schießle 1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +01:00
irgsmirx 0bce22966c Update lib/base.php
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Arthur Schiwon 8f388d9df4 LDAP: update link to online documentation 2013-01-30 13:48:59 +01:00
Frank Karlitschek 389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
Jörn Friedrich Dreyer 81a398c22c use $.trim() for IE8 2013-01-30 13:29:24 +01:00
Björn Schießle e6f1544f51 fix OC_Log::ERROR call 2013-01-30 13:04:32 +01:00
Björn Schießle a6e5f4b85c some minor improvements 2013-01-30 13:01:53 +01:00
Jörn Friedrich Dreyer 99dfaee1f6 reset checkbox after getting selected files instead of ofter dragging, speed up revert 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer 1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer 0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Björn Schießle 9639544ca0 make background transparent 2013-01-30 12:56:22 +01:00
root 3fa4b3abff apps updater is now working 2013-01-30 12:08:14 +01:00
Thomas Müller 5761bd771f Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 -08:00
Jörn Friedrich Dreyer a6040d0cc7 Merge pull request #1308 from TheSFReader/master
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
2013-01-30 02:37:11 -08:00
Björn Schießle d6adab6734 improved message if trash bin is empty 2013-01-30 10:07:29 +01:00
Arthur Schiwon 8fd263ef63 LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278 2013-01-30 03:57:46 +01:00
Arthur Schiwon e8db1e884e LDAP: some inline documentation 2013-01-30 03:44:11 +01:00
Arthur Schiwon 14bc6f8c6c LDAP: working visual feedback on save. Save button will be highlighted green or red. 2013-01-30 03:34:51 +01:00
Arthur Schiwon 19867b1d08 LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix 2013-01-30 02:39:44 +01:00
Arthur Schiwon a557522037 LDAP: send back error message properly 2013-01-30 02:39:11 +01:00
Arthur Schiwon 9f7d780276 LDAP: use consolidated method for determining config prefix 2013-01-30 02:31:14 +01:00
Arthur Schiwon a8ac4bdf79 LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted 2013-01-30 02:30:24 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle 6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +01:00
Björn Schießle d19de49606 prevent xss 2013-01-29 22:32:59 +01:00
Björn Schießle 56c6e6a334 remove debug output 2013-01-29 22:20:47 +01:00
Björn Schießle afad6e95db check permissions before changing the display name 2013-01-29 22:20:15 +01:00
Björn Schießle 27edbfdf56 added missing changedisplayname.php 2013-01-29 21:52:03 +01:00
Björn Schießle e613a68274 remove dubug output 2013-01-29 21:30:04 +01:00
Björn Schießle 007bddceba version dump to trigger db update 2013-01-29 21:04:28 +01:00
Björn Schießle 8d0b67e17a fix typo in variable name 2013-01-29 21:04:11 +01:00
Björn Schießle ebc3d1b2d7 remove dubug value 2013-01-29 21:01:59 +01:00
Arthur Schiwon 79c309da83 Typo 2013-01-29 20:42:21 +01:00
Arthur Schiwon f33b72677b LDAP: implement support for ownCloud Display Names 2013-01-29 20:41:48 +01:00
raghunayyar d620495e92 No Image Repetition on Enabling Apps in Navigation Bar 2013-01-30 00:54:23 +05:30
Arthur Schiwon 59bb9931df Adjust user interface to additions around displayName Handling 2013-01-29 20:09:41 +01:00
Jan-Christoph Borchardt e2f1a445ed increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188 2013-01-29 19:13:39 +01:00
Björn Schießle 0c8bcacdc8 added some additional error handling 2013-01-29 13:36:33 +01:00
Lukas Reschke 472491955a Merge pull request #1352 from mjkent/master
Add Default Robot Disallow
2013-01-29 02:49:20 -08:00
Björn Schießle eafd34684c seperate css no longer needed, use files app css instead 2013-01-29 10:08:41 +01:00
Björn Schießle d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski ca4c006d5a Make zip downloads use actual folder names, fix spelling mistakes 2013-01-28 23:51:35 -05:00
Michael Gapczynski 5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Michael Gapczynski ed2ee8c411 Change file action text for files inside shared folders as well 2013-01-28 23:16:29 -05:00
Michael Gapczynski ede7fccb00 Change file action text to 'Shared' 2013-01-28 23:13:38 -05:00
Jenkins for ownCloud 8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Michael Kent 5b77f16d57 Add robot.txt
This is needed for security reasons - often people looking to exploit applications will search for something in a certain version of a web application and find many sites to exploit. This stops that from being so easy.
2013-01-28 16:39:53 -06:00