Commit Graph

1994 Commits

Author SHA1 Message Date
Arthur Schiwon 19fd7cd9c7 When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings. 2014-06-02 12:53:55 +02:00
Arthur Schiwon 5f57d72b93 kick out deprecated and dislodged OC.Router 2014-06-02 12:53:55 +02:00
raghunayyar fe4b1f8b10 Enhancement: Adds Group to grouplist when added via multiselect 2014-06-02 12:53:55 +02:00
raghunayyar d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
raghunayyar e159f7e4a9 Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings. 2014-06-02 12:53:55 +02:00
raghunayyar 7aca126086 Adds @blizzz to authors 2014-06-02 12:53:54 +02:00
Arthur Schiwon b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
raghunayyar b6b133237a Initial Commit with Group Toggle. 2014-06-02 12:53:54 +02:00
Arthur Schiwon cfba7e20cf don't hide add group when text is entered (except for ESC press) 2014-06-02 12:53:54 +02:00
Arthur Schiwon 853ced644d hide Add Group when clicking away or pressing ESC 2014-06-02 12:53:54 +02:00
Arthur Schiwon a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon 480173569f put Add Group elements hiding and showing into its own function 2014-06-02 12:53:54 +02:00
Arthur Schiwon 330dfeb46b group name input shall not vanish upon click, plus cleanup (groups do not have home folders) 2014-06-02 12:53:54 +02:00
Arthur Schiwon 749afe74df when clicking on Add Group also put the focus into the group name field 2014-06-02 12:53:54 +02:00
Arthur Schiwon faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar 65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon 17e640af22 set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible. 2014-06-02 12:53:53 +02:00
Arthur Schiwon 506e065f23 stricter test for 0 2014-06-02 12:53:53 +02:00
Arthur Schiwon 004dd73c5e fix user creation, checkSubAdminUser is only available in OC_JSON 2014-06-02 12:53:53 +02:00
Arthur Schiwon b3221f0e4e LDAP: adjust main template according to PR 7291 2014-06-02 12:53:53 +02:00
raghunayyar eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
raghunayyar 6526b939d3 Enhancement: Transparency added to icons, changes opacity to 1 on hover. 2014-06-02 12:53:53 +02:00
raghunayyar ceb6c4df04 Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions. 2014-06-02 12:53:53 +02:00
raghunayyar d51b384c0c Enhancement: Always show edit & delete for the active group. 2014-06-02 12:53:53 +02:00
raghunayyar f946a52819 Rename and Delete Happens only on Active Group. 2014-06-02 12:53:53 +02:00
Arthur Schiwon d650cd66dc mark selected group active 2014-06-02 12:53:53 +02:00
Arthur Schiwon 1f4bc7cb10 port scroll improvements 2014-06-02 12:53:52 +02:00
Arthur Schiwon f7903e92be do not forget to pass parameters to subtemplate 2014-06-02 12:53:52 +02:00
Lukas Reschke 86d3cf53d1 Let's switch to OCP\JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke ed1a23c9a2 Use OCP\JSON instead of OC_JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke 8a8800203e Remove legacy "Check for user comment"
I don't think these comments are necessary anymore and therefore they should get killed.
2014-06-02 12:53:52 +02:00
raghunayyar 16fb48f2eb Adds admin check on groupname changes. 2014-06-02 12:53:52 +02:00
raghunayyar 63645461f0 Fixes Markup in templates. 2014-06-02 12:53:52 +02:00
raghunayyar 9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon bf88bd108e do not show 0 when administered group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon 1734cc09fd sort groups by user count 2014-06-02 12:53:52 +02:00
Arthur Schiwon 7d3ac194e3 do not show 0 when group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon 478393e15a load groups when clicking on them 2014-06-02 12:53:52 +02:00
raghunayyar e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
raghunayyar f751e0bc48 Splits Code for Users and Groups. 2014-06-02 12:53:51 +02:00
Arthur Schiwon 3a92d48104 reduce template function calls 2014-06-02 12:53:51 +02:00
Arthur Schiwon 57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar 970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar dc1523355b Adds Admin to Grouplist Everywhere 2014-06-02 12:52:53 +02:00
raghunayyar 4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar 8e4bbe8297 Adds class button to fix font sizes. 2014-06-02 12:52:53 +02:00
raghunayyar 8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar 223e342664 Fixes delete icon only on hover. 2014-06-02 12:52:52 +02:00
raghunayyar 78e1b71003 Reverts Bogus Changes. 2014-06-02 12:52:52 +02:00
raghunayyar 71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar b2ca595509 Add GroupList Ajax to Users. 2014-06-02 12:52:52 +02:00
raghunayyar 43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar 0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Jenkins for ownCloud d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud 36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Georg Ehrke 020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Georg Ehrke c8636ca4d9 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	lib/private/installer.php
2014-05-31 14:55:00 +02:00
Georg Ehrke 2bcfd8e084 make it possible to update shipped apps via the appstore 2014-05-31 12:17:54 +02:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller 555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Volkan Gezer 4843d13056 prevent pageload if pressed enter on name email change 2014-05-30 15:12:39 +02:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke 5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
2014-05-29 21:54:15 +02:00
Volkan Gezer c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Jenkins for ownCloud 368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Joas Schilling dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Volkan Gezer e70ed36d8e Merge pull request #8740 from owncloud/l10n-forgotten-tags
reverts 188c543
2014-05-27 14:47:21 +02:00
Volkan Gezer 1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Vincent Petry 17276af6ad Merge pull request #8733 from owncloud/l10n-forgotten-tags
unwrapped strings fix
2014-05-27 11:55:33 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Volkan Gezer 188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Jan-Christoph Borchardt c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Jan-Christoph Borchardt b1ccfcde9e fix border-radius in settings to 3px 2014-05-23 18:07:25 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Jenkins for ownCloud 40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working
Conflicts:
	lib/private/util.php
2014-05-19 21:42:30 +02:00
Jenkins for ownCloud d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry 1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Vincent Petry 9ccb3279dd Added app navigation for files app
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
Vincent Petry 3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo
fix typo encryption
2014-05-15 10:05:37 +02:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Volkan Gezer 5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Björn Schießle b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Bjoern Schiessle ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Jenkins for ownCloud f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Jenkins for ownCloud b6d76e9985 [tx-robot] updated from transifex 2014-05-11 01:57:00 -04:00
Thomas Müller b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus 287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Jenkins for ownCloud 283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Jenkins for ownCloud cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Jenkins for ownCloud 17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Jenkins for ownCloud 654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Jenkins for ownCloud b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Thomas Müller e27dc5b6f9 Merge pull request #8309 from DavidPrevot/chosen
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
Jenkins for ownCloud 642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Jenkins for ownCloud 8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Jenkins for ownCloud c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Jenkins for ownCloud 435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
David Prévot eebb756c38 Adapt chosen (css) path
Avoid shipping duplicate files in 3rdparty/css.

3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.

Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jenkins for ownCloud a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Lukas Reschke e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Lukas Reschke eecd4bd18e Use JS as content-type due to mimesniffing 2014-04-17 10:40:19 +02:00
Jenkins for ownCloud 23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Volkan Gezer 1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00
Jenkins for ownCloud 2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Jenkins for ownCloud 982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
Björn Schießle 10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Jenkins for ownCloud 7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Joas Schilling e79a027e77 Always define sendmail_is_available
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud 796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Jenkins for ownCloud 4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller 647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Jenkins for ownCloud e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Volkan Gezer 286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Lukas Reschke 33a2aa8865 Delete oauth.css 2014-04-04 22:38:16 +02:00
Lukas Reschke b2f8e34388 Remove uneeded file
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
Jenkins for ownCloud 0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
Thomas Müller 20f26068e7 Merge pull request #7476 from owncloud/type-hinting
Type hinting
2014-04-03 20:02:27 +02:00
Jan-Christoph Borchardt 5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Morris Jobke bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
blizzz a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
2014-04-01 14:17:05 +02:00
Vincent Petry 5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Thomas Müller fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Morris Jobke ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
2014-03-31 15:56:19 +02:00
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
raghunayyar 881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Jenkins for ownCloud 915fa3da74 [tx-robot] updated from transifex 2014-03-29 01:55:44 -04:00
Vincent Petry 82f98fb3d3 Fixed user list offset call 2014-03-28 18:12:34 +01:00
Thomas Müller 5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
2014-03-28 10:33:55 +01:00
Jenkins for ownCloud ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Jan-Christoph Borchardt 53b1e4a00b remove additional radio button width declaration 2014-03-27 17:13:12 +01:00
Jan-Christoph Borchardt 5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
Jenkins for ownCloud ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Thomas Müller 1816f43722 Merge pull request #7864 from owncloud/routing-performance
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller 4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
Vincent Petry 5111fad006 Merge pull request #7689 from owncloud/last_cron_log
Log last cron execution
2014-03-25 19:17:36 +01:00
Thomas Müller f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Müller 531c9564b3 Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Jenkins for ownCloud b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
Thomas Müller 3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
raghunayyar 3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud 0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
kondou e6b4d28229 Move success/error squircles to settings 2014-03-21 20:27:22 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
raghunayyar 59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Vincent Petry b75ca9fb50 Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Jenkins for ownCloud 518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Jenkins for ownCloud c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Morris Jobke 3c03ff5bb5 Merge pull request #7340 from owncloud/hide_remove_image_avatar
Hide remove image, if there's no custom avatar
2014-03-13 13:20:00 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Vincent Petry 5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
kondou 556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
kondou 8fafee31ef Use $.hide() instead of .hidden for now
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
kondou dd97d532be Remove OC.Router usage 2014-03-12 15:31:48 +01:00
kondou 1c82b4751e Merge branch 'master' into hide_remove_image_avatar 2014-03-12 15:29:26 +01:00
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +01:00
Joas Schilling efbca04ab4 Use command -v to check for sendmail
Fix #7559
2014-03-12 11:47:21 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Joas Schilling 0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server
Fix #7559
2014-03-05 14:53:20 +01:00
Joas Schilling d583d61b69 Merge pull request #7412 from owncloud/issue/7175
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +01:00
Joas Schilling 5b8cde48dc Add button to send a test mail after changing the email settings
Fix #7175
2014-03-05 10:01:34 +01:00
Morris Jobke af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Thomas Müller 5f711912a1 remove OC.Router.registerLoadedCallback() 2014-03-02 23:45:23 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Bart Visscher 8951328a87 More PHPDoc updates 2014-02-28 21:03:43 +01:00
kondou 3c11dc0006 Merge branch 'master' into hide_remove_image_avatar 2014-02-28 19:28:29 +01:00
Jan-Christoph Borchardt e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Jan-Christoph Borchardt 84eea47991 Merge pull request #7406 from owncloud/settings-apps.js-style
coding style fixes: cut long lines, whitespace
2014-02-26 14:24:34 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
kondou 593adab258 Fix scrutinizer issue in settings/js/apps.js 2014-02-26 11:41:32 +01:00
Vincent Petry a1600a289c Merge pull request #7401 from owncloud/highlight_selected_app_settings
Highlight the selected app in app-settings
2014-02-26 11:07:43 +01:00
Jan-Christoph Borchardt bc1c136cd6 coding style fixes: cut long lines, whitespace 2014-02-26 10:34:38 +01:00
Joas Schilling 331bd527a7 Hide SMTP options based on selected send mode
Fix #7166
2014-02-26 10:30:22 +01:00
Jan-Christoph Borchardt 1a561fced0 fix for coding style 2014-02-26 09:32:20 +01:00
kondou e32acf933d Highlight the selected app in app-settings 2014-02-26 04:03:41 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
kondou 88882e3fa7 Use addClass('hidden') and removeClass('hidden') 2014-02-21 12:42:07 +01:00
kondou 0e0b4d5575 Hide remove image, if there's no custom avatar
Fix #7308
2014-02-20 21:53:59 +01:00
Lukas Reschke 917a505af4 Merge pull request #7291 from owncloud/adminess-raghu
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
Jan-Christoph Borchardt bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Lukas Reschke 16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling c196e59e88 Add event parameter to keyup event
Fix issue #7277
2014-02-19 10:25:52 +01:00
Joas Schilling fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js
Fix issue #7166
2014-02-19 10:20:52 +01:00
Joas Schilling 8387cd8ae3 Add option to change email settings in admin section
Fix issue #7166
2014-02-18 14:26:03 +01:00
Jan-Christoph Borchardt dafa8fc37e do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete 2014-02-18 10:58:00 +01:00
Vincent Petry 58b1dc5e76 Added loading spinner to users list on scroll 2014-02-18 10:52:05 +01:00
Vincent Petry c732764eb5 Improve users list scrolling performance
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
  into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
  the server side)
2014-02-17 19:32:45 +01:00
Bjoern Schiessle f2f5769df7 catch errors during decryption 2014-02-17 10:03:57 +01:00
Morris Jobke 13fa0e2a9d Fix implied evals and doubled definition of variable
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Jan-Christoph Borchardt 61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Morris Jobke d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
Jan-Christoph Borchardt 150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Bjoern Schiessle 6bb27ea76b disable button and input field during decryption 2014-01-24 12:15:06 +01:00
Bjoern Schiessle 2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
Jan-Christoph Borchardt 5956277ed4 Merge pull request #6234 from owncloud/change-email-by-enter
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08:00
Thomas Müller f950ce82ae Merge branch 'master' into mobile-style
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Morris Jobke 80dead5a9f fix double call of changeEmailAddress() 2014-01-18 22:59:49 +01:00
Bjoern Schiessle 80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Bjoern Schiessle e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00
Bjoern Schiessle bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Bjoern Schiessle d36da7e43a use appstoreenabled config switch 2014-01-16 12:58:17 +01:00
Björn Schießle 45709937af Merge pull request #6786 from wakeup/master
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
Volkan Gezer 97b0840bbe Fix untranslated text when deleting user
This should fix issue #6728
2014-01-15 18:40:04 +01:00
Jan-Christoph Borchardt 5f95356592 remove unused log icon 2014-01-15 15:48:42 +01:00
Morris Jobke 5c1a9f35f1 Indicate password strength using strengthify
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Jenkins for ownCloud 37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Jan-Christoph Borchardt 3c21fd5bfc do not show 'Add app' and 'More apps' for themed ownCloud 2013-12-18 14:59:57 +01:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Morris Jobke bc23f46198 fix typo 2013-12-09 16:05:10 +01:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Morris Jobke 44a55056e7 change mail address by pressing enter - fixes #6179 2013-12-07 17:33:27 +01:00
Vincent Petry db0b291f63 Merge pull request #6213 from owncloud/fix-full-name-edit
Fix full name edit for repetitive edit
2013-12-06 06:46:34 -08:00
Morris Jobke ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Jenkins for ownCloud 4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Morris Jobke 008bfc6793 Fix full name edit for repetive edit
fixes #6212

fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Morris Jobke 8506d2bf42 fix wording 2013-11-27 00:38:56 +01:00
Morris Jobke 2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
blizzz 4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Jenkins for ownCloud fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Bjoern Schiessle 2556647a10 check if user is logged in 2013-11-26 12:47:59 +01:00
Jenkins for ownCloud dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Vincent Petry de2b444030 Merge pull request #5960 from owncloud/enc_small_visual_improvements
[encryption] some small visual improvements
2013-11-25 02:12:31 -08:00
Bjoern Schiessle f1f172e16e fix typo 2013-11-25 11:09:31 +01:00
Thomas Mueller f6df4b349f remove logic from template and fix syntax error 2013-11-24 21:27:32 +01:00
Frank Karlitschek 77bb168007 replace echo with p 2013-11-24 17:17:10 +01:00
Frank Karlitschek 22e39baf77 show the build number if on the daily build update channel 2013-11-24 16:46:07 +01:00
Jenkins for ownCloud ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Arthur Schiwon 8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
Jenkins for ownCloud 60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Thomas Müller 4a2f9636cf Merge pull request #5773 from owncloud/fix-2152-master
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Thomas Müller cd1cf58875 Fixing the warning notifications 2013-11-21 14:44:25 +01:00
Bjoern Schiessle caf486d6e7 - show a spinner while decrypting files if the encryption app was disabled
- don't fade-out the decryption result
2013-11-20 12:23:10 +01:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
Bart Visscher 368342a085 Update error messages 2013-11-15 14:46:00 +01:00
Morris Jobke 913cde816f Fix spacing issue for checkboxes, vertically center checkboxes on personal page 2013-11-11 18:03:57 +01:00
Jenkins for ownCloud 3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Jenkins for ownCloud 263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Jan-Christoph Borchardt d62b683c6a change 'Display Name' to more understandable 'Full Name', fix #5612 2013-11-06 14:20:43 +01:00
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud 07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
Morris Jobke ea4dfa7e38 Merge pull request #5638 from owncloud/admin-quotafield
Improve quota input field
2013-10-31 04:25:42 -07:00
Morris Jobke 680f4963dc fix translation strings 2013-10-31 12:21:42 +01:00
Vincent Petry 9d230bcc75 Improve quota input field
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
2013-10-30 20:46:53 +01:00
Vincent Petry aba7335d3f Changed wording in log level dropdown 2013-10-30 18:39:21 +01:00
Vincent Petry e3b13b13c9 Changed log level labels in log level dropdown 2013-10-30 18:23:48 +01:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Jenkins for ownCloud 8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Thomas Müller aa06983345 Merge pull request #5552 from owncloud/admin-warninghomeexistsfix
Fixed user dir existence check when creating new user
2013-10-27 03:11:11 -07:00
Jenkins for ownCloud 119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Vincent Petry 1ee4b680f6 Fixed user dir existence check when creating new user
The check was done too later. It turns out that createUser() had already
created the dir, which caused the warning message to be shown every
time.
2013-10-25 16:23:29 +02:00
Vincent Petry 2102ab8fec Fix leftcontent/right content, fixes tasks app
Tasks app layout was broken since the controls bar is higher now.
This change should hopefully fix other apps using the same layout.
2013-10-24 12:28:28 +02:00
Vincent Petry 5aeafab9ab Fixed wrong id when reading checkbox value for force SSL setting
Fixes #5488
2013-10-23 15:21:18 +02:00
Vincent Petry 00f4928866 Added warning notification when user home already exists
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.

Fixes #5161
2013-10-22 18:10:29 +02:00
Thomas Müller cadd71ec8a Merge pull request #5455 from owncloud/fixing-2423-master
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
Vincent Petry efd71c80f0 Merge pull request #5426 from owncloud/fix-3612
Adds margin to the SSL root certificate button
2013-10-22 01:16:20 -07:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Jenkins for ownCloud a376407da3 [tx-robot] updated from transifex 2013-10-21 13:03:32 -04:00
raghunayyar 744ddc2664 Takes Import button to next line. 2013-10-21 15:19:02 +05:30
Frank Karlitschek 2747862b13 Merge pull request #5429 from owncloud/fix_cron_docu
harmonize this with the documentation. Once every minute is way to often.
2013-10-20 08:49:59 -07:00
Frank Karlitschek 44d15d497e change the language 2013-10-20 15:22:50 +02:00
Jenkins for ownCloud 6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Frank Karlitschek 37b89b11b6 harmonize this with the documentation. Once every minute is way to often. Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html 2013-10-19 01:42:59 +02:00
raghunayyar 45cecc9c08 Adds margin to the SSL root certificate button 2013-10-19 03:09:45 +05:30
Vincent Petry 7a1d0b8497 Merge pull request #5321 from owncloud/settings-applistwidths
Fixed app list right container to not overlap left container scrollbar
2013-10-18 05:18:49 -07:00
Jenkins for ownCloud 2845747528 [tx-robot] updated from transifex 2013-10-17 13:48:52 -04:00
Jenkins for ownCloud 630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Vincent Petry c60f52ddf7 Fixed app list right container to not overlap left container scrollbar
- Container widths in apps list now use pixels instead of em
- Container widths now match properly and rightcontainer doesn't overlap
  the scrollbar any more
2013-10-14 16:29:33 +02:00
Jan-Christoph Borchardt e9ce704f17 Merge pull request #5297 from owncloud/quota-style
Fixes Default Quota Style in User Management.
2013-10-14 03:59:51 -07:00
Frank Karlitschek f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02:00
raghunayyar e0d3046590 Fixes Default Quota Style in User Management. 2013-10-14 10:35:24 +02:00
Jenkins for ownCloud f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
Frank Karlitschek 7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 2013-10-13 21:51:47 +02:00
Thomas Müller 3f54e3c783 Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
Fixed table grid styles for IE8
2013-10-12 03:51:01 -07:00
Thomas Müller fce198874f Merge pull request #5272 from mrflix/master
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
Vincent Petry 1a05ed2f38 Fixed table grid styles for IE8
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.

- Fixes the log table style in IE8 (#5057)
- Fixes the users table layout bug in IE8
2013-10-11 15:58:15 +02:00
raghunayyar 02c7f95687 Includes <optgroup> tag 2013-10-11 18:52:27 +05:30
raghunayyar 7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar 4b2bb11716 Removes the Bogus Label 2013-10-11 18:42:02 +05:30
raghunayyar e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Vincent Petry 6970774776 Fixed display name change for IE8
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.

This fix for #5054 correctly puts the old value into the field with a val() call.
2013-10-11 10:48:30 +02:00
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Felix Niklas 01d3536a76 fix checkbox <-> label binding
clicking the label will trigger the checkbox
2013-10-10 23:10:06 +02:00
Jenkins for ownCloud 209392587f [tx-robot] updated from transifex 2013-10-08 07:24:19 -04:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Victor Dubiniuk a240e63981 Fix new user avatar. Ref#5166 2013-10-07 18:00:15 +03:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Jan-Christoph Borchardt 041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Morris Jobke ecd2bf2a55 Merge pull request #5109 from owncloud/controls-bar-height
Controls bar height
2013-10-04 01:01:54 -07:00
Jan-Christoph Borchardt c335169f6d increase height of controls bar and elements to more clickable 44px 2013-10-04 08:41:16 +03:00
kondou b0ff10a536 Hide defaultavatar in #header and don't darken proper avatars in #header 2013-10-04 02:27:53 +02:00
Jan-Christoph Borchardt 3c13afee98 better style and color for warning and success feedback on inputs 2013-10-03 16:58:48 +03:00
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/private/util.php
2013-10-02 10:11:18 +02:00
Jenkins for ownCloud a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Jenkins for ownCloud 59e4ff7d24 [tx-robot] updated from transifex 2013-09-29 00:03:26 -04:00
kondou 24d092c4ba Have uniform (wrong) indention 2013-09-28 17:49:07 +02:00
kondou 4907685405 Base defaultavatar text on displayname
Fix #4876
2013-09-28 16:46:53 +02:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Thomas Müller 40871bab88 Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/public/share.php
2013-09-23 11:18:00 +02:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Bart Visscher 45a7b0dbac Fix the apps enabling/disabling in settings 2013-09-20 20:29:15 +02:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Thomas Müller de8d0783ed fixing syntax error - it it that hard to test own code? 2013-09-18 23:46:58 +02:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Bart Visscher 817b8d151b Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
kondou 18a2c48ceb Translate errormsgs in settings/changepassword/controller 2013-09-18 16:47:27 +02:00
Bjoern Schiessle 534d93d2d3 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
2013-09-16 10:40:06 +02:00
Bernhard Posselt a58e176852 Merge pull request #4506 from owncloud/oc_avatars
OC Avatars
2013-09-14 16:00:36 -07:00
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
kondou 18da2f9cf7 Improve changepassword route naming 2013-09-13 17:07:23 +02:00
kondou 306a8681c5 Move ajax/changepassword to changepassword/controller to use autoloading 2013-09-13 17:03:13 +02:00
ringmaster 3790cbb493 Allow numeric group names 2013-09-13 09:06:20 -04:00
kondou c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
kondou 2ae3ab98d8 Merge branch 'master' into split_personal-user_passwordchange 2013-09-11 16:35:55 +02:00
kondou f6faec0e0b Use a controller instead of two files for changepassword.php 2013-09-11 16:35:13 +02:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
kondou 1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
kondou 4963a5b30f Fix language selection; Fix #4756 2013-09-07 16:28:51 +02:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
kondou 4aa84047fe Remove $recoveryPassword from changepersonalpassword & fix indent 2013-09-06 17:05:10 +02:00
kondou d18a070a03 Have the "notsquare" error as data, not as message 2013-09-06 13:46:50 +02:00
kondou a21376480d Split personal and user-mgmt password change logic 2013-09-06 08:05:07 +02:00
kondou 3774632ecc Clean up avatars and preliminary use JSON->rawlist.php 2013-09-05 23:12:52 +02:00
kondou 15ab798353 Fix an IE8 bug with the avatarcropper.
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
2013-09-05 19:26:02 +02:00
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update

Conflicts:
	lib/util.php
2013-09-05 13:39:45 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
kondou 6db96603a0 Have login-checks and CSRF checks 2013-09-05 00:04:31 +02:00
kondou fca5db748b Remove backgroundcolor on updating avatar, and add a missing parameter 2013-09-04 13:16:21 +02:00
kondou 820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou a1e7614d73 Clean up oc_avatars 2013-09-04 12:56:14 +02:00
Morris Jobke 09187f3b3b Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
kondou 32a7ba9823 Don't update avatar on displayNameChange anymore 2013-09-04 07:13:09 +02:00
kondou 6d42f51d0c Fix unwanted caching in IE8 2013-09-03 18:34:40 +02:00
kondou 4724d60ecd Partly fix cropper in IE8 and don't use a dialog for it 2013-09-03 17:40:41 +02:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
kondou 65413a95dc Merge branch 'master' into oc_avatars
Conflicts:
	config/config.sample.php
2013-09-03 04:43:11 +02:00
Bjoern Schiessle 3ce4bf5ec7 use css class hidden to hide setting elements 2013-09-02 17:14:11 +02:00
kondou e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/util.php
2013-09-02 14:41:46 +02:00
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
kondou e5fc7b9dbe Merge branch 'master' into clean_up_util
Conflicts:
	lib/base.php
2013-09-02 07:58:06 +02:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
kondou c95d4cafa9 Fix @tanghus's complains in avatars and clean up cropper after closing with "x" 2013-09-01 19:12:54 +02:00
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
kondou aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 2013-08-31 18:27:28 +02:00
kondou 5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Jan-Christoph Borchardt 1e834c57a4 fix issues caused by introduction of sticky Apps management footer 2013-08-30 13:46:10 +02:00
kondou 80e10f01c4 Clean up 2013-08-30 13:16:13 +02:00
kondou ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
kondou c533b80682 Use OC_Cache and finish cropper functionality 2013-08-29 16:56:32 +02:00
kondou 0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
kondou e66113f50d Include placeholder.js 2013-08-28 23:23:17 +02:00
Thomas Müller 1d04843ef0 no duplicate declaration of appLicense + camelCase 2013-08-28 22:42:43 +02:00
kondou 6c7efd5dac Work around #4630 to fix license showing 2013-08-28 22:12:01 +02:00
kondou bdf48a6daa Use OC.Router.generate, TODO use cache, prepare for defaultavatars 2013-08-28 21:20:28 +02:00
kondou 67c5be9f19 Merge branch 'master' into oc_avatars
Conflicts:
	3rdparty
2013-08-28 16:44:11 +02:00
kondou 8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
Jan-Christoph Borchardt 0c02e1efef Merge pull request #4563 from owncloud/use_personal-password
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
Jenkins for ownCloud 3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 8cf9336bcb storage information is path specific 2013-08-27 00:59:58 +02:00
kondou e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou 31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
Jenkins for ownCloud d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
kondou 9a8908b643 Use Jcrop, have inline errormsg, work on cropping, clean up, WIP 2013-08-25 21:06:44 +02:00
kondou 81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou 0a4febf1eb Integrate newavatar.php into avatar.php by using GET, POST & DELETE 2013-08-25 21:06:01 +02:00
kondou cd2f7bdaef Deny access for non-users and add a (not-working) override button 2013-08-25 21:06:01 +02:00
kondou 9c12da6a94 Several improvements
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
kondou d7e6c77e20 Have a fancy uploadavatar button 2013-08-25 21:05:40 +02:00
kondou 9500109349 Refactor newavatar.php and show (for now) an alert on problems when setting new avatars 2013-08-25 21:05:40 +02:00
kondou 33827d690e Use avatar.php in user-management 2013-08-25 21:05:38 +02:00
kondou 131d0edab6 Show avatar on personal.php always (except if avatars are disabled) 2013-08-25 21:04:49 +02:00
kondou 4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou 252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou a58d270684 Load avatar from path, if one's provided 2013-08-25 21:04:09 +02:00
kondou 2bfe662235 Add unittests & check filetype in setLocalAvatar()
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
kondou fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt
And other small improvements
2013-08-25 21:04:04 +02:00
kondou 4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
Christopher b8965c6107 Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
2013-08-25 11:56:56 -07:00
kondou fbe7a68ce8 Use personal-password for the password name in personal.php
Fix #4491
2013-08-24 14:31:32 +02:00
Jenkins for ownCloud 596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00