Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-26 06:14:59 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
17,728 Commits 428 Branches 1,013 Tags 4.9 GiB
f5bc680f9c
Commit Graph

1495 Commits

Author SHA1 Message Date
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