mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,347 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

1952 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer b12c1cb325 add OC.Breadcrumb.show(dir, filename, link) 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer 41739ff83f Merge pull request #4278 from owncloud/breadcrumb-first 
make sure the first breadcrumb item is inserted before any other elements in the topbar
 2013-08-02 02:46:12 -07:00
Jenkins for ownCloud 16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Victor Dubiniuk 85f1de884f Better ie8 multiselect 2013-08-01 19:59:32 +03:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
Robin Appelman 44594fb41c make sure the first breadcrumb item is inserted before any other elements in the topbar 2013-08-01 16:46: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 ded02e771e wrap code output in error messages, fix #4231 2013-07-31 18:08:29 +02:00
Jan-Christoph Borchardt 0a5be39446 remove unused and never to be used pagination 2013-07-31 09:58:57 +02:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Thomas Müller d3e610f589 Merge pull request #4225 from owncloud/better-404 
More verbose 404, closes #3225
 2013-07-30 13:20:28 -07:00
Jan-Christoph Borchardt 31afbb3434 remove ugly inset shadow from header 2013-07-30 14:47:05 +02:00
Jan-Christoph Borchardt f9d1d79929 reduce z-index of settings popup, fix #4212 2013-07-30 14:43:48 +02:00
Georg Ehrke 93cdfc3e8a Merge branch 'master' into oc_preview 2013-07-30 13:52:53 +02:00
Georg Ehrke 640253fa31 fix code style of try catch blocks 2013-07-30 13:43:15 +02:00
Georg Ehrke ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Jan-Christoph Borchardt 1a1c100719 fix loading.gif size for both upload and deletion, force visiblity 2013-07-30 10:44:01 +02:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Victor Dubiniuk 33fe24dc3d Replace delete icon with spinner 2013-07-29 19:27:11 +03:00
Victor Dubiniuk dec7b2fa40 Move styles from core to app 2013-07-29 17:36:59 +03:00
Victor Dubiniuk 97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03:00
Georg Ehrke e01bc7de98 Revert "OC\Preview - outsource static methods" 
This reverts commit 14a35267c1.
 2013-07-29 14:51: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
Jörn Friedrich Dreyer 98e76b8978 Merge pull request #4199 from owncloud/login-cleanup 
Login cleanup IE8 fixes
 2013-07-26 05:15:02 -07:00
Jörn Friedrich Dreyer a0f574ccd7 IE8 login/install screen cleartype fixes and input box borders 2013-07-26 10:00:07 +02: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
Jörn Friedrich Dreyer 284fb86258 show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids 2013-07-24 19:56:57 +02:00
Jörn Friedrich Dreyer 18c565666e force dbs to stay in one line 2013-07-24 19:56:57 +02:00
Jörn Friedrich Dreyer 5c00804c61 force dbs to stay in one line 2013-07-24 17:06:52 +02:00
Jan-Christoph Borchardt 9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Jan-Christoph Borchardt 876309a215 Merge pull request #4175 from owncloud/remember-checked 
check remember log in by default, ref #3918
 2013-07-24 07:05:41 -07:00
Jan-Christoph Borchardt aae26ef5e5 slight dark inset text shadow for warnings to increase legibility 2013-07-24 12:41:09 +02:00
Björn Schießle 003ae7b916 use OC_Defaults directly from the template 2013-07-24 12:04:18 +02:00
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Jan-Christoph Borchardt 6a5e2ea7d5 check remember log in by default, ref #3918 2013-07-24 10:01:56 +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
Jan-Christoph Borchardt 315613a8f3 Bring the Noise 2013-07-23 21:33:15 +02:00
Jan-Christoph Borchardt c92e0eab97 remove superfluous important 2013-07-23 21:25:07 +02:00
Jan-Christoph Borchardt 84fa84d182 fix browser rendering issues 2013-07-23 18:42:35 +02:00
Jan-Christoph Borchardt d1a5dfc397 larger log in and installation buttons 2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt 12990543bc better whitespace for footer 2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt 837b158914 cleaner look and code for primary button 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt 6dfbe21446 input fields work on any background now 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt c524c04808 add some padding to footer 2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt dc82e29949 adjust labels and input field groups 2013-07-23 18:41:00 +02:00
Jan-Christoph Borchardt 31bf24a116 more beautiful warnings 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 74edfd79f5 fix and checkstyle for show password toggle 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt acb26c3a52 increase button size, adjust remember checkbox 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 9568fefb80 move log in button CSS to appropriate place 2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt 89d0d7f58b adjust text colors for remember and footer 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 622c567c1f larger clickable area for remember log in 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 38bfae57fe sticky footer 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt fd4638c229 primary button adjustments 2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt 14edfa52ea input field adjustments for new full-color background on log in 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt c478234f6a fix general reset CSS issue which caused gradient background to cut off 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt 107ace42b8 rip out unneeded #login div, replace with existing body-login 2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt 9982f47ab5 initial WIP for cleaner log in page 2013-07-23 18:36:44 +02:00
Jörn Friedrich Dreyer ab77af7b4d Merge pull request #4159 from owncloud/Fixing-share-sj-error 
Fixing share JS error
 2013-07-23 08:23:15 -07:00
Thomas Müller 2a42021815 Merge branch 'master' into delete-fix 
Conflicts:
	core/css/styles.css
 2013-07-23 16:24:34 +02:00
Victor Dubiniuk cdb993ad69 Explicit ie8 fallback 2013-07-23 17:13:12 +03:00
Victor Dubiniuk ab997bdc68 Create an array entry before filling it 2013-07-23 14:57:58 +03:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Victor Dubiniuk 5160ea6063 Show generic error when there is no error 2013-07-22 21:02:18 +03:00
Thomas Müller 934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Morris Jobke 647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment 
finally remove the file size obfuscation as it had more disadvantages.
 2013-07-21 01:25:39 -07:00
Jenkins for ownCloud 9a13b687cc [tx-robot] updated from transifex 2013-07-21 02:02:41 -04:00
Jan-Christoph Borchardt 35fc149ef0 deactivate show password toggle for IE 2013-07-19 15:17:28 +02:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Jan-Christoph Borchardt 48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Jan-Christoph Borchardt 8a25d1ad06 remove unnecessary tipsy for Files delete 2013-07-18 18:41:01 +02:00
Jan-Christoph Borchardt 197c979d26 use background image instead of img for Files delete icon 2013-07-18 18:40:09 +02:00
Jan-Christoph Borchardt cab792323d make delete icon less intrusive again, only on hover 2013-07-18 18:31:56 +02:00
Jenkins for ownCloud 279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud 210006c4a6 [tx-robot] updated from transifex 2013-07-17 02:28:02 -04:00
Jakob Sack bb0c5bff5f Add multiple plural forms to the php part 2013-07-16 22:16:53 +02:00
Jenkins for ownCloud a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
Jenkins for ownCloud 583addaea1 [tx-robot] updated from transifex 2013-07-13 02:07:35 +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
kondou 10cc0511af Optimize images with optipng and scour 2013-07-12 01:36:10 +02:00
Georg Ehrke 14a35267c1 OC\Preview - outsource static methods 2013-07-11 20:35:55 +02:00
Jan-Christoph Borchardt 20791e0ad1 use themable strings for installation 2013-07-11 17:39:44 +02:00
Jan-Christoph Borchardt aacca494c5 introduce shortname themable string and split from title, use for image alt text 2013-07-11 16:38:07 +02:00
Jörn Friedrich Dreyer c5f2ea9a95 Merge pull request #4015 from owncloud/fixing-4005-master 
EventSource and update fixes [master]
 2013-07-11 03:33:47 -07:00
Jenkins for ownCloud f74659f3f6 [tx-robot] updated from transifex 2013-07-11 02:26:22 +02:00
Thomas Müller d18bd17eb7 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser 
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
 2013-07-11 00:27:21 +02:00
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke 832779804d add two new icons - for copyright see filetypes/readme-2.txt 2013-07-10 12:30:20 +02:00
kondou 4cd87549e1 Close.png instead of delete.png for close dialogs 2013-07-10 04:39:22 +02:00
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Jan-Christoph Borchardt b44cab5acc prevent ugly selection effect on accidental selection, fix #3713 2013-07-09 22:04:22 +02:00
Jan-Christoph Borchardt bbad1ad21e more whitespace for user menu 2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt 583d068590 more small whitespace fixes for the app list 2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt a5c84768f1 more whitespace WIP 2 2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt 87d1e72f9c more whitespace WIP 2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt 7eb6e8d5b5 app styles: remove bottom padding. Settings should be last in list instead of permanent 2013-07-09 22:04:20 +02:00
raghunayyar aca2c93839 Removes Borders from the left navigation. 2013-07-09 22:04:20 +02:00
kondou 4818e0062e General CSS cleanup 2013-07-09 16:08:32 +02:00
Jörn Friedrich Dreyer 5513e30752 Merge pull request #3920 from owncloud/Fixing_search_ie8 
[ie8] Fix lazy CSS loading and missing borders in search dropdown
 2013-07-09 05:29:18 -07:00
Jenkins for ownCloud 439cad07b5 [tx-robot] updated from transifex 2013-07-09 02:12:22 +02:00
icewind1991 af1c3dd4ce Merge pull request #3963 from owncloud/update-logic-split 
Move the upgrade logic to \OC\Updater
 2013-07-08 12:38:39 -07:00
Jan-Christoph Borchardt 8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup 
Icon cleanup
 2013-07-08 06:56:29 -07:00
Georg Ehrke 04292ff16c implement use of preview icons in thrashbin app 2013-07-08 10:53:53 +02:00
Jakob Sack 4e214883d6 Partly integrate plural translations into js 2013-07-07 20:26:09 +02:00
Jenkins for ownCloud 096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Robin Appelman 58f473d734 split upgrade logic from ajax file 2013-07-06 17:00:00 +02:00
Jenkins for ownCloud c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller 18b11f76b1 fixing === and ident 2013-07-05 15:27:14 +02:00
Thomas Müller 59b700a550 Merge branch 'master' into fixing-3934-master 
Conflicts:
	core/js/share.js
 2013-07-05 13:52:33 +02:00
Thomas Müller 27c0cc7fda no anonymous upload on read-only folders 2013-07-05 11:23:08 +02:00
Thomas Müller 13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
Björn Schießle 83898e87be Merge https://github.com/owncloud/core/pull/3900 
Squashed commit of the following:

commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jul 5 09:59:29 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:03:47 2013 +0200

    Merge branch 'master' into theme_aware_mail_footer

commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 10:38:39 2013 +0200

    switch to non-static defaults.php

commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:59:48 2013 +0200

    Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer

    Conflicts:
    	core/templates/altmail.php

commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 3 16:56:29 2013 +0200

    name and slogan should be in one line

commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Mon Jul 1 21:15:35 2013 +0200

    no ?> at the end of a file

commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:58:36 2013 +0200

    print url unescaped

commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 12:56:05 2013 +0200

    make new mail templates aware of different ownCloud themes
 2013-07-05 10:07:23 +02:00
Jenkins for ownCloud 955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
Jan-Christoph Borchardt b9be693305 change delete from entry forbidden sign to proper icon 2013-07-05 01:51:09 +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
Jenkins for ownCloud 811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02:00
Victor Dubiniuk 16e5a1b100 Fix lazy styles loading in IE8 2013-07-02 18:44:10 +03:00
Jenkins for ownCloud cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Björn Schießle d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +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
Morris Jobke b19033b353 Merge pull request #3223 from owncloud/fix-2820 
if rename of file fails, the rename is undone in the view - fix 2820
 2013-07-01 01:28:17 -07:00
Jenkins for ownCloud 80a8b9c995 [tx-robot] updated from transifex 2013-07-01 03:28:25 +02:00
Jenkins for ownCloud 4d74e8955f [tx-robot] updated from transifex 2013-06-30 02:13:07 +02:00
Lukas Reschke 0217315a24 Escape dropdown 
Fixes #3241
 2013-06-29 13:24:05 +02:00
Bart Visscher 414b5f150e Merge pull request #2914 from Kondou-ger/label_overlapping_value 
Fix textfield label overlapping value.
 2013-06-29 04:09:50 -07:00
Jenkins for ownCloud d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00
Jörn Friedrich Dreyer 7d3490036c Merge pull request #3838 from rgeber/master 
Public Upload Feature
 2013-06-28 07:30:41 -07:00
Thomas Tanghus be22d28eb9 Merge pull request #3576 from owncloud/jquery.multiselect-1.13 
Update to jquery.multiselect 1.13
 2013-06-27 07:50:47 -07:00
Jenkins for ownCloud 29caae3491 [tx-robot] updated from transifex 2013-06-27 02:12:00 +02:00
Thomas Mueller e6c1db7a3f move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853 2013-06-26 11:23:21 +02:00
Jenkins for ownCloud afc3d9314a [tx-robot] updated from transifex 2013-06-26 02:07:04 +02:00
Jan-Christoph Borchardt dc65482d50 first round of replacing small filetype icons with proper ones, from Elementary 2013-06-25 17:57:38 +02:00
Roman Geber ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Jenkins for ownCloud c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +02:00
Jenkins for ownCloud aaecfa18ed [tx-robot] updated from transifex 2013-06-23 02:05:39 +02:00
Jenkins for ownCloud 8c923a85de [tx-robot] updated from transifex 2013-06-21 08:53:57 +02:00
kondou 7fd45e2875 Optimize pictures with optipng and scour 2013-06-21 04:24:40 +02:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Björn Schießle 99008ace36 fixed enghlish sentence, thanks to @MTGap 2013-06-19 12:05:45 +02:00
Björn Schießle 7f6a9e8fef fix lost password page, don't show checkbox is encryption is not enabled 2013-06-19 11:48:09 +02:00
Frank Karlitschek 11194c69db Merge pull request #3765 from owncloud/hide-logo-claim 
hide the logo claim in case the theme is not loaded
 2013-06-18 14:14:34 -07:00
Jenkins for ownCloud d991a9372b [tx-robot] updated from transifex 2013-06-18 02:11:10 +02:00
Jan-Christoph Borchardt aaefa157fd hide the logo claim in case the theme is not loaded 2013-06-17 20:35:08 +02:00
Jan-Christoph Borchardt 1f518025a3 standardize on 32px loading spinner, decrease size in CSS where needed 2013-06-17 13:20:02 +02:00
Jan-Christoph Borchardt 0f904b3c9c use proper style for add icon 2013-06-17 12:58:43 +02:00
Jan-Christoph Borchardt d9dcba9a39 remove unused loading spinners, just have one 2013-06-17 12:35:25 +02:00
Georg Ehrke 1a933a9173 Merge branch 'master' into oc_preview 2013-06-17 12:31:02 +02:00
Jan-Christoph Borchardt 078835ee9d remove unused big images 2013-06-17 12:27:45 +02:00
Jan-Christoph Borchardt 344a73b173 use mail icon consistent with Mail app icon 2013-06-17 12:26:32 +02:00
Jan-Christoph Borchardt 73727c5b0b transparent background for lock icon 2013-06-17 12:22:09 +02:00
Jan-Christoph Borchardt 257ebc2830 use consistent icon for 'restore'/versions/history, also SVG 2013-06-17 12:18:45 +02:00
Jan-Christoph Borchardt 9e78e6b2e5 differentiate delete from close icon 2013-06-17 12:14:36 +02:00
Jenkins for ownCloud 6156d71832 [tx-robot] updated from transifex 2013-06-17 02:08:11 +02:00
Jenkins for ownCloud 8243d19050 [tx-robot] updated from transifex 2013-06-16 02:07:45 +02:00
Morris Jobke e0547a25ab if rename of file fails, the rename is undone in the view - #fix 2820 
Changes:
 * OC.dialog -> OC.Notification
 * Added test
 * Fixed OC.Notification.show() issue for queued items
 * Highlight failed item and show notification
 2013-06-15 09:58:27 +02:00
Jenkins for ownCloud ab411d2700 [tx-robot] updated from transifex 2013-06-15 02:07:18 +02:00
Thomas Mueller f3d33a7d5b remove » and « from the text mail because they will be escaped 2013-06-14 20:04:20 +02:00
Stephan Arts ff64278a07 Do no translate "ownCloud - " 2013-06-14 18:02:35 +02:00
Stephan Arts 3cd7747e7b Use templates to theme share e-mails (#3683) 2013-06-14 17:38:56 +02:00
Jan-Christoph Borchardt 2344654236 Merge pull request #3726 from owncloud/remove-outlines 
remove dotted outlines in Firefox, fix #3712
 2013-06-14 08:06:52 -07:00
Jan-Christoph Borchardt 06fd7e0d21 remove dotted outlines in Firefox, fix #3712 2013-06-14 14:08:04 +02:00
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start 
Conflicts:
	lib/util.php
 2013-06-14 10:06:13 +02:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Björn Schießle 15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
 2013-06-13 13:17:35 +02:00
Thomas Tanghus 3584d48d65 Merge pull request #3679 from owncloud/multiselect-fixes 
Multiselect fixes
 2013-06-12 09:52:15 -07:00
Björn Schießle 2141c41d0d add logo-claim 2013-06-12 17:20:09 +02:00
Björn Schießle b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
Björn Schießle 918906f042 make footer aware of ownCloud editions 2013-06-12 14:49:30 +02:00
Björn Schießle 7c108edc36 mage page title aware of ownCloud edition 2013-06-12 14:33:24 +02:00
Jan-Christoph Borchardt cdedfb6f37 multiselect: up min-width of group multiselect to 150px 2013-06-11 18:23:29 +02:00
Jan-Christoph Borchardt 0bcb04398d multiselect: fixed 'add group' interface a bit 2013-06-11 18:21:13 +02:00
Jan-Christoph Borchardt 686797eb6d multiselect: more breathing space for entries 2013-06-11 18:08:47 +02:00
Jan-Christoph Borchardt 27996d1c64 multiselect: drop shadow for better focus 2013-06-11 18:04:33 +02:00
Jan-Christoph Borchardt 35e7b64cc2 multiselect: do not cut off group names 2013-06-11 18:04:11 +02:00
Jan-Christoph Borchardt e6a4721f64 checkstyle: add space after colon 2013-06-11 18:02:52 +02:00
Jan-Christoph Borchardt 09ff9b2a2c remove leading spaces 2013-06-11 18:01:50 +02:00
Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-11 15:19:02 +02:00
Jan-Christoph Borchardt abfbd9b136 feedback for hover/tap on breadcrumbs 2013-06-11 14:51:29 +02:00
Jan-Christoph Borchardt 651f1b0995 better contrast and grouping for blocks in personal settings through darker background color 2013-06-11 14:51:06 +02:00
Jan-Christoph Borchardt 2a936670ce better contrast for controls bar 2013-06-11 14:50:23 +02:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +02:00
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	settings/ajax/changepassword.php
 2013-06-10 12:12:07 +02:00
Georg Ehrke a2bb0faec6 Merge branch 'master' into oc_preview 2013-06-10 10:15:53 +02:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Georg Ehrke 8114537310 Merge branch 'master' into oc_preview 2013-06-07 09:46:13 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Georg Ehrke 85ecec8b01 Merge branch 'master' into oc_preview 2013-06-06 11:13:55 +02:00
Björn Schießle 58fd76607b print a warning if a user wants to reset his password and encryption is enabled 2013-06-05 18:38:39 +02:00
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
opensaucesystems d987bea635 Added input[type="url"] to styles.css 2013-06-04 16:04:29 +02:00