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
Jenkins for ownCloud
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
Morris Jobke
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
kondou
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
kondou
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
kondou
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Andreas Fischer
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Bart Visscher
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
Thomas Müller
264ee9df9a
Merge pull request #4476 from owncloud/doc-on-master
...
fix difference between packaged version and master
2013-08-17 03:13:17 -07:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Morris Jobke
746d32eb05
fix difference between packaged version and master
2013-08-17 10:33:11 +02:00
Jan-Christoph Borchardt
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Owen Winkler
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
Jenkins for ownCloud
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
kondou
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
kondou
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Jan-Christoph Borchardt
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
Jan-Christoph Borchardt
31d50288a5
draw attention to the newly added app entry by flashing it twice
2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt
7a9daa99d1
scroll the app navigation down so the newly added app is seen
2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt
775f33cc1b
prepend the new app before the 'More apps' function
2013-08-07 21:53:25 +02:00
Jan-Christoph Borchardt
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
Jenkins for ownCloud
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
Jenkins for ownCloud
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
Jenkins for ownCloud
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
Victor Dubiniuk
0c1008bb69
Some styling to user list
2013-08-01 19:53:41 +03:00
kondou
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
Jenkins for ownCloud
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
kondou
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
Jan-Christoph Borchardt
8eaa0e7336
remove table layout for background jobs
2013-07-31 10:04:02 +02:00
Jenkins for ownCloud
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
Bjoern Schiessle
c7eba69aea
only show decrypt all files option if encrypted files are available
2013-07-30 12:26:07 +02:00
Bjoern Schiessle
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
Jenkins for ownCloud
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
830f5d24c7
add decryptall.php
2013-07-29 13:39:56 +02:00
Björn Schießle
0a3d662dd0
register decrypt all route
2013-07-29 13:39:37 +02:00
Björn Schießle
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
Björn Schießle
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Jenkins for ownCloud
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
Jenkins for ownCloud
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
Jenkins for ownCloud
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
kondou
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
Björn Schießle
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Jenkins for ownCloud
7bb6aab8ee
[tx-robot] updated from transifex
2013-07-24 01:57:21 -04:00
Thomas Müller
840e96cda3
Merge branch 'master' into disable-anon-upload-master
...
Conflicts:
settings/templates/admin.php
2013-07-22 11:55:20 +02:00
Thomas Müller
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
Morris Jobke
342a54bf7b
Merge pull request #2980 from owncloud/===_and_!==_in_settings
...
Use !== and === in settings.
2013-07-22 02:32:40 -07:00
Jenkins for ownCloud
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
kondou
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
Jenkins for ownCloud
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Jenkins for ownCloud
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
Thomas Müller
2964027cad
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
2013-07-14 22:00:42 +02:00
Thomas Müller
79d23463f8
No admin option to enable public upload in case encryption is enabled
...
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
rolandgeider
995feea42a
Use transifex.com on link to translations
2013-07-14 11:54:39 +02:00
Jenkins for ownCloud
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
Jenkins for ownCloud
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
Thomas Mueller
7a44d45714
change anonymous to public
2013-07-12 21:34:38 +02:00
Thomas Müller
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
Jenkins for ownCloud
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
Jenkins for ownCloud
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
kondou
efb707a431
Use OC instead of oc to show alert at an error.
...
Related to #4001
2013-07-10 04:28:54 +02:00
Jenkins for ownCloud
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
kondou
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
Jenkins for ownCloud
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Jenkins for ownCloud
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
Raghu Nayyar
b2afbe0e8b
Merge pull request #3927 from owncloud/Fix_new_user_empty_group
...
Do not add groups if user has no groups
2013-07-04 11:50:19 -07:00
Björn Schießle
5f2378be5b
revert changes which where introduced by accident during merge 23cc69b816
2013-07-04 12:06:36 +02:00
Björn Schießle
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
Jenkins for ownCloud
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
Victor Dubiniuk
a20f7f1d67
Do not add groups if user has no groups
2013-07-03 22:06:09 +03:00
Jenkins for ownCloud
cec8384b1a
[tx-robot] updated from transifex
2013-07-02 15:35:55 +02:00
Thomas Müller
a20e9dee89
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
...
Ie8 compatibility fixes
2013-07-01 11:57:29 -07:00
Björn Schießle
87bbdc1ed9
check for updates only in the community edition
2013-07-01 10:46:16 +02:00
Björn Schießle
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
Jenkins for ownCloud
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00