Commit Graph

743 Commits

Author SHA1 Message Date
Björn Schießle e68d0c7398 make strings translatable 2013-02-06 11:55:19 +01:00
Björn Schießle 9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Arthur Schiwon 5221ee0c5a offer change password only when the action is supported by the user backend 2013-02-05 19:26:00 +01:00
Thomas Tanghus cda0780d4b Remove superfluous append 2013-02-05 14:15:17 +01:00
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jan-Christoph Borchardt 4059959c5f Merge branch 'master' into fix_addNavigation 2013-02-05 11:09:38 +01:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Thomas Tanghus 88ad1e5fbd Make app icon linkable when enabling app. 2013-02-03 16:02:25 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
blizzz 88f4aced38 Merge pull request #1404 from owncloud/fixing-1276-master
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
Thomas Mueller cc73568d68 Updateing -> Updating 2013-02-01 00:51:00 +01:00
Thomas Mueller 402263bd5c fix #1276 - use registerLoadedCallback() 2013-02-01 00:33:14 +01:00
Jenkins for ownCloud 94f7446724 [tx-robot] updated from transifex 2013-02-01 00:19:28 +01:00
Michael Gapczynski a9e1c9bf6d Merge pull request #1351 from owncloud/navigation
New navigation design
2013-01-31 14:37:39 -08:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt 943c0334c1 remove z-index from app labels which caused overlap with top bar 2013-01-31 20:27:39 +01:00
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Robin Appelman a224d80f4d Sort internal apps above 3rdparty apps 2013-01-31 17:49:58 +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
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Thomas Mueller 85a12970c7 update on translation string 2013-01-31 14:11:31 +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
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
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
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jörn Friedrich Dreyer de00111c1f use on instead of live in users.js 2013-01-30 17:49:02 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Björn Schießle 92921ceefd make strings translatable 2013-01-30 16:28:41 +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
raghunayyar 0dfbd53a6e Reduced Styling and Image loads as from src and not backgorund. 2013-01-30 19:12:51 +05:30
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
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Frank Karlitschek 389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +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 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 8d0b67e17a fix typo in variable name 2013-01-29 21:04:11 +01:00