Commit graph

3076 commits

Author SHA1 Message Date
Morris Jobke
dda5e6c85b add proper Exception message for invalid token 2014-06-13 16:18:58 +02:00
Morris Jobke
1cb7239cb7 use array_merge for merging arrays in PHP 2014-06-13 16:18:39 +02:00
Morris Jobke
ed8b7fc101 complete renaming uid to userId 2014-06-13 16:18:21 +02:00
Morris Jobke
ebbf228309 remove whitespace at end of line 2014-06-13 16:03:13 +02:00
Morris Jobke
a53cfcb9d1 Migrate ´ to ' 2014-06-13 16:02:41 +02:00
Morris Jobke
cedca03ef5 Remove infield label, add password icon, fix layout 2014-06-13 15:56:21 +02:00
Morris Jobke
d0b71dffca reformat method call and fix paranthesis mismatch 2014-06-13 15:39:44 +02:00
Bernhard Posselt
2b2b1b487c more style fixes 2014-06-13 15:34:52 +02:00
Bernhard Posselt
a6e45a8d0e use more stuff from core :) 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
e026b1dc19 Add missing use 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
59ff71f781 Fix check for user existence 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
47c6fd0c85 Remove debug output 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
4b359ad20c Change routes. Update templates 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
218d0add36 Changes according to review 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
a7fbd91e53 Use appframework 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
23ed038a27 Basics 2014-06-13 15:34:51 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Vincent Petry
6a0f5cfc61 Added unit tests for heartbeat interval min/max values 2014-06-12 18:42:09 +02:00
Vincent Petry
ce168c286a Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.

This fix adds a maximum ping interval of 24 hours.

Forward port of 00ec5fc193 from stable6.
2014-06-12 18:41:19 +02:00
Morris Jobke
dff4ad3e00 Merge pull request #8999 from owncloud/issue/8996
Issue/8996 IE8 issues with the new menu
2014-06-12 13:34:32 +02:00
Morris Jobke
d17094e0a5 Move IE8 fixes to fixes.css 2014-06-12 13:33:32 +02:00
Joas Schilling
6c0e27ac99 Fix missing caret in header menu for IE8 2014-06-12 11:01:35 +02:00
Joas Schilling
324075bc78 Fix header menu background in IE8 2014-06-12 11:00:44 +02:00
Joas Schilling
7896b866df Reduce size of png files so they match the svg
Fix #8996
2014-06-12 10:55:25 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Morris Jobke
e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2
make text preview backend use imagettftext, fixes #8087
2014-06-11 01:07:32 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry
015c5062e5 Disable snapper init for IE <= 9
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
2014-06-10 17:14:49 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke
1037533a9e Merge pull request #8937 from owncloud/design-sizing
Layout fixes
2014-06-08 12:31:24 +02:00
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jan-Christoph Borchardt
c0973fe7e8 display empty content message a bit higher up so it's easier to see 2014-06-07 12:08:12 +02:00
Jan-Christoph Borchardt
49e15f0130 app settings: only display text fields at full width, not buttons 2014-06-07 12:07:50 +02:00
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Björn Schießle
3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares
only expire link shares
2014-06-06 19:24:15 +02:00
Raghu Nayyar
dfe6bd61bf Merge pull request #8935 from owncloud/missed-apps-tag
wrap App text with t() to let it use locales
2014-06-06 22:39:31 +05:30
Volkan Gezer
713a1c683b wrap App text with t() to let it use locales 2014-06-06 18:31:04 +02:00
Bjoern Schiessle
9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Jan-Christoph Borchardt
6f0f738f08 reduce padding by 1px after increasing image 2014-06-06 15:58:30 +02:00
Jan-Christoph Borchardt
85a002468d fix logo glitch, add whitespace around form 2014-06-06 15:54:19 +02:00
Bjoern Schiessle
f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Jan-Christoph Borchardt
933c05566e Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt
1a519b851d Merge pull request #8923 from owncloud/app-settings-input
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
Vincent Petry
5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt
08b5f787cc app settings: display input fields at full width 2014-06-06 13:01:24 +02:00
Jan-Christoph Borchardt
ecdfea241f fix left padding of controls bar for apps without navigation 2014-06-06 12:28:28 +02:00
Jan-Christoph Borchardt
b5b4350ada slight transparency for controls bar for more open feel 2014-06-06 12:24:44 +02:00
Jan-Christoph Borchardt
a6f9dd9c4b fix apps without app-navigation 2014-06-06 12:22:31 +02:00