Commit Graph

9210 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Jan-Christoph Borchardt 5bf7791b42 Merge pull request #1396 from owncloud/apps_sorting
Sort internal apps above 3rdparty apps
2013-01-31 10:19:04 -08:00
blizzz 878cf9bd3c Merge pull request #1393 from owncloud/adding-index.html-with-redirect-master
some web servers by default don't recognize index.php as default page - ...
2013-01-31 09:31:15 -08:00
blizzz 411e8e5218 Merge pull request #1365 from owncloud/ldap_multiple_server
LDAP: support for multiple LDAP/AD servers
2013-01-31 09:24:45 -08:00
Arthur Schiwon afacaf8bc2 string fragment was added by accident and does not belong here 2013-01-31 18:00:07 +01:00
Robin Appelman 5417e44b2a Files: fix moving files by DnD 2013-01-31 17:56:44 +01:00
Thomas Mueller 19714151e2 spell check 2013-01-31 17:53:01 +01:00
Thomas Mueller 5862f3d140 spell check 2013-01-31 17:51:59 +01:00
Robin Appelman a224d80f4d Sort internal apps above 3rdparty apps 2013-01-31 17:49:58 +01:00
Thomas Mueller 7f2d7cdbe1 spell check 2013-01-31 17:44:25 +01:00
Thomas Mueller a17a7f5cdb adding l10n support to user_ldap 2013-01-31 17:43:24 +01:00
Lukas Reschke b471177439 Merge pull request #1379 from owncloud/improved_appsmanagement
Improved appsmanagement
2013-01-31 08:30:55 -08:00
Thomas Müller 0dd9e6cb12 Merge pull request #1387 from schiesbn/visual_improvements
small visual improvements
2013-01-31 08:30:25 -08:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Björn Schießle 9cd692a6d0 use the same tooltip as for the password field 2013-01-31 17:00:05 +01:00
Thomas Mueller 4162ba4d41 adding l10n support to files_trashbin 2013-01-31 16:48:41 +01:00
Thomas Mueller e22a8866fb some web servers by default don't recognize index.php as default page - IIS for example
In order to allow easy installation and configuration this index.html has been added with a redirect to index.php
2013-01-31 16:16:28 +01:00
Jan-Christoph Borchardt 43f8bf8e5c Merge pull request #1358 from owncloud/button-fix
increase opacity of buttons, fix for dark backgrounds like header in pub...
2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Jan-Christoph Borchardt f0ca8eeba4 no box-shadow for public share download button 2013-01-31 15:21:50 +01:00
Björn Schießle 8dd9dedee8 Merge pull request #1266 from schiesbn/trash_bin
Trash bin
2013-01-31 06:18:22 -08:00
Robin Appelman 54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Björn Schießle c8a4878b77 is_writable() is now isUpdatable() with the new filesystem 2013-01-31 14:55:14 +01:00
Björn Schießle dff5148f6d debug output removed 2013-01-31 14:48:57 +01:00
Jan-Christoph Borchardt cbafea4cc8 increase opacity of inactive apps and settings entries for better visibility 2013-01-31 14:32:07 +01:00
Jan-Christoph Borchardt 1144b61db3 vertical scrollbar for app navigation when too many apps 2013-01-31 14:14:12 +01:00
Thomas Mueller 85a12970c7 update on translation string 2013-01-31 14:11:31 +01:00
Jan-Christoph Borchardt 90aa1b3532 ellipsize long app names in navigation 2013-01-31 14:04:33 +01:00
Jan-Christoph Borchardt c801b86bc2 Merge pull request #1359 from raghunayyar/navigation
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Jan-Christoph Borchardt 300ecc2ed2 change button box-shadow from hard white to slight transparent 2013-01-31 12:59:36 +01:00
Björn Schießle 13165bbea2 Merge pull request #1390 from schiesbn/search_display_name_and_uid
Search display name and uid
2013-01-31 03:53:32 -08:00
Frank Karlitschek f7d281af67 just return "true" for now 2013-01-31 12:24:10 +01:00
Björn Schießle 77765bd967 remove some left over comments 2013-01-31 12:17:23 +01:00
Björn Schießle ab255e8bb6 add missing brackets 2013-01-31 12:12:39 +01:00
Björn Schießle 9a19c0af4b search for display name and uid (with no display name) since it is possible that not all users have a seperate display name 2013-01-31 12:09:42 +01:00
Björn Schießle 54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Björn Schießle 9c83b307f6 keep mtime 2013-01-31 10:50:02 +01:00
Thomas Mueller 3af09f2acf l10n support for the error dialog added 2013-01-31 10:43:59 +01:00
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
Björn Schießle 2ddd40ed41 rename 'undelete' to 'restore' 2013-01-31 10:06:02 +01:00
Frank Karlitschek 5112dac102 remove spaces 2013-01-31 10:00:42 +01:00
Björn Schießle 170cf20298 addapt the css to adjust the change display name filed to the set password field 2013-01-31 09:57:16 +01:00
raghunayyar b978cc8b28 Shorter, Cleaner JS in apps.js 2013-01-31 11:52:56 +05:30
Arthur Schiwon 2f11d7fe12 LDAP: adjust settings interface for custom search attributes 2013-01-31 02:10:13 +01:00
Arthur Schiwon 1a854454d6 LDAP: avoid attempts to save null as configvalue 2013-01-31 02:00:29 +01:00
Arthur Schiwon 0b98dc30b2 LDAP: remove unnecessary placeholders, fixes PHP warnings 2013-01-31 01:56:16 +01:00
Arthur Schiwon b5ed8b2751 LDAP: fix wrong index 2013-01-31 01:46:54 +01:00
Arthur Schiwon b3b0544e17 LDAP: make it possible to define attributes that should be considered on searches 2013-01-31 01:46:34 +01:00