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

1247 commits

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