wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15574 commits 157 branches 562 tags 714 MiB
Commit graph

1337 commits

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