Commit Graph

8757 Commits

Author SHA1 Message Date
Thomas Mueller 8a662a6c74 Cleanup string - easier for translators 2013-01-31 10:34:54 +01:00
Thomas Mueller e8b423f666 style fixes 2013-01-31 10:30:13 +01:00
Thomas Mueller 665bb41c1f style fixes 2013-01-31 10:27:02 +01:00
Frank Karlitschek 5112dac102 remove spaces 2013-01-31 10:00:42 +01:00
Frank Karlitschek ea5861ed8c remove leftover code 2013-01-30 15:27:20 +01:00
Frank Karlitschek 5e422dea61 fix typo 2013-01-30 14:52:35 +01:00
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
Frank Karlitschek 389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +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
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
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
Arthur Schiwon 59bb9931df Adjust user interface to additions around displayName Handling 2013-01-29 20:09:41 +01:00
Lukas Reschke 472491955a Merge pull request #1352 from mjkent/master
Add Default Robot Disallow
2013-01-29 02:49:20 -08: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
Jan-Christoph Borchardt 01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Robin Appelman 06c1c35ac9 Fix phpdoc 2013-01-28 19:08:30 +01:00
Björn Schießle 4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +01:00
Björn Schießle f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle 590c4aa710 search display name instead of uid; fix key/value order for array access 2013-01-28 15:58:40 +01:00
Björn Schießle c00b66fe5b implement DisplayNamesInGroup for database back-end 2013-01-28 15:47:57 +01:00
Björn Schießle e6cc0cd08a implement display names for the database back-end 2013-01-28 15:07:31 +01:00
Lukas Reschke 99ec26578a Merge pull request #1313 from owncloud/updater-CSP
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
Björn Schießle 3e0d117d60 add display name to the database table oc_users 2013-01-28 14:38:38 +01:00
Björn Schießle 70c3ab3c53 update the display name for the database back-end 2013-01-28 14:23:15 +01:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Björn Schießle 022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle 996b5cf368 change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names 2013-01-28 13:10:54 +01:00
Thomas Müller 857b15db37 Merge pull request #1318 from j-ed/master
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Thomas Müller 44d6ff61e2 Merge pull request #1337 from owncloud/fix-issue-780
Add create permission, fixes #780
2013-01-27 23:52:09 -08:00