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

3705 commits

Author SHA1 Message Date
Thomas Müller
2f19de11e4 adding console command to generate javascript translation files based on existing php translation files 
read server side translations from json files
 2014-10-29 10:09:12 +01:00
Vincent Petry
d71cd680dd Include core translations 
Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
 2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out 
remove translation.php
 2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions 
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
 2014-10-29 10:09:12 +01:00
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
Lukas Reschke
510d0b2cf3 Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter 
Also support closing tags with no text content given

Conflicts:
	lib/private/template.php
 2014-10-28 11:15:58 +01:00
Lukas Reschke
d6380a5395 Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable 
Make supported DBs configurable within config.php
 2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51 code cleanup during review 👍 2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9 Make supported DBs configurable within config.php 
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
 2014-10-27 21:39:34 +01:00
Vincent Petry
aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs 
Setting moment locale based on user selection
 2014-10-27 10:30:47 +01:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke
2d2a4741ce Make files non executable 
There is not much sense in having these files marked executable, we should avoid that.
 2014-10-24 11:14:51 +02:00
Jenkins for ownCloud
9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Morris Jobke
a10b25587f add avatardiv-shown class to bring back mobile style 2014-10-23 23:51:05 +02:00
kondou
729dffed5e Load avatar in header via PHP 
* fix #7484
* use UID, css, and div instead of span
 2014-10-23 23:17:18 +02:00
Clark Tomlinson
ca5abe5744 Setting moment locale based on user selection 2014-10-23 10:32:47 -04:00
Thomas Müller
e26a16afea Merge pull request #11549 from owncloud/add-more-localizations-master 
implement localizations based on punic
 2014-10-23 16:09:47 +02:00
Thomas Müller
6c1871da06 Merge pull request #10985 from owncloud/db-cleanup 
Cleanup database handling
 2014-10-23 13:48:33 +02:00
Thomas Müller
2584ba29ea Merge pull request #11710 from owncloud/closeSessionForAvatars 
Close session for avatar get
 2014-10-23 11:36:47 +02:00
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Lukas Reschke
3b42d3cfed Close session for avatar get 
This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
 2014-10-22 18:12:21 +02:00
Lukas Reschke
37043508a4 Merge pull request #11620 from owncloud/settings-sidebar 
Settings sidebar
 2014-10-22 17:49:51 +02:00
Robin Appelman
d4e929c37a Remove implicit prepared statement cache and get the connection from the server container in \OC_DB 2014-10-22 12:26:43 +02:00
Lukas Reschke
cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy 
remove legacy class OC_Updater
 2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
Lukas Reschke
c0ddf06dfe Merge pull request #11666 from owncloud/setup-hidesqlitemessageforautoconfig 
Hide SQLite information on setup when autoconfig is used
 2014-10-20 19:50:20 +02:00
Vincent Petry
f52ed231b3 Hide SQLite information on setup when autoconfig is used 2014-10-20 16:20:24 +02:00
Thomas Müller
c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Thomas Müller
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Thomas Müller
8da6e4b9f0 Merge pull request #11644 from owncloud/tune-share-autocomplete 
adjust autocomplete behavior for sharing menu
 2014-10-20 14:35:43 +02:00
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Craig Morrissey
446cebf492 adjust autocomplete behavior for sharing menu 2014-10-17 11:55:32 -04:00
Morris Jobke
eceb1d03cb Merge pull request #11594 from owncloud/sharing_toggle_password 
set password field placeholder back if passward was disabled
 2014-10-17 11:32:29 +02:00
Thomas Müller
04323fbc19 implement sidebar fro personal settings - bad kung-fu 2014-10-17 10:38:13 +02:00
Jenkins for ownCloud
92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04:00
Lukas Reschke
852c7ef9da Use l10n on this string as well 2014-10-16 22:04:24 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Bjoern Schiessle
d18da08a1a set password field placeholder back if passward was disabled 2014-10-15 12:30:31 +02:00
Jenkins for ownCloud
526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Jenkins for ownCloud
a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Jenkins for ownCloud
a0db01ecd3 [tx-robot] updated from transifex 2014-10-11 01:55:02 -04:00
Jenkins for ownCloud
2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Jenkins for ownCloud
295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
Morris Jobke
6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements 
[encryption] some visual improvements
 2014-10-08 14:36:24 +02:00
Jan-Christoph Borchardt
60ce555047 increase whitespace below headings in settings 2014-10-08 12:46:24 +02:00
Jenkins for ownCloud
a9c9b5edf4 [tx-robot] updated from transifex 2014-10-08 01:54:49 -04:00
Bjoern Schiessle
94a9ff1cd8 make sure that the notification gets shown again after a second try 2014-10-07 12:02:58 +02:00
Jenkins for ownCloud
01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Jenkins for ownCloud
6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Jenkins for ownCloud
f191e5b088 [tx-robot] updated from transifex 2014-10-05 01:54:50 -04:00
Jenkins for ownCloud
8d4078752d [tx-robot] updated from transifex 2014-10-04 01:54:35 -04:00
Jenkins for ownCloud
537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Jenkins for ownCloud
553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Jenkins for ownCloud
5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Lukas Reschke
35465f5375 Merge pull request #11352 from owncloud/close-session-for-previews 
Close the session for preview generation
 2014-09-29 22:03:33 +02:00
Lukas Reschke
ba2472575f Close the session for preview generation 
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
 2014-09-29 14:27:44 +02:00
Lukas Reschke
a8ed427515 Merge pull request #11324 from owncloud/tryToCreateDatadirectory 
Try to create datadirectory to test whether the .htaccess works
 2014-09-29 12:22:20 +02:00
Jenkins for ownCloud
63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Morris Jobke
cea70298f2 Merge pull request #11304 from owncloud/share-spinner 
Added spinners in share dropdown
 2014-09-27 10:41:25 +02:00
Morris Jobke
cd2c238b08 Merge pull request #11319 from owncloud/header-owncloud-name 
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
 2014-09-27 10:28:53 +02:00
Jenkins for ownCloud
3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Lukas Reschke
c20d629836 Try to create datadirectory to test whether the .htaccess works 
Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.
 2014-09-26 17:25:28 +02:00
Vincent Petry
ca6f296ae0 Prevent monkey clicking on labels 
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
 2014-09-26 17:07:14 +02:00
Jan-Christoph Borchardt
185f442df8 for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar 2014-09-26 15:38:35 +02:00
Lukas Reschke
08287e2880 Add ID to markup to have the checkboxes in the right position 2014-09-26 13:46:22 +02:00
Vincent Petry
16cad5862a Added spinners in share dropdown 
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
 2014-09-26 13:46:22 +02:00
Jenkins for ownCloud
1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Vincent Petry
9fc23e1967 Merge pull request #10934 from owncloud/datadir-write-setup 
Don't complain about non-writable datadirs before we're installed
 2014-09-25 14:32:32 +02:00
Jenkins for ownCloud
f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Jenkins for ownCloud
5ff5b7386f [tx-robot] updated from transifex 2014-09-24 01:56:46 -04:00
Volkan Gezer
e5793e8e0c Merge pull request #11254 from owncloud/fix-filepicker-home-icon 
fix filepicker home icon being partly hidden, fix #10169
 2014-09-23 19:49:49 +02:00
Lukas Reschke
75e45ac786 Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser 
Do not show exception to the end-user - use a proper error page instead
 2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck 
Moved WebDAV check to client side JS
 2014-09-23 16:55:16 +02:00
Jan-Christoph Borchardt
722865c82a fix filepicker home icon being partly hidden, fix #10169 2014-09-23 14:28:51 +02:00
Thomas Müller
c587a4aaa2 Merge pull request #11222 from owncloud/store-users-timezone-master 
send browsers timezone back tp the server on login
 2014-09-23 13:45:21 +02:00
Jan-Christoph Borchardt
a062db4fd0 Merge pull request #11234 from owncloud/fix-icon-classes 
Fix icon classes, disappeared delete icon
 2014-09-23 12:39:06 +02:00
Vincent Petry
e65ceb08fc Moved WebDAV and internet checks to client side JS 
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server
 2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c Merge pull request #11226 from owncloud/kill-postsetupcheck-master 
remove post setup check
 2014-09-23 10:33:50 +02:00
Jenkins for ownCloud
479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Thomas Müller
21412559df remove post setup check 2014-09-22 19:43:55 +02:00
Jan-Christoph Borchardt
91d9d45c6c correct delete-icon to icon-delete, fix #11128 2014-09-22 18:17:33 +02:00
Thomas Müller
bb18fe1384 send browsers timezone back tp the server on login 2014-09-22 14:01:45 +02:00
Thomas Müller
a348a6f450 no loner use deprecated class \OC_Config 2014-09-22 12:04:48 +02:00
Thomas Müller
e655d32979 remove bootstrapping - occ can by definition only be executed if ownCloud is installed - base.php is required earlier already 2014-09-22 12:00:22 +02:00
Thomas Müller
43c191fffb show upgrade errors as error in the console and report back that the upgrade process failed if it did 2014-09-22 11:59:13 +02:00
Jenkins for ownCloud
a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Jenkins for ownCloud
e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Lukas Reschke
fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2 
Use select2 for the groups excluded from sharing in admin page
 2014-09-19 16:50:56 +02:00
Jenkins for ownCloud
786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Robin Appelman
6ff29f3874 Don't test for htaccess if we cant write into the datadir anyway 2014-09-18 14:23:38 +02:00
Morris Jobke
c89c6ed21d Merge pull request #11143 from owncloud/improve-404 
Make 404 page easier to understand
 2014-09-18 09:10:16 +02:00
Jenkins for ownCloud
dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke
8fc1a9f5a9 Make 404 page easier to understand 
Fixes https://github.com/owncloud/core/issues/11133
 2014-09-17 22:57:32 +02:00
Jan-Christoph Borchardt
d66a8daf7f replace horizontal rules with whitespace 2014-09-17 13:17:53 +02:00
Lukas Reschke
6d3757f864 Do not show exception to the end-user 
Log the error instead of potentially leaking sensitive information
 2014-09-17 13:17:52 +02:00
Jenkins for ownCloud
2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Lukas Reschke
21afcb3e94 Merge pull request #10902 from owncloud/fix-ellepsis 
Adding link to ellipsis and fixing styling
 2014-09-16 21:09:47 +02:00
Morris Jobke
129e2d3c32 Merge pull request #10896 from owncloud/undo-nav-entry 
Add delete undo styles
 2014-09-16 18:28:39 +02:00
Bernhard Posselt
ef028fcd9a add delete undo styles 
use less right padding

better styling, fix padding issues

no special color for undo nav entry

fix fallback width

use class for button
 2014-09-16 18:02:41 +02:00
Lukas Reschke
d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo 
Fixed JS sort comparator to be consistent between JS and PHP
 2014-09-16 17:29:03 +02:00
Clark Tomlinson
140c89f1c3 Adding link to ellipsis and fixing styling 2014-09-16 09:18:01 -04:00
Thomas Müller
1978d3d6a2 Merge pull request #11055 from owncloud/replaceprodname 
replace ownCloud with placeholder
 2014-09-16 14:49:50 +02:00
Morris Jobke
61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path 
Show original path information in trashbin and for shares
 2014-09-16 12:49:17 +02:00
Vincent Petry
e2b504e61d Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339" 
This reverts commit 064e6951e1.

Reverting due to regression that breaks styles in error page, setup
page and others.

Fixes #10967
 2014-09-16 11:22:54 +02:00
Morris Jobke
ea2022661d patch tipsy in style.css - don't patch 3rdparty libraries 2014-09-16 08:45:28 +02:00
Jenkins for ownCloud
1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Jan-Christoph Borchardt
513fb05947 Merge pull request #11040 from owncloud/fix-app-menu-overlapp 
Remove bottom: 0 from app-navigation-entry-utils to prevent the utils form overlapping the whole element....
 2014-09-15 23:50:30 +02:00
Lukas Reschke
627252fe81 Merge pull request #11060 from owncloud/rmobslang 
remove obsolete language files
 2014-09-15 17:31:10 +02:00
Morris Jobke
d6cb489b68 add some minor fixes for IE8 2014-09-15 17:09:12 +02:00
Morris Jobke
06eb3b62c6 Merge pull request #10109 from owncloud/issue_#9793_guestlayout 
Step one, open guest layout for different styles.
 2014-09-15 15:15:41 +02:00
Morris Jobke
5357c91520 Merge pull request #11026 from owncloud/apps-styles-update 
Apps styles update
 2014-09-15 14:45:23 +02:00
Bernhard Posselt
80ce598bc3 remove bottom: 0 to prevent the menu form overlapping the whole element. This happens if a folder has entries, the menu expands to the very bottom and overlaps all entries and makes them impossible to click 
fix input width which was changed likely with the icon PR

use calc because firefox and chrome have different scrollbar widths which causes firefox to push the button into the next row while everything is well in chrome

add normal width for IE8
 2014-09-15 12:53:33 +02:00
Jenkins for ownCloud
d8c7a52979 [tx-robot] updated from transifex 2014-09-14 01:54:35 -04:00
Volkan Gezer
5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud
518ed10c77 [tx-robot] updated from transifex 2014-09-13 05:17:34 -04:00
Volkan Gezer
c04346918b replace ownCloud with placeholder 2014-09-13 01:48:18 +02:00
Bernhard Posselt
d48b672791 Merge pull request #10974 from owncloud/fix-app-content-overflow 
This fixes the double scrollbars issue
 2014-09-12 18:41:43 +02:00
Jenkins for ownCloud
d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Jan-Christoph Borchardt
7afca08255 Merge pull request #11024 from owncloud/fix-nojavascript 
fix nojavascript message alignment
 2014-09-11 23:06:17 +02:00
Jan-Christoph Borchardt
dc2e4dc7b9 Merge pull request #11022 from owncloud/icons-fix 
Fix icons
 2014-09-11 16:58:32 +02:00
Robin McCorkell
a62ac2574e Better tooltip handling of very long strings 
* Maximum tooltip length now 400px instead of 200px
 * Overflowing strings create ellipsis (...)
 2014-09-11 15:45:42 +01:00
Robin McCorkell
99d41bec5d Show original path information in trashbin and sharing views 
Path will only be shown if in subdirectory, not in root.
 2014-09-11 15:45:42 +01:00
Jan-Christoph Borchardt
0afd7b5de4 use same shade of grey for active navigation items and hovering 2014-09-11 16:34:29 +02:00
Jan-Christoph Borchardt
179f06d94f remove icon styles from apps.css as they are in icons.css 2014-09-11 16:30:24 +02:00
Jan-Christoph Borchardt
94402b5cc7 fix nojavascript message alignment 2014-09-11 16:12:43 +02:00
Jan-Christoph Borchardt
fd4eb9d460 fix folder icon alignment, fix #10866 2014-09-11 15:52:12 +02:00
Jan-Christoph Borchardt
73e09ecb5e fix svg of calendar filetype icon 2014-09-11 15:51:24 +02:00
Jan-Christoph Borchardt
8ac648bf1e fix size of toggle icon, make container square 2014-09-11 15:39:01 +02:00
Jan-Christoph Borchardt
a344b097e5 improve style of checkmark icon, less bold, fitting ownCloud style 2014-09-11 15:38:39 +02:00
Jan-Christoph Borchardt
4602436bce fix notification visibility, fix #11016 2014-09-11 14:12:29 +02:00
Thomas Müller
9737ba74ce Merge pull request #11007 from owncloud/replaces-10850 
Add X-UA-Compatible to all templates
 2014-09-11 12:34:44 +02:00
Lukas Reschke
7d2c521b46 Step one, open guest layout for different styles. 
Conflicts:
	core/templates/layout.guest.php

Step one, open guest layout for different styles.
 2014-09-11 11:41:02 +02:00
Lukas Reschke
8d7926543b Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over 
Refresh if maintenance mode is over
 2014-09-11 11:34:39 +02:00
Lukas Reschke
bce5c2dae9 Add X-UA-Compatible to all templates 
Replaces https://github.com/owncloud/core/pull/10850
 2014-09-11 10:28:52 +02:00
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Jan-Christoph Borchardt
8d0d336e03 fit select2 to ownCloud input style 2014-09-10 18:09:22 +02:00
Jenkins for ownCloud
c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Lukas Reschke
fa096217b1 Merge pull request #9512 from libasys/patch-2 
Fix use Sharing Api with calendar
 2014-09-09 23:58:24 +02:00
Bernhard Posselt
743d792f5e This fixes the double scrollbars issue 2014-09-09 22:59:16 +02:00
Vincent Petry
412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
kondou
69f2c0544e Refresh if maintenance mode is over 
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.

Checks every 20 seconds if maintenance is over, if yes: reload.
 2014-09-09 17:26:11 +02:00
Lukas Reschke
dc99fd768a Merge pull request #10948 from owncloud/fix-zindex 
fix z-index of header and dropdowns, fix user menu not showing on mobile
 2014-09-09 14:23:28 +02:00
Thomas Müller
fd92fc7c47 Merge pull request #9753 from owncloud/filepath-css 
Remove special case for css in OC.filePath
 2014-09-09 13:59:19 +02:00
Lukas Reschke
e3c99a8505 Add beforeeach and aftereach 2014-09-09 13:08:50 +02:00
Lukas Reschke
cabd70148f Add unittest for filePath 2014-09-09 12:05:19 +02:00
Lukas Reschke
e9a3b280c0 Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install 
allow . in dbname on web install
 2014-09-09 09:36:16 +02:00
Jenkins for ownCloud
317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
VicDeo
efd485acda Merge pull request #10858 from owncloud/issue/10847 
Use correct language package so the subject is correctly translated
 2014-09-09 01:11:34 +03:00
Jan-Christoph Borchardt
71e10b66d9 Merge pull request #10944 from owncloud/fix-nojavascript-style 
fix no-JS message, and add it to log in and shared as well cause they don’t work without JS
 2014-09-08 21:58:54 +02:00
Jan-Christoph Borchardt
dc5db3dd90 fix z-index of header and dropdowns, fix user menu not showing on mobile 2014-09-08 21:37:17 +02:00
Lukas Reschke
70abce0482 Merge pull request #10739 from owncloud/eventsource-public 
Add EventSource to the public API
 2014-09-08 18:46:27 +02:00
Jan-Christoph Borchardt
bd56619e7a also add no-JavaScript notice to log in and sharing pages because they do not work without JS either 2014-09-08 18:07:20 +02:00
Jan-Christoph Borchardt
3db2b11435 fix styling and wording of no-JavaScript message 2014-09-08 17:55:53 +02:00
Lukas Reschke
c79c894dbb Merge pull request #10755 from owncloud/shorter_sharing_links 
Shorter sharing links
 2014-09-08 17:26:20 +02:00
Volkan Gezer
053c879723 Merge pull request #10451 from k4k/login_logo_alignment_fix 
improve logo flexibility to fix wide custom logo alignment, fix #9339
 2014-09-08 17:21:33 +02:00
Jörn Friedrich Dreyer
d12a74e299 allow . in dbname on web install 2014-09-08 13:41:23 +02:00
Jenkins for ownCloud
9fc45016f9 [tx-robot] updated from transifex 2014-09-07 01:54:42 -04:00
Jenkins for ownCloud
6ca2ba6fde [tx-robot] updated from transifex 2014-09-06 01:55:03 -04:00
Jenkins for ownCloud
0736a6695e [tx-robot] updated from transifex 2014-09-05 01:54:39 -04:00
kondou
2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e Initial work on shorter links 2014-09-04 15:23:53 +02:00
Lukas Reschke
1a7df33233 Merge pull request #10818 from owncloud/enableappforgroupfix 
Fix upgrade process when apps enabled for specific groups
 2014-09-04 13:56:41 +02:00
Robin Appelman
fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Joas Schilling
7a7e102390 Fix broken new lines in plain text mail template 2014-09-04 11:30:54 +02:00
Jenkins for ownCloud
a8861c70c8 [tx-robot] updated from transifex 2014-09-04 01:55:22 -04:00
Thomas Müller
954925eaa0 Merge pull request #10667 from pmjdebruijn/itunes-appid 
defaults: add customizable defaultiTunesAppId
 2014-09-03 16:26:20 +02:00
Lukas Reschke
373d1c5e9f Merge pull request #10642 from owncloud/securityutils 
Add some security utilities
 2014-09-03 15:28:42 +02:00
Robin Appelman
65608d7c92 Use the public api to get event sources 2014-09-03 13:36:15 +02:00
Jenkins for ownCloud
8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Vincent Petry
e05b95636b Fix upgrade process when apps enabled for specific groups 
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
 2014-09-02 17:16:14 +02:00
Bernhard Posselt
93abef4059 also style submit buttons 2014-09-02 11:40:53 +02:00
Jenkins for ownCloud
689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
Bernhard Posselt
c9012be0b6 Add app utilities - CSS menus for sidebar 
* has-menu, has-count
* use active for has-menu to show it
* use open for action popup to show up
* inactive buttons have less opacity
* borders for edit input
* use z-index for app content on mobile to prevent navigation items from sticking out
 2014-08-31 17:42:54 +02:00
Lukas Reschke
ae3425d2da Merge branch 'master' into securityutils 
Conflicts:
	lib/private/util.php
 2014-08-31 15:21:09 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Robin McCorkell
a8dc4368c0 Merge pull request #10428 from owncloud/files_external_better_config 
Improve external storage configuration UI
 2014-08-30 15:11:39 +01:00
Robin McCorkell
0e8a973579 Improve UI of external storage configuration 
* Highlight fields that need to be filled
 * Remove (required) and (optional) strings where possible
 * Focus first configuration field when creating new external storage
 * Add ability to force external storage re-check
 * Various jQuery improvements
 * Prevent wrapping of checkboxes in configuration
 2014-08-30 09:02:37 +01:00
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Morris Jobke
0aede0f413 move hardcoded color to CSS class - for themeability 2014-08-29 17:50:59 +02:00
Jan-Christoph Borchardt
95382e9945 also add minimum width for quota bar so it’s apparent how it will look 2014-08-29 16:52:41 +02:00
Jan-Christoph Borchardt
3ba66e33f8 set quota bar maximum to 100% to prevent overflow 2014-08-29 16:31:43 +02:00
Jan-Christoph Borchardt
7d1a0d4739 define min height/width for icon classes to make sure they show 2014-08-29 12:05:01 +02:00
Thomas Müller
1793e4e22b Merge pull request #10701 from owncloud/tests-momentjsinclude 
Include momentjs for unit tests
 2014-08-29 11:40:19 +02:00
Thomas Müller
ed2424c382 Merge pull request #10637 from owncloud/fixing-js-issues 
Init vars with a value if none is provided
 2014-08-29 10:16:29 +02:00
Thomas Müller
745ec12002 Merge pull request #10703 from owncloud/sometimes-allow-horizontal-scrollbar 
allow horizontal scrollbar for personal and admin settings
 2014-08-29 10:14:13 +02:00
Vincent Petry
8fdcbce200 Include momentjs for unit tests 2014-08-29 10:04:03 +02:00
Jenkins for ownCloud
359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Clark Tomlinson
ba0e65753b Init vars with a value if none is provided 2014-08-28 13:53:45 -04:00
Jan-Christoph Borchardt
2080353048 allow horizontal scrollbar for personal and admin settings 2014-08-28 18:17:50 +02:00
Clark Tomlinson
54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs 
Implementing momentjs
 2014-08-28 11:47:37 -04:00
raghunayyar
3ee3557d4c Enhancement: Adds input styles to input type dates too. 2014-08-28 16:53:19 +02:00
Clark Tomlinson
92685acf60 Implementing moment.js 
Updating Usages

Removing unused method

Adding JS Doc
 2014-08-28 09:28:45 -04:00
blizzz
6fa609325c Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external 
Ajaxify user list for files external
 2014-08-28 13:39:21 +02:00
Pascal de Bruijn
73f50287ff templates: use p() for getiTunesAppId 2014-08-28 10:12:59 +02:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Pascal de Bruijn
49da0a7943 defaults: add customizable defaultiTunesAppId 2014-08-27 14:07:39 +02:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Lukas Reschke
d26a9c3c58 Add some security utilities 
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions

Remove .htaccess

Remove .htaccess

Fix typo

Add public API

Use timing constant comparision

Remove CBC constant

Adjust code

Remove confusing $this
 2014-08-27 00:18:04 +02:00
Clark Tomlinson
c0bc41ff1e Merge pull request #10640 from owncloud/add_moment_js 
add moment.js
 2014-08-26 13:32:47 -04:00
Georg Ehrke
f82b788ba5 add moment.js 2014-08-26 17:39:15 +02:00
Thomas Müller
3115053bbb Merge pull request #10604 from owncloud/fixing-favicon 
Adding type to favicon
 2014-08-26 17:35:50 +02:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Lukas Reschke
992b0f9b06 Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset 
Warn user on resetting passwords via occ when encryption is enabled
 2014-08-25 14:23:28 +02:00
Lukas Reschke
f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
91ba1b345e add lookup route for displaynames 2014-08-25 11:50:19 +02:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Clark Tomlinson
e0a8321b23 Adding type to favicon 2014-08-22 16:26:39 -04:00
Thomas Müller
a77d468d35 Merge pull request #10584 from owncloud/simple-wizard-trusted-domains 
Add a trusted domain wizard
 2014-08-22 17:12:17 +02:00
kondou
b86e124e03 Warn user on resetting passwords via occ when encryption is enabled 2014-08-22 16:15:04 +02:00
Lukas Reschke
4aca46046b Add require_once to update.php due to routing 
Fixes https://github.com/owncloud/core/issues/10585
Partially reverts 52d5429768
 2014-08-22 11:39:05 +02:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df Add a trusted domain wizard 
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
 2014-08-21 22:22:35 +02:00
blizzz
52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript 
Remove loadAppScriptFile
 2014-08-21 19:59:31 +02:00
Vincent Petry
9c980954f4 Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed 
Fix share dropdown when links are not allowed
 2014-08-21 15:32:11 +02:00
Vincent Petry
98d06094e7 Fix share dropdown when links are not allowed 
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
 2014-08-21 13:49:02 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Volker E.
ec1596054f Removing x-webkit-speech attribute #10561 
Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
 2014-08-20 22:59:55 +02:00
Morris Jobke
74af852c34 Merge pull request #10557 from owncloud/better-hover-apps 
full opacity for the hovered/focused app as well for better contrast
 2014-08-20 22:26:38 +02:00
Jan-Christoph Borchardt
f6c2002554 full opacity for the hovered/focused app as well for better contrast 2014-08-20 19:34:02 +02:00
Morris Jobke
b6d3a6a054 Add note about the term "Cheers" at end of mail 
* for translators
* fixes #8689
 2014-08-20 15:14:07 +02:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Lukas Reschke
ab12bd292d Add update route to core 2014-08-19 15:40:08 +02:00
Lukas Reschke
29ae7f55ef Remove loadAppScriptFile from the default routes 2014-08-19 15:37:00 +02:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
Vincent Petry
a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix 
Fixed default quota field on user management page
 2014-08-18 18:50:43 +02:00
Jan-Christoph Borchardt
58cb0697d6 fix color of links in warnings, fix #10480 2014-08-18 16:40:32 +02:00
Vincent Petry
8995e88e6f Added upgrade notice to avoid timeouts 2014-08-18 15:05:55 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Morris Jobke
5498186333 Merge pull request #10447 from owncloud/share-foldericonfix 
Fixed folder icon update routine when share owner exists
 2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Lukas Reschke
c1272871a5 Merge pull request #10413 from owncloud/adding-handlebars 
Adding handlebars.js
 2014-08-15 23:10:11 +02:00
twood8
064e6951e1 improve logo flexibility to fix wide custom logo alignment, fix #9339 2014-08-15 12:35:45 -04:00
Vincent Petry
607ea636be Fixed folder icon update routine when share owner exists 
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
 2014-08-15 16:19:50 +02:00
Vincent Petry
3c7fbbef22 Do not close container/slider when clicking on single select field 2014-08-15 12:44:00 +02:00
Jan-Christoph Borchardt
61c788f9dc change error text color to white for better contrast, fix #10424 2014-08-15 10:52:45 +02:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Björn Schießle
64c3fe670c Merge pull request #10399 from owncloud/fix_setSendMailStatus 
[sharing] fix mail notification
 2014-08-14 17:45:39 +02:00
Thomas Müller
561f5d2d45 Adding handlebars.js 2014-08-14 10:43:10 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00